From nobody Tue Jun 10 06:06:07 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 4bGdZm6rGkz609qg; Tue, 10 Jun 2025 06:06:08 +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 4bGdZm0Xl4z3pq7; Tue, 10 Jun 2025 06:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749535568; 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=Pn+YKLYW26k+Ixq2pVvTfm1XVbFDJGZNYoda/Ff/zYg=; b=NRPrJy+3FFGv7NjF+VRXcdbKiQY63mIDB8nqCj5Tcr7LgdeCOHRFyG36v7OTTFzF4IWtoQ nJSq5yI0L4pSuIdIqREF9W9hfB60lguaRDh9G0nkxRejOkRUeXB1IUarp5LP86DMAs8y1I 33It2XK8bbLOJdSshmufgAiUwDGECEuwf326YNwvrgh7lX7RZdqmND0QUGm3RSwYgWlzEJ IbcGcBCetKKseWmiuyG7G0f0yWn8HmquqrC8dbd6PT4dV8QN+tp+54ImKiijqrO2YerZ80 2t7E4OLV8jDgTvBEeHZHkX3TFcEy72rRZ79zvjmoHci05VegAQDuiL+A10V2FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749535568; 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=Pn+YKLYW26k+Ixq2pVvTfm1XVbFDJGZNYoda/Ff/zYg=; b=H5JRjHMYu7pj0WGI9SAzHZzSsTeCnBTiTgedC8w9Gw3Xfn02fJqmyRyv7X2F5eq207X3O0 NmPlnUuXypdDHAAdN2nbb8XwSUj43jzrk282r5gqpe86rRPAWLBrRVrU8wtQ1/2hu1N0UN 2L5yPgq0xImBEie2QsyGEtS6ADZhlMivxpHBdePzl+6gqti3FiBwyNOaeUatRx8pSLZAAB pY50RsTd1mpTTI+VhVftwZt4QpbhmZlmBbQg344LZcH3xsi/6zDGnMnaE62IcZ1uAuYm1C Ij2J+FvNu/E/0WRbiLzcVT+o2vfXirKkZLTMU1FeRvFBc0rVcCQ94F/OImxmIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749535568; a=rsa-sha256; cv=none; b=fbrDC8fxfG/6CT8QjzqC/dHR4u4m9TFAH4h/fFEUUddPjUAZp7z/xhL4uEcwDoQifCLG1b Ib+sDVkZmsdaXyFuiwi9u7odqiN39Oseddhtel6/SmwcAUVgjwgrN3hbEUw9NRcOFrzgwt 2kWwPVD+0ksBI4iIpOlISjAWKDVKgu6eNu7DlhpxfLOcBMfR0OMQIX2oqb5XGGCbSlkRuQ tLUzYeUkySDzqnFvchuAxZh8wZ05WmZDemgps5uz58TmwD0rG01/zmZC+PQRyg2zsqC7ZI d258gAJ668ldjb5nbK8J41VwYxpoMzPQGtCnGgTsV8YRc+4T4Va1ZI2eSeTIQg== 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 4bGdZl6ztvzD2n; Tue, 10 Jun 2025 06:06:07 +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 55A6671M003587; Tue, 10 Jun 2025 06:06:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55A667mM003584; Tue, 10 Jun 2025 06:06:07 GMT (envelope-from git) Date: Tue, 10 Jun 2025 06:06:07 GMT Message-Id: <202506100606.55A667mM003584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c73436000a48 - main - unix/stream: rename uipc_wakeup() to uipc_wakeup_writer() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c73436000a48ef573a76d1049a74d41004b592a8 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c73436000a48ef573a76d1049a74d41004b592a8 commit c73436000a48ef573a76d1049a74d41004b592a8 Author: Gleb Smirnoff AuthorDate: 2025-06-10 05:10:44 +0000 Commit: Gleb Smirnoff CommitDate: 2025-06-10 06:05:07 +0000 unix/stream: rename uipc_wakeup() to uipc_wakeup_writer() Also remove reference to sowakeup(), it may cause more confustion than help. No functional change. --- sys/kern/uipc_usrreq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 95d857b2625d..c176119382fa 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1304,7 +1304,7 @@ out: } /* - * Our version of sowakeup(), used by recv(2) and shutdown(2). + * Wakeup a writer, used by recv(2) and shutdown(2). * * @param so Points to a connected stream socket with receive buffer locked * @@ -1314,7 +1314,7 @@ out: * receive lock is protecting us from the peer going away. */ static void -uipc_wakeup(struct socket *so) +uipc_wakeup_writer(struct socket *so) { struct sockbuf *sb = &so->so_rcv; struct selinfo *sel; @@ -1347,7 +1347,7 @@ uipc_cantrcvmore(struct socket *so) SOCK_RECVBUF_LOCK(so); so->so_rcv.sb_state |= SBS_CANTRCVMORE; if (so->so_rcv.uxst_peer != NULL) - uipc_wakeup(so); + uipc_wakeup_writer(so); else SOCK_RECVBUF_UNLOCK(so); } @@ -1503,7 +1503,7 @@ restart: if ((aio = sb->uxst_flags & UXST_PEER_AIO)) sb->uxst_flags &= ~UXST_PEER_AIO; - uipc_wakeup(so); + uipc_wakeup_writer(so); /* * XXXGL: need to go through uipc_lock_peer() after * the receive buffer lock dropped, it was protecting