From nobody Sat Jan 31 18:28:09 2026 X-Original-To: dev-commits-src-branches@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 4f3LwV2WrLz6QgQB for ; Sat, 31 Jan 2026 18:28:10 +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 4f3LwT4mqyz42V2 for ; Sat, 31 Jan 2026 18:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769884089; 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=WRAZhR8FdSFVcGiUuZ16GRvPUbZ8UgzoNLvhBWfvtFE=; b=kua99zJk4DAipwwkDc4EaIffKqqOC1cNttyImT7HlS+1ONMxffOtssJSJF5cMWIfgz99tP Axsy8aOsrKPWNIqtwriC5OgGEBXRMkS3kMOwvrM2Mla1HxALeLf9Grqg88OAutuc/adAio mXrXQX5kZSZEsW9zgsS2t67TuDXpyJeu0xXeASLcViOZBQVimIx41J249CZD98M/B0c9Hv 82TP9bCMrLsbprVrAhqsbkf6iPzNuNhKgRCYrvhe1aXqvg1Lo09MmfGmbcXKVvtf+8W1Uf IfqM28UMow7BcwRADjEjTmdgIhY6/eogXm+iJa3I/tPTC/1FVj70MWwR4LXxxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769884089; a=rsa-sha256; cv=none; b=c1NoC4kjbCA5C9WgDpBhkCecFiLNB0l3ZkvVF2VLenvYsE/qwbL0Aa4zfXj5ffo15pRrF7 ILdUGSdiIlsLhHt2NNvcJwnvWE+iLWUV95TzYGj4tTz/eHXf0Vqs1qLOknycCBJgIcGI+k utjRPJAc+Jqf4zGrqvzc+anBMLjx9+/UKGxYsq+sNw0ljeVuE0hkLPkBKq7xfjtN3BqMjd c+GEytbnhe20y77wjwAKnIt9tO3tB18FbQaY8o939R2mBHroaw0uR9XaeJ/4koSdu1eq75 IKhqu5F/HytFyDFu07/pBFQNt4/OrIVUqgfW3tCVu1SzJ1t9JLfdQydu9Yc6PQ== 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=1769884089; 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=WRAZhR8FdSFVcGiUuZ16GRvPUbZ8UgzoNLvhBWfvtFE=; b=ax34iixbu3CkCYIOv8n9v4QD2DjZd1Zj14uce3+I8RnQA2w2B1fluk5NF9tuoFxgKV2t6n ESsWEIwqNpFPalgjHm5LZjgLEhpF2mwLCoCBXurHE4GAQ4QgS6LPvHBoOg7BhcVWh9T0rj dhhP4dFk5bMGcTFXSOATH6PqCUNA7Hjkt/Fiqr0tn/O4aYt0IbB04yTtH6U5Re/bSA3jBj aL6jA/R/V5xQsAB8Uc67jQuo39yN2OmZfc1zLfGfe8r5rN/nkLOmI6wr1Unx4gNSGbM3Sk 9RwtXboOyg0Me45gLGE0qY9cq8GyIqN5MzoNTtR3yL7A3aVX7tKBK0exBvS/Ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f3LwT44WHz14yp for ; Sat, 31 Jan 2026 18:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 241b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Jan 2026 18:28:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: c4e33387d079 - stable/14 - locking.9: Tweak the table column width to fit 80 characters List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: c4e33387d079266cd6cd8ba03047579da536330a Auto-Submitted: auto-generated Date: Sat, 31 Jan 2026 18:28:09 +0000 Message-Id: <697e49b9.241b3.58a4b93@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c4e33387d079266cd6cd8ba03047579da536330a commit c4e33387d079266cd6cd8ba03047579da536330a Author: Zhenlei Huang AuthorDate: 2025-12-28 15:57:51 +0000 Commit: Zhenlei Huang CommitDate: 2026-01-31 18:25:07 +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 (cherry picked from commit 176075e661fc657845d788ab3451e690c4e9bac6) (cherry picked from commit 14484cdb997c152def089c64a012b5a4596e1bfa) --- 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 ,