From nobody Sat Apr 16 02:18:48 2022 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 3C0D77C8192; Sat, 16 Apr 2022 02:18:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KgH1j0XSJz4m1G; Sat, 16 Apr 2022 02:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650075529; 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=57JwdQLfbCaDhGdiUhM4d64vX1yShd8ArRNxZVsrGIc=; b=FZ+qqeAJmgzY7dHFpISRdJyvoi45bxE0FmAfg4tuunM3rc0KXrhLFtnnVhf4KaerFDeSUw ddf06xgVknqZcEJHO+Z2b9xQ8P+Iz1uLGcbTXRfYL2eHHUKSPA1cOA9mDjIz6Kc9PPIV/E g0t5dtXWuZCjbt4+yMpJUDqjsJ0CObtyYKTstOf1C/3lQhiJr0XpsTaA68I84DM9G+GSG4 trhGg3ETRlq/lSvkhZVmG0LFzqNradX900m1WXf1Tf+vOumvgz91bUdYQEFfuESuhP6vSW RTYwQn0zUmJGABlZ81LQ3PTB4Id3qyO2K7fMrGi7+/fkQ/oP8BGpx5l45xIEmw== 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 AB2C020BFF; Sat, 16 Apr 2022 02:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23G2Imvv025527; Sat, 16 Apr 2022 02:18:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23G2Imqd025526; Sat, 16 Apr 2022 02:18:48 GMT (envelope-from git) Date: Sat, 16 Apr 2022 02:18:48 GMT Message-Id: <202204160218.23G2Imqd025526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 539dc6ea3b4e - stable/13 - Implement procstat(1) advlocks command 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 539dc6ea3b4eca6a9a02e273f57042220fecbb85 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650075529; 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=57JwdQLfbCaDhGdiUhM4d64vX1yShd8ArRNxZVsrGIc=; b=moZutYzhjdb6NJfOm93pvKkFpSHfLIdHR9nGo9enw9AeagWU0A7njzd05LbDXva0SK0a16 wdYis2kU4uK6cDmSQn1txyLJkqRSF4qbb3VMHc9JiLF6L+6BbIuM0ykxC++oSQQ7Gb5Q1m 0YnyePnXrRQAnrBmgJPF3KhxTNSM5oeCVcGaNd2BfdMjqkE2m4ALOIMbbTg4JHX6nFMVJH cSPIglXH2/STUM9UfZ+NBL+dpt7BVoDI0FWYASVzqe9Y2rd6XbMsjlsnFOS5437xBYxfCs hVAlYrDGbGbfYVyOZPR2eJ8O2T3Q0x8FlWNDG9b8j/QOMR6/SxoeBpt0Rpn3lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650075529; a=rsa-sha256; cv=none; b=Ss/033yDCdznZh5nvQAYl1l2pvPiWx4lI2lS9heyoNukF1vhHEFnv3AXgzgRLmAV1h3g0o sbGymoOm5wkq/RQTZARuQIfFHtb8nv0hFaPFPuWdnAo+s+yMLvWTvATF6tHXD6ijHYZ/MT VADKxmqO2J4n5r8l1VO000ZnjmTkEBPLKacXNR23yhKCm+fMlgsCuv7gq+44JcB48EyXYd 2xzxtu8dA+MVv7kKL4STd56y6yv87m+qx3heBXak6oQDkXYcZXZH0PkT7wzk0ylcERiGIN uQurVpg9HhZXiSJ39n5UnQHFt7N9H/p1AqwPwXPekxT7OVPY7wIOB36+5KjHxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=539dc6ea3b4eca6a9a02e273f57042220fecbb85 commit 539dc6ea3b4eca6a9a02e273f57042220fecbb85 Author: Konstantin Belousov AuthorDate: 2022-04-02 14:13:17 +0000 Commit: Konstantin Belousov CommitDate: 2022-04-16 02:18:18 +0000 Implement procstat(1) advlocks command (cherry picked from commit a5229a255ea9e67fe935da1f566be803c1e7f99f) --- usr.bin/procstat/Makefile | 1 + usr.bin/procstat/procstat.c | 2 + usr.bin/procstat/procstat.h | 1 + usr.bin/procstat/procstat_advlock.c | 102 ++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+) diff --git a/usr.bin/procstat/Makefile b/usr.bin/procstat/Makefile index 0b88f2f4634a..85bff9dae3e2 100644 --- a/usr.bin/procstat/Makefile +++ b/usr.bin/procstat/Makefile @@ -5,6 +5,7 @@ PROG= procstat MAN= procstat.1 SRCS= procstat.c \ + procstat_advlock.c \ procstat_args.c \ procstat_auxv.c \ procstat_basic.c \ diff --git a/usr.bin/procstat/procstat.c b/usr.bin/procstat/procstat.c index 220f63f2703e..2388c035b431 100644 --- a/usr.bin/procstat/procstat.c +++ b/usr.bin/procstat/procstat.c @@ -87,6 +87,8 @@ static const struct procstat_cmd pacmd_table[] = { /* procstat parameters and arguments */ static const struct procstat_cmd cmd_table[] = { + { "advlock", "advisory_locks", NULL, &procstat_advlocks, &cmdopt_none, + PS_CMP_PLURAL | PS_CMP_SUBSTR | PS_MODE_NO_KINFO_PROC }, { "argument", "arguments", NULL, &procstat_args, &cmdopt_none, PS_CMP_PLURAL | PS_CMP_SUBSTR }, { "auxv", "auxv", NULL, &procstat_auxv, &cmdopt_none, PS_CMP_NORMAL }, diff --git a/usr.bin/procstat/procstat.h b/usr.bin/procstat/procstat.h index 5b54d4c4ff2f..d3bd12d42ffd 100644 --- a/usr.bin/procstat/procstat.h +++ b/usr.bin/procstat/procstat.h @@ -57,6 +57,7 @@ struct kinfo_proc; void kinfo_proc_sort(struct kinfo_proc *kipp, int count); const char * kinfo_proc_thread_name(const struct kinfo_proc *kipp); +void procstat_advlocks(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_args(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_auxv(struct procstat *prstat, struct kinfo_proc *kipp); void procstat_basic(struct procstat *prstat, struct kinfo_proc *kipp); diff --git a/usr.bin/procstat/procstat_advlock.c b/usr.bin/procstat/procstat_advlock.c new file mode 100644 index 000000000000..e0b256a8023a --- /dev/null +++ b/usr.bin/procstat/procstat_advlock.c @@ -0,0 +1,102 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 The FreeBSD Foundation + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "procstat.h" + +void +procstat_advlocks(struct procstat *prstat, struct kinfo_proc *kipp __unused) +{ + struct advlock_list *advl; + struct advlock *a; + static const char advisory_lock_item[] = "advisory_lock"; + + if ((procstat_opts & PS_OPT_NOHEADER) == 0) + xo_emit("{T:/%2s %5s %5s %5s %18s %18s %8s %9s %9s %s}\n", + "RW", "TYPE", "PID", "SYSID", "FSID", "RDEV", "INO", + "START", "LEN", "PATH"); + + xo_open_list(advisory_lock_item); + advl = procstat_getadvlock(prstat); + if (advl == NULL) { + xo_close_list(advisory_lock_item); + return; + } + + STAILQ_FOREACH(a, advl, next) { + xo_open_instance(advisory_lock_item); + switch (a->rw) { + case PS_ADVLOCK_RO: + xo_emit("{:rw/%s} ", "RO"); + break; + case PS_ADVLOCK_RW: + xo_emit("{:rw/%s} ", "RW"); + break; + default: + xo_emit("{:rw/%s} ", "??"); + break; + } + switch (a->type) { + case PS_ADVLOCK_TYPE_FLOCK: + xo_emit("{:type/%s} ", "FLOCK"); + break; + case PS_ADVLOCK_TYPE_PID: + xo_emit("{:type/%s} ", "FCNTL"); + break; + case PS_ADVLOCK_TYPE_REMOTE: + xo_emit("{:type/%s} ", "LOCKD"); + break; + default: + xo_emit("{:type/%s} ", "?????"); + break; + } + xo_emit("{:pid/%5d} ", a->pid); + xo_emit("{:sysid/%5d} ", a->sysid); + xo_emit("{:fsid/%18#jx} ", (uintmax_t)a->file_fsid); + xo_emit("{:rdev/%#18jx} ", (uintmax_t)a->file_rdev); + xo_emit("{:ino/%8ju} ", (uintmax_t)a->file_fileid); + xo_emit("{:start/%9ju} ", (uintmax_t)a->start); + xo_emit("{:len/%9ju} ", (uintmax_t)a->len); + xo_emit("{:path/%s}", a->path == NULL ? "" : a->path); + xo_emit("\n"); + xo_close_instance(advisory_lock_item); + } + xo_close_list(advisory_lock_item); + procstat_freeadvlock(prstat, advl); +}