From nobody Sat Apr 16 02:18:47 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 213635D7EC4; 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 4KgH1h051Lz4mDV; Sat, 16 Apr 2022 02:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650075528; 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=V87XKPORfTm3sBehZX2G84U1slcu3LkYn48V+XifDck=; b=vxOSP5NYKZiNQWnbzVXyhON9irJdKU7rNua7kW3ZSdCNtRRJPS3I47To7Ia6kvg7f0nxuB XVIALTxAIrEUeGcXt+Uq3Z+F6bmn+f+lQYiP/FMN8OFv1sH4JMJeedBLXDKLmvFmmhQSYw oIoc+HYXALhT5WQr0rk3FfOH8gmVIwVQUyxDeXMSZUSW3o3k6AiFJPU/QcQvxh8sNH9c1m iCAyWl4Nw6gvFgg8yD5WdupbyYjiELj/w2WuW071vrTwarpIqiIMz0KHMRUhGUSAqqX204 /b99U5MnuMpk77vI9d1iG/D+FBFiHUdZ/1GyVGOzTbxuhxAYrc0vjUdRriZlOQ== 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 8B0AE20E48; Sat, 16 Apr 2022 02:18:47 +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 23G2IlK7025500; Sat, 16 Apr 2022 02:18:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23G2IlYg025499; Sat, 16 Apr 2022 02:18:47 GMT (envelope-from git) Date: Sat, 16 Apr 2022 02:18:47 GMT Message-Id: <202204160218.23G2IlYg025499@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: d52eaf841577 - stable/13 - procstat(1): add ability to specify subcommands not requiring pid lists 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: d52eaf8415771cfba410daad1cabc25162e93616 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650075528; 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=V87XKPORfTm3sBehZX2G84U1slcu3LkYn48V+XifDck=; b=VtNRiYXKLdSDthuXcWOeWbXDSniHi9E9bQFvm4vJVjgVAqMey76ZTPjjKGSBzV8vB8cVyC UgBIMQ4SGWKSzAh3ipI5dw1Rfq0khPhtyMAWB4zXYORFk32Mc3p+I6Zh3dIsbAYHNu2zNq od9d8vUbc3W/WK7rYiE4xjZ/yaLdj+mpT25mRG77KG76jQhHKKRcrBV3U3lFdtUsbj7xiP krmu4HZztPf8tZ5fupvObGOr3TRzY0nTU8IsJJ/6WeXoyqi3k1eWoRvqtWHKU2DVMczL38 CVUC+jb6a3Z7VI+cFPLqJR1vy2xddOQBGIlL0AorG/cqMpZQiWHQWVaHeoh7iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650075528; a=rsa-sha256; cv=none; b=fjs2P+CiGmcA2G+N0GCUV2MwRcbztjza1KElH/hxSOtRgPFWf7WajwzbPkJsinFmSFUPjb 39WP6KzAwJqJEV7KD6XmtvUa0GU8i7ESO8bpExIgr/pgDKXq7/0sbr7UYOB62ntKPQXvM0 s2nWPkWq+GTsDi0k4Ukvj4hE1HCj/h0JWohmTrToX0MEjWaXEAdPbuHZRRZSDBPUbUCGNu Wcr6SVN83lLGgJeT0vvhCg+N+HGgvkgFk3d/h09L0VreRsJVYtODVkFiUnlDbvSawX9E2k y+XmkySLEE4lHmvo8hHv5CY6gdmpC2hG0qkYkq07UPe2kQ91+Gfgtm5lk76ipg== 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=d52eaf8415771cfba410daad1cabc25162e93616 commit d52eaf8415771cfba410daad1cabc25162e93616 Author: Konstantin Belousov AuthorDate: 2022-04-07 18:27:12 +0000 Commit: Konstantin Belousov CommitDate: 2022-04-16 02:18:18 +0000 procstat(1): add ability to specify subcommands not requiring pid lists (cherry picked from commit e79866ddf1c2147890226830838dcca5174c18e1) --- usr.bin/procstat/procstat.c | 9 ++++++++- usr.bin/procstat/procstat.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.bin/procstat/procstat.c b/usr.bin/procstat/procstat.c index bb3b9e9de5a8..220f63f2703e 100644 --- a/usr.bin/procstat/procstat.c +++ b/usr.bin/procstat/procstat.c @@ -449,7 +449,8 @@ main(int argc, char *argv[]) } /* Must specify either the -a flag or a list of pids. */ - if (!(aflag == 1 && argc == 0) && !(aflag == 0 && argc > 0)) + if (!(aflag == 1 && argc == 0) && !(aflag == 0 && argc > 0) && + (cmd->cmp & PS_MODE_NO_KINFO_PROC) == 0) usage(cmd); if (memf != NULL) @@ -465,6 +466,11 @@ main(int argc, char *argv[]) xo_open_container(progname); xo_open_container(xocontainer); + if ((cmd->cmp & PS_MODE_NO_KINFO_PROC) != 0) { + cmd->cmd(prstat, NULL); + goto iter; + } + if (aflag) { p = procstat_getprocs(prstat, KERN_PROC_PROC, 0, &cnt); if (p == NULL) @@ -520,6 +526,7 @@ main(int argc, char *argv[]) } } +iter: xo_close_container(xocontainer); xo_close_container(progname); xo_finish(); diff --git a/usr.bin/procstat/procstat.h b/usr.bin/procstat/procstat.h index 5a0bc193ab45..5b54d4c4ff2f 100644 --- a/usr.bin/procstat/procstat.h +++ b/usr.bin/procstat/procstat.h @@ -44,6 +44,7 @@ enum { PS_OPT_SIGNUM = 0x08, PS_OPT_VERBOSE = 0x10, PS_MODE_COMPAT = 0x20, + PS_MODE_NO_KINFO_PROC = 0x40, }; #define PS_SUBCOMMAND_OPTS \