From nobody Mon Jul 27 10:17:19 2026 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 4h7vfR4l7Xz6mlQC for ; Mon, 27 Jul 2026 10:17:19 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h7vfR1hcGz3L8T for ; Mon, 27 Jul 2026 10:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785147439; 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=siStzRUO5xjykUTWTn6UURn3RB1G3511P1u15hahpbc=; b=fqamit/ANJQnvy6Tg5c3zteSE/mlyQqmcV6XzhY9rBvkxVFfir06xCo6izKcKxWqFBkXFP tyVoetV+yuM8X+ARqSj6RHIT4UT4G/Kgwi7FXF9ova0DBvAG4N0CZQNh1bgumOsKASIofB y4vtfr9GWAn5RbmQhHop8vmu7x9gfyEIDmWSR91agPH0QSa91pAnS8buXeDMN/YSMHPfjR 3ost9MU2h+ahxiVWcJpOIBEgVI02ALAdIF5d+3aZhxeKKXp97E+136wLyqNvSagybLuPaC AeMQ8WfBliTI1rQYGfsDG2v4aK8DLGuutJGAAZTcMgB2zLSWYZ4REWdvh/XlLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785147439; a=rsa-sha256; cv=none; b=noTXgHZnUxOf7qcEifGSyTZ34WHzH8N4XsDyaztk0cGb3BAJEsoZiBRUvZ6lCd3fhcf2v1 qQyYTBnoLYJY7QFEY3c204FptG2lbpY6fKMnxoiQy/rrUsVit0Nx4zBvQ1uLBGYll8Wmtl dGxcwQQZ03l9QAvWRhN1M68belPR/cVSpDC2En7Ea+wsbP7FD2Fqq+ZIYSyk3bKo/L+q10 NT4wKlP13hAOlty8ff6tgyMWTALih3NBAq03PTVPOoMrQu+QStcZZH9cxt0v+wRFKJoXzp aSldSB6MnTBPgTjMpybQhCLchE8jU8AQzh5RK+idXrZxQF47vuRVEAszVChgeQ== 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=1785147439; 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=siStzRUO5xjykUTWTn6UURn3RB1G3511P1u15hahpbc=; b=lGjcJk/bUzXUK4uuocN3muueSKnbmde7E4q0+8zp9K/p41hHhIlwekqROETKZKHAOLh8Xq FmQaIQXOghz8HM1R5DjHtVBYjaAoCEPF7dphLzfK7JPEwxTvswua5GGeHw/tiddstBNjPC Q9wTDR/reTAzkcuJgqsR7pl4+ELkza137TbNlMvOZrWsOVMBMpzFyxfaoDC7ERPkelQYkz nKFb2JWs+3xLniAXfm6ALx+Q9W+sbrJY2QndefDvdByDKr8UeMOegTKChDGraGXgp+mU8y vkyWJ93OOErq1EGjV9iMpw0Yc9Rml4T5WFvvUW08CvajiFQMD+n1jKuybYubEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h7vfR0KBQz14P5 for ; Mon, 27 Jul 2026 10:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e57f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 10:17:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: eddd8aa99ca8 - main - pwait: Add a SIGINFO handler 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eddd8aa99ca84c85faea5761af800b5b089d6ba1 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 10:17:19 +0000 Message-Id: <6a67302f.1e57f.61826772@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=eddd8aa99ca84c85faea5761af800b5b089d6ba1 commit eddd8aa99ca84c85faea5761af800b5b089d6ba1 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-27 10:15:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-27 10:15:36 +0000 pwait: Add a SIGINFO handler On SIGINFO, print a space-separated list or remaining processes to standard error. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D58386 --- bin/pwait/pwait.1 | 13 +++++++++++++ bin/pwait/pwait.c | 36 +++++++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/bin/pwait/pwait.1 b/bin/pwait/pwait.1 index 2776d3439a31..4bd43257a82b 100644 --- a/bin/pwait/pwait.1 +++ b/bin/pwait/pwait.1 @@ -88,6 +88,18 @@ Print the exit status when each process terminates or .Ql timeout if the timer goes off earlier. .El +.Pp +If +.Nm +receives +.Dv SIGINFO +(see the +.Sy status +argument for +.Xr stty 1 ) +signal, +a space-separated list of processes still being waited on is printed +to the standard error output. .Sh EXIT STATUS The .Nm @@ -148,6 +160,7 @@ $ echo $? .Xr kill 1 , .Xr pkill 1 , .Xr ps 1 , +.Xr stty 1 , .Xr wait 1 , .Xr kqueue 2 .Sh NOTES diff --git a/bin/pwait/pwait.c b/bin/pwait/pwait.c index 36c6644f5474..a58dfbbcce4d 100644 --- a/bin/pwait/pwait.c +++ b/bin/pwait/pwait.c @@ -87,7 +87,7 @@ main(int argc, char *argv[]) size_t sz; long pid; pid_t mypid; - int i, kq, n, ndone, nleft, notes, opt, pid_max, ret, status; + int i, kq, n, ndone, nev, nleft, notes, opt, pid_max, ret, status; bool oflag, pflag, rflag, tflag, verbose; oflag = false; @@ -165,10 +165,10 @@ main(int argc, char *argv[]) if (sysctlbyname("kern.pid_max", &pid_max, &sz, NULL, 0) != 0) { pid_max = 99999; } - if ((e = malloc((argc + tflag) * sizeof(*e))) == NULL) { + if ((e = malloc((argc + 1 + tflag) * sizeof(*e))) == NULL) { err(EX_OSERR, "malloc"); } - ndone = nleft = 0; + ndone = nev = nleft = 0; mypid = getpid(); notes = rflag ? NOTE_REAP : NOTE_EXIT; if (verbose) @@ -208,18 +208,28 @@ main(int argc, char *argv[]) ndone++; } else { nleft++; + nev++; } } + /* + * Detect SIGINFO so we can print a status. + */ + EV_SET(e + nev, SIGINFO, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + if (kevent(kq, e + nev, 1, NULL, 0, NULL) == -1) { + err(EX_OSERR, "kevent"); + } + nev++; if ((ndone == 0 || !oflag) && nleft > 0 && tflag) { /* * Explicitly detect SIGALRM so that an exit status of 124 * can be returned rather than 142. */ - EV_SET(e + nleft, SIGALRM, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); - if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) { + EV_SET(e + nev, SIGALRM, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + if (kevent(kq, e + nev, 1, NULL, 0, NULL) == -1) { err(EX_OSERR, "kevent"); } + nev++; /* Ignore SIGALRM to not interrupt kevent(2). */ signal(SIGALRM, SIG_IGN); if (setitimer(ITIMER_REAL, &itv, NULL) == -1) { @@ -227,13 +237,25 @@ main(int argc, char *argv[]) } } ret = EX_OK; + setvbuf(stderr, NULL, _IOLBF, 0); while ((ndone == 0 || !oflag) && ret == EX_OK && nleft > 0) { - n = kevent(kq, NULL, 0, e, nleft + tflag, NULL); + n = kevent(kq, NULL, 0, e, nev, NULL); if (n == -1) { err(EX_OSERR, "kevent"); } for (i = 0; i < n; i++) { - if (e[i].filter == EVFILT_SIGNAL) { + if (e[i].filter == EVFILT_SIGNAL && + e[i].ident == SIGINFO) { + p = RB_MIN(pidtree, &pids); + fprintf(stderr, "%d", p->pid); + while ((p = RB_NEXT(pidtree, &pids, p)) != NULL) { + fprintf(stderr, " %d", p->pid); + } + fprintf(stderr, "\n"); + continue; + } + if (e[i].filter == EVFILT_SIGNAL && + e[i].ident == SIGALRM) { if (verbose) { printf("timeout\n"); }