From nobody Thu Jul 25 17:13:57 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WVHY20LFWz5QtlV; Thu, 25 Jul 2024 17:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WVHY16tChz4wg6; Thu, 25 Jul 2024 17:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721927638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NyWGy0aE5p+BYbdrDIdGtxXn5mnYLcSHYrHHf1+6Yzk=; b=IDzOS7w1gP0RKololhQ0B+OC/782VmDgMq4H7mvVfz29d1lxlPCXiPD6sWo8lOk9WoxydA XI2ddiYPeMwsGalBbVDaHD0IvQCyD9RFyW/1ggk5zlFMla4SEzTPVFyqPRD+FF3yMUp2Dv iSGDyLw8y5iieEwoThT+HNxQ4V4sNp3EThanxEE9ic9pAkXTejL6uJPEQGw/JWgUYXj4lT Q5LWmdWnXZ0DHq0ydhP7ys79hERfzh7zYCwXZwSiRNEefklgT5ZH6soQ8kzk2uKVPoNZGn C/ZxdW8gS62W9W8GO0QPYMl+E7UptjsgF9aXfb1yRL9ZbzjUWXYyLWey4lHRbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721927638; a=rsa-sha256; cv=none; b=mbmLr4Xev098mpsulxtme0+n16ldT3H5PnfLppVnDjH1PBATZyJq9gM8TOaL9jw4gGHF1o W/4CDMbCDjoSMaJ3xI/6y51HQiWseS79aQ++Gf1ZyqfwOholKY/VdUvkYUIPjRhta3MW1C duzPY2KdC3UulVlrcxsRsTkIn00I1vfwgUM4fZqIgEUJ/gTPK7ZQJ0q8QBb05P+D2YjYE5 sEQCrI2OIqQVnLwLLo2sS0nwYHLFUlDHCiCUumb1LEeCC34y/Kf7qzNuJFI3h8WjmdH29q rOvW9tTDwlAeluGv5uA1fBfbHM4DTT1C9e20kCV/CbW3V/RtNjCUX7wnJImOyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721927638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NyWGy0aE5p+BYbdrDIdGtxXn5mnYLcSHYrHHf1+6Yzk=; b=JelXj5Nn/m5HLnZ27MyLrOF+LCzzSnrLW+Cutdq2uBNOtMYZp2aFQZLB14gCsZsNYyO0do 9keHSSnXcQ76RdgxH3LI2glS4g4vufJ/ibVsW/99NHAfLKQoHNEezwUXfdXZNZzs3vA04l kZaoz9JwoXBxTgoXh6wqfDyyCk7rJLFL0HKhx8rWiO6cLOtj7gkN7b+NBVGOPlLsc/lowP 3Ygj1ZXyd2+0IJHOjmWcHU/unUJRU5V9IozjaiFfWrq9rmfkhtLzp7KNclZ9skXYZyYIFM 6zV5R77eg9pcVC858oqW6TA50yfUyq+/Mf+mCBr899ac62XvIHPX01TQoUZ7Bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WVHY16TGpz13dr; Thu, 25 Jul 2024 17:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46PHDvfv004203; Thu, 25 Jul 2024 17:13:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46PHDvBj004200; Thu, 25 Jul 2024 17:13:57 GMT (envelope-from git) Date: Thu, 25 Jul 2024 17:13:57 GMT Message-Id: <202407251713.46PHDvBj004200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: 9565854ab408 - main - cc_cubic: remove the redundant variable num_cong_events from struct cubic. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9565854ab408a6235def12074f98b9ccc0f3008e Auto-Submitted: auto-generated The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=9565854ab408a6235def12074f98b9ccc0f3008e commit 9565854ab408a6235def12074f98b9ccc0f3008e Author: Cheng Cui AuthorDate: 2024-07-19 16:11:59 +0000 Commit: Cheng Cui CommitDate: 2024-07-25 17:11:32 +0000 cc_cubic: remove the redundant variable num_cong_events from struct cubic. Summary: This variable was added by commit eb5bfdd06565, but unnecessarily needed. No functional change. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D46042 --- sys/netinet/cc/cc_cubic.c | 2 -- sys/netinet/cc/cc_cubic.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index b4050326ae31..5141de86ef85 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -490,13 +490,11 @@ cubic_cong_signal(struct cc_var *ccv, ccsignal_t type) } cubic_data->flags |= CUBICFLAG_CONG_EVENT | CUBICFLAG_RTO_EVENT; cubic_data->undo_W_max = cubic_data->W_max; - cubic_data->num_cong_events++; CCV(ccv, snd_cwnd) = mss; break; case CC_RTO_ERR: cubic_data->flags &= ~(CUBICFLAG_CONG_EVENT | CUBICFLAG_RTO_EVENT); - cubic_data->num_cong_events--; cubic_data->K = cubic_data->undo_K; cubic_data->cwnd_prior = cubic_data->undo_cwnd_prior; cubic_data->W_max = cubic_data->undo_W_max; diff --git a/sys/netinet/cc/cc_cubic.h b/sys/netinet/cc/cc_cubic.h index ce6c2a6633d7..592703906d1a 100644 --- a/sys/netinet/cc/cc_cubic.h +++ b/sys/netinet/cc/cc_cubic.h @@ -121,8 +121,6 @@ struct cubic { uint64_t undo_W_max; uint64_t undo_W_est; uint64_t undo_cwnd_epoch; - /* Number of congestion events experienced */ - uint64_t num_cong_events; uint32_t css_baseline_minrtt; uint32_t css_current_round_minrtt; uint32_t css_lastround_minrtt;