From nobody Sun Dec 28 15:58:51 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 4dfPCw2BYXz6Lyys for ; Sun, 28 Dec 2025 15:58:52 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dfPCv74x4z3KR1 for ; Sun, 28 Dec 2025 15:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766937532; 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=C7/y7XOQnf22d4GpJMDxZilkVh2az74Dc6WebdonJ0U=; b=HXL+mkYNAYql/kLBy1U7jUUpBjJFmyaEofYcPRtj0RebDCZsevvAPVvsY9B6pc5Lpl+Dlm SM+3rHoMQ62ECrc0uGXCJgTpVknhBbTP2wLWo/sbxzNDTXw9Wq8nlB+mBeUP5wI0MqYQAo +4bkexjVEghvMbx+/Dughir6Fb+FH0sXEsjOAL3tJjD2iPhsA9BoBDqB9aRI1QzP4cwXr0 W3KSni3lN8ZzMFt1sEDmk9SV6vKuChVuAzqVyhV6TnC6Usftw1OJBq+3H27Qm6uGT71BCd rkVr90Sbdkc04furm8Nfw4RfT4i/KgMgKaYqL/1WJ0UMHwIjSIihVE47j2fmEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766937532; 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=C7/y7XOQnf22d4GpJMDxZilkVh2az74Dc6WebdonJ0U=; b=XSOhNTtKKLwZ/gfbOwAV4Kg4E4rqTUIHxH4GfrM7PWfDVwaXTpvF8pvoC5S2DOtf/3BZTo jojaOmiLWvfh5m31lKXeEuAaOWF/uvd+vpr15JL/SHQHHrtavgwBiWR1TfiyltDffjMQ4s qfsTDwdGX//L5EwNTXK7kzPbZPRzs1o14HwUV7P+abC21idn+XeuaswmNWBcB8o4p/WpdY biIzH0a3AysDQoXbu1v/DwRxrTZsfIK/TPVW/KF4X1Xl/Ufc3sZxfS6T4F/7R9Gj6Bov3b 7aR1tlsh33fMlv8YCg9V4TqDRZunjR51kEwrg9jAJ+4oeP2IzkLMYUPDvl2mOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766937532; a=rsa-sha256; cv=none; b=BOIyJoT3FXh7jX6wrEVmV7+v8yqoHjAxz87sLqPY6xrn5AvQloRay55y7MvPD9BJPic4G8 k/xlzkdVTj1u14DQB8pvVXN3AZONE8J68NOzDnOOrfn5sEseZ+DqfWw0DYUGty9ylBTGjS Vp4sruxd3Nh7wd7jAU7JR3uZ6/vAeXfiJUPeL8cXUJzTV5UaB97pnx52gZseT6rY6bmW89 rw9pLApt9fYYM5IjQX7zAxdO5XCZ2wbG8icJKTkLD5D9Xlr8WpK1hCymAollzgKQRlwjHf 9wYbxPH2a1KAvJF3rnima/iJE7MsFHNk3AD1fVemu41LGqMpXeDWwb2zAxWbUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dfPCv61CFzrLg for ; Sun, 28 Dec 2025 15:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 478f9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Dec 2025 15:58:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 176075e661fc - main - locking.9: Tweak the table column width to fit 80 characters 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 176075e661fc657845d788ab3451e690c4e9bac6 Auto-Submitted: auto-generated Date: Sun, 28 Dec 2025 15:58:51 +0000 Message-Id: <695153bb.478f9.11660efc@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=176075e661fc657845d788ab3451e690c4e9bac6 commit 176075e661fc657845d788ab3451e690c4e9bac6 Author: Zhenlei Huang AuthorDate: 2025-12-28 15:57:51 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-28 15:57:51 +0000 locking.9: Tweak the table column width to fit 80 characters While here, add some white spaces to improve the readability of source code. Reviewed by: ziaee, #manpages MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54121 --- share/man/man9/locking.9 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index b29cd07e2c2a..ad044b6e1d46 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 3, 2023 +.Dd December 28, 2025 .Dt LOCKING 9 .Os .Sh NAME @@ -371,9 +371,9 @@ functions, and any of the .Fn sleep functions. -.Bl -column ".Ic xxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXX" -offset 3n +.Bl -column " You want:" "spin mtx " "mutex/rw " "rmlock " "sleep rm " "sx/lk " -offset 3n .It Em " You want:" Ta spin mtx Ta mutex/rw Ta rmlock Ta sleep rm Ta sx/lk Ta sleep -.It Em "You have: " Ta -------- Ta -------- Ta ------ Ta -------- Ta ------ Ta ------ +.It Em "You have:" Ta -------- Ta -------- Ta ------ Ta -------- Ta ----- Ta ------ .It spin mtx Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no-1 .It mutex/rw Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no-1 .It rmlock Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no-1 @@ -407,13 +407,13 @@ Note that non-blocking try operations on locks are always permitted. .Ss Context mode table The next table shows what can be used in different contexts. At this time this is a rather easy to remember table. -.Bl -column ".Ic Xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXXXX" ".Xr XXXXXX" -offset 3n +.Bl -column "interrupt filter: " "spin mtx " "mutex/rw " "rmlock " "sleep rm " "sx/lk " -offset 3n .It Em "Context:" Ta spin mtx Ta mutex/rw Ta rmlock Ta sleep rm Ta sx/lk Ta sleep .It interrupt filter: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no .It interrupt thread: Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no -.It callout: Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no -.It direct callout: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no -.It system call: Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok +.It callout: Ta \&ok Ta \&ok Ta \&ok Ta \&no Ta \&no Ta \&no +.It direct callout: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no +.It system call: Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok .El .Sh SEE ALSO .Xr lockstat 1 ,