From nobody Mon Apr 07 16:51:22 2025 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 4ZWZwp1qblz5rZLq; Mon, 07 Apr 2025 16:51:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWZwp1HSKz3BmK; Mon, 07 Apr 2025 16:51:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744044682; 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=VIsyVBiFiqXqRfB5L/ZwJVRBeAvAj57M7uVQUN1jd/s=; b=UdFgH5SIbpcKL/5YkrDG8HUveoS/LWqw2o2RvrvMtGVzvXnvEO3kYPFofoZ+Fk2eh4bmwc V9KHWcmv/XEGjOny8y+1mr/BeLlBxQhL8irDXpJe+9yjBOyij+fCmp6x60v2E3k2/9F9jy +S5UcSaB6dFYeZn/Jb8i0DmM3g6Adf6FwJVVHntcwe25ZgX0orz/1dvSDwsonZoDwSsNVP sXY4SJFlhX9yyz8EQJ4hrLhdMOnVsH1dpaZKoqx2Qj4G6pOeF+cBSr5ncs+z/u//nOG5T/ Z2eu5EveDoJa4l7/V7vOmEUUcRWvUCGeRaRj8q2pKihRyofalGLDeiJlUiuQrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744044682; a=rsa-sha256; cv=none; b=lvNK5d193WvAebPnkBaSkX73iYtab2dedGyOBI1uJ549FMH4C2bmA/g+PJ9bmPA9+c8Q7o T9E5RqCd+EDNEgdwsM8qB42LGJjNta+/2KWzy367HRymQyKXWSAqk+iKecwL8J7VrWYz2l 6KY+c8sGUpi0SqToGSITO7k6ua7ty93eDImoaqqULa7TsRHwT6aqtqhrQ29y476MiyiO9Q J3TQK8FzfakbunJKSz7hsZ6FeeQEbBJUwTUohO/IR4Uxs/MAlM7EJvn/Rr8b9Kdk41su/m FZcAS2rPAYBgRPXLdtmKbWYZSfeVVlxSVBg6dGvIHpaB6C8FDRiJuqZW6ZQSNA== 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=1744044682; 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=VIsyVBiFiqXqRfB5L/ZwJVRBeAvAj57M7uVQUN1jd/s=; b=EAnfDTpQvSFIZWEthNsBkDh5HOLnOSsUENZphv7uNgad+/FVNBO6kAmRPyiLEcUyGfySCQ FZNdsIErEesnvrnep7vGT0SVuIEHhMJ6lDGjNdarPx+OX4vE002NwCBv/EoCpHAP7Jd1Ab /6EnUEzyT5dp/TG0n38DZzeNCWS7cJNyhiKoizvjK9IdUpTUoOixZQ7MwSjBHNwkODE8Yt qBosx0h7bi0CwsftbnJyC7nL6Gx74aQYfgFXdjlM6B2/j62nBdPViDM93rfPB2N6ibTmuX tNQXqAbaPZDOecndmCgdRl/sSjsY/5XHTQXDVWkDOS/wxzZWfCc5pv5AGKAuUA== 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 4ZWZwp0Vckzvb3; Mon, 07 Apr 2025 16:51:22 +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 537GpMfU092862; Mon, 7 Apr 2025 16:51:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 537GpMYm092859; Mon, 7 Apr 2025 16:51:22 GMT (envelope-from git) Date: Mon, 7 Apr 2025 16:51:22 GMT Message-Id: <202504071651.537GpMYm092859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 46fc12741e70 - main - tcp: cleanup 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46fc12741e70f2d1f0510a0dacd2f9dd3aa116c0 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=46fc12741e70f2d1f0510a0dacd2f9dd3aa116c0 commit 46fc12741e70f2d1f0510a0dacd2f9dd3aa116c0 Author: Michael Tuexen AuthorDate: 2025-04-07 16:49:05 +0000 Commit: Michael Tuexen CommitDate: 2025-04-07 16:49: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 MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49670 --- 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,