From nobody Thu May 1 18:58:33 2025 X-Original-To: dev-commits-src-all@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 4ZpNcV4gsmz5vZvr; Thu, 01 May 2025 18:58:34 +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 4ZpNcV1wPFz3YyD; Thu, 01 May 2025 18:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746125914; 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=ipYcOkBwiHwJgO+qxyea5/YvDlIKLj4nbTwmoah0Hzw=; b=U8c6u4RzA7CFX83zkAR30O4dDMQQHsKfQMWaaCZLA6xxYILNbjL3Yka7AI/cHXCTeHBJlE jo0hLz45jfRBlPYMJ4440JCnaV+vaJvPm1050I1vdkd/o2UxYgexMIDVAnYYyslXjJeOOD fpLe9ruKCTW7atMjW8MMb4vfdFmftDJSZwfYdbpkIrMRJ8/EIrvH0vvChf1l5sJcqnbOQ6 MXiZPH1bBw+T+2qSou8qAf+CStNExkyLk4EYhDXdeoLkFYIFs6cmzT478SfbRIkjYJ0xq6 MPnR4mBvtHHsOG1QdpL8s36U89X6BUvdhYls0gt4rVyMd3SCM1FfVAORpQ3JwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746125914; 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=ipYcOkBwiHwJgO+qxyea5/YvDlIKLj4nbTwmoah0Hzw=; b=RRzuCdi/fb1ptcDHVXhzHYAhjjXywEHR76Y8EJF3CRJCdnerzdlV2A3iI1Pudk5Z6KZJnm 468o3IGcdF3U2P+Lv4qEf66pYz7RtfA0dL988LqgBsJcN9ANx2f7vETauRXnWKuAnJ4B6A 8CzKc1rSEHbLdw/g0qLFvv7Of5sGuRwoIpJzx04BmUwqTH4GKFbD7VKZCnt70a1im5tbT/ AUOX8odLMuUS7Q7W45Af3o0aMGiWmBedBYR27hH3UWYeKtv4zyL+ksXFdfZ22W1beKjpDT l0ANi9QtXV8KMccQJo6/NKf9VK9WAtBf5CP7wEvc7mpgQU55IBaWQozJ5mkaaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746125914; a=rsa-sha256; cv=none; b=hABQ5HfyP6AIDZxu+cqfgKdgBBjyRq1d8geLurB9JtkcwARAgh+/vZHjlhEvwobWgYouPM 5GYyLj4B2exhv0aI3QY1lXUhuQryAhYE2fojYVSJDeqP6dtiQ7DbpvojVzA6KiysLGAmyV viRCxVVl69RbEml95upQYFwzVexF9omHKSy0/vEMeX8OsOsLbcg0H7vLMhVr+7F6vmhAS8 ie9jj1COmH78n1UicyhSZwPoSIQiizk66m/zJ84uDf0G5cHv/kSV6hRvZyILGWkxFcW89P O2JADziTDuD0X/yvRPU04pIt5TD9twklcZp0DB7vzjzFgA4UXvLNCTRqvanq/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpNcV0ZDDzgm3; Thu, 01 May 2025 18:58:34 +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 541IwXxX060132; Thu, 1 May 2025 18:58:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541IwXjk060129; Thu, 1 May 2025 18:58:33 GMT (envelope-from git) Date: Thu, 1 May 2025 18:58:33 GMT Message-Id: <202505011858.541IwXjk060129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 25f971766372 - stable/14 - tcp: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 25f971766372ca97135e1cc15f46240c1d078348 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=25f971766372ca97135e1cc15f46240c1d078348 commit 25f971766372ca97135e1cc15f46240c1d078348 Author: Michael Tuexen AuthorDate: 2025-04-07 16:49:05 +0000 Commit: Michael Tuexen CommitDate: 2025-05-01 18:51:05 +0000 tcp: cleanup Remove the macros COPY_STAT and COPY_STAT_T, since they do not improve the readability of the code. No functional change intended. Thanks to glebius@ for suggesting the change. Reviewed by: glebius, rrs Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49670 (cherry picked from commit 46fc12741e70f2d1f0510a0dacd2f9dd3aa116c0) --- sys/netinet/tcp_log_buf.c | 54 ++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/sys/netinet/tcp_log_buf.c b/sys/netinet/tcp_log_buf.c index 5142b3ebdd71..f540c7d3e70e 100644 --- a/sys/netinet/tcp_log_buf.c +++ b/sys/netinet/tcp_log_buf.c @@ -1840,40 +1840,36 @@ retry: log_buf->tlb_txbuf.tls_sb_ccc = 0; } /* Copy values from tp to the log entry. */ -#define COPY_STAT(f) log_buf->tlb_ ## f = tp->f -#define COPY_STAT_T(f) log_buf->tlb_ ## f = tp->t_ ## f - COPY_STAT_T(state); - COPY_STAT_T(starttime); - COPY_STAT(iss); - COPY_STAT_T(flags); - COPY_STAT(snd_una); - COPY_STAT(snd_max); - COPY_STAT(snd_cwnd); - COPY_STAT(snd_nxt); - COPY_STAT(snd_recover); - COPY_STAT(snd_wnd); - COPY_STAT(snd_ssthresh); - COPY_STAT_T(srtt); - COPY_STAT_T(rttvar); - COPY_STAT(rcv_up); - COPY_STAT(rcv_adv); - COPY_STAT_T(flags2); - COPY_STAT(rcv_nxt); - COPY_STAT(rcv_wnd); - COPY_STAT_T(dupacks); - COPY_STAT_T(segqlen); - COPY_STAT(snd_numholes); + log_buf->tlb_state = tp->t_state; + log_buf->tlb_starttime = tp->t_starttime; + log_buf->tlb_iss = tp->iss; + log_buf->tlb_flags = tp->t_flags; + log_buf->tlb_snd_una = tp->snd_una; + log_buf->tlb_snd_max = tp->snd_max; + log_buf->tlb_snd_cwnd = tp->snd_cwnd; + log_buf->tlb_snd_nxt = tp->snd_nxt; + log_buf->tlb_snd_recover = tp->snd_recover; + log_buf->tlb_snd_wnd = tp->snd_wnd; + log_buf->tlb_snd_ssthresh = tp->snd_ssthresh; + log_buf->tlb_srtt = tp->t_srtt; + log_buf->tlb_rttvar = tp->t_rttvar; + log_buf->tlb_rcv_up = tp->rcv_up; + log_buf->tlb_rcv_adv = tp->rcv_adv; + log_buf->tlb_flags2 = tp->t_flags2; + log_buf->tlb_rcv_nxt = tp->rcv_nxt; + log_buf->tlb_rcv_wnd = tp->rcv_wnd; + log_buf->tlb_dupacks = tp->t_dupacks; + log_buf->tlb_segqlen = tp->t_segqlen; + log_buf->tlb_snd_numholes = tp->snd_numholes; log_buf->tlb_flex1 = 0; log_buf->tlb_flex2 = 0; - COPY_STAT_T(fbyte_in); - COPY_STAT_T(fbyte_out); - COPY_STAT(snd_scale); - COPY_STAT(rcv_scale); + log_buf->tlb_fbyte_in = tp->t_fbyte_in; + log_buf->tlb_fbyte_out = tp->t_fbyte_out; + log_buf->tlb_snd_scale = tp->snd_scale; + log_buf->tlb_rcv_scale = tp->rcv_scale; log_buf->_pad[0] = 0; log_buf->_pad[1] = 0; log_buf->_pad[2] = 0; -#undef COPY_STAT -#undef COPY_STAT_T /* Copy stack-specific info. */ if (stackinfo != NULL) { memcpy(&log_buf->tlb_stackinfo, stackinfo,