From nobody Mon Jun 9 23:53:21 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 4bGTJf3RhBz5yhPS; Mon, 09 Jun 2025 23:53:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bGTJd5Fwvz3KKY; Mon, 09 Jun 2025 23:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749513201; 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=Z53cA1/MKvO6U159sZia7UE9TbtDTj6AqR00Nm/9BSc=; b=heFhtIdr1FNrUFLErMFAyS2aAuS1c33tq7kBC+XGVN4cUwBkx+ITfE8CgLVCMuozbEe/ne hEvKxadgp61fM2Hzy9D2bDv//OmfZakztLUzJDsKMtU/OXpu6AAzGuY+TKFS0BJ5oETGYr dXqknUn6NaGfJFGSyH2npmNcUe4DQK6TaQTIHE+0j/uVGcNXvrtYt6elqzxAACDx1uN+ZT biGL2GrxYPydHb6a+HSw7AEQwUH4IXCuvahV9DoZJcpwkEqmQnm347vRYVGD+7+7u4iPRq mEF9n8QFQkixCDGs22D0pqMjWbeXvWGmobX30sqzRQ3KF3Jm00eSGA3tM2hBrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749513201; 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=Z53cA1/MKvO6U159sZia7UE9TbtDTj6AqR00Nm/9BSc=; b=tDVAxIZGT6Wi/lunOKDjNmCIF8YDHAqQOWF8FPRY5HA7uoLpqnkN1vj058zM5EFPLn6nlD Ao8+iK5CqPVjX1cxw8M90prUOX5TFXKWFS38M5MKkzmhDggW4cV1yUxU6g10vy9rmgz4mK ix7lUsDnMywgGAntaAIjE8szoqYBDAxCxNDmyqBVJummUd84eEE3RCIqyVN8wVau31xeff NQKPriS2IqkgMeb7FuFttOa4TjRsox0HoHxaCwJTOcUGLQ5vFVs1OEL2s1dfRddDTi9pgC TOCWP8jbqaxyI6RXFDwKXpYxrR4kTuVKWVumtuBPXn/d9OJ79tuGEfrXkvMuWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749513201; a=rsa-sha256; cv=none; b=pGmJ0iTW8UedjRlNonM4QuIBFIRSclsqcjCPw4BWsm/Z/wWj0ryFU9vbz+1cFYtbDLOIYB 9j5XGSVDCF4r8fp3PcVpfpVwT2ToDVghCkECJ7GWdqXV/eRpA2quQGJZCFKyRjpYvCD3qX 1lutZrixaxl7H3eQdcY5eNVu/gKA5xJyaDm266ew1WGPzkzkJaOc/mj/tUKN/pxaIapsQ9 dQ/VcpRh1YmxBl0VZqIloHDcP0ej59R9D0X5xOEkXFc0ZsfhhM0pWP1gBg/FYTEnfXghYR AbBNf8JUgSTxatUzeoX/+0CSgZuUGOcUWi4ReQIwwfVMUT4x7JOWHhZ2jd4SJw== 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 4bGTJd4bnMz1wj; Mon, 09 Jun 2025 23:53:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 559NrLSO006858; Mon, 9 Jun 2025 23:53:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 559NrLOa006855; Mon, 9 Jun 2025 23:53:21 GMT (envelope-from git) Date: Mon, 9 Jun 2025 23:53:21 GMT Message-Id: <202506092353.559NrLOa006855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 81ef00125056 - main - timeout(1): pass full 32bit error return code from the exited child 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81ef00125056a68ca3bba1424d6cb13533bf474c Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=81ef00125056a68ca3bba1424d6cb13533bf474c commit 81ef00125056a68ca3bba1424d6cb13533bf474c Author: Konstantin Belousov AuthorDate: 2025-06-09 03:20:16 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-09 23:52:34 +0000 timeout(1): pass full 32bit error return code from the exited child Switch to use waitid(2) to receive siginfo_t with the complete error code from the exited process. Tested by: pho Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50752 --- bin/timeout/timeout.c | 58 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index f47976aa27df..58a5797f3eaf 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -277,12 +277,25 @@ kill_self(int signo) sys_signame[signo], signo); } +static void +log_termination(const char *name, const siginfo_t *si) +{ + if (si->si_code == CLD_EXITED) { + logv("%s: pid=%d, exit=%d", name, si->si_pid, si->si_status); + } else if (si->si_code == CLD_DUMPED || si->si_code == CLD_KILLED) { + logv("%s: pid=%d, sig=%d", name, si->si_pid, si->si_status); + } else { + logv("%s: pid=%d, reason=%d, status=%d", si->si_pid, + si->si_code, si->si_status); + } +} + int main(int argc, char **argv) { - int ch, status, sig; + int ch, sig; int pstat = 0; - pid_t pid, cpid; + pid_t pid; int pp[2], error; char c; double first_kill; @@ -295,6 +308,7 @@ main(int argc, char **argv) sigset_t zeromask, allmask, oldmask; struct sigaction sa; struct procctl_reaper_status info; + siginfo_t si, child_si; const char optstr[] = "+fhk:ps:v"; const struct option longopts[] = { @@ -414,26 +428,27 @@ main(int argc, char **argv) if (sig_chld) { sig_chld = 0; - while ((cpid = waitpid(-1, &status, WNOHANG)) != 0) { - if (cpid < 0) { + for (;;) { + memset(&si, 0, sizeof(si)); + error = waitid(P_ALL, -1, &si, WEXITED | + WNOHANG); + if (error == -1) { if (errno != EINTR) break; - } else if (cpid == pid) { - pstat = status; + } else if (si.si_pid == pid) { + child_si = si; child_done = true; - logv("child terminated: pid=%d, " - "exit=%d, signal=%d", - (int)pid, WEXITSTATUS(status), - WTERMSIG(status)); - } else { + log_termination("child terminated", + &child_si); + } else if (si.si_pid != 0) { /* * Collect grandchildren zombies. * Only effective if we're a reaper. */ - logv("collected zombie: pid=%d, " - "exit=%d, signal=%d", - (int)cpid, WEXITSTATUS(status), - WTERMSIG(status)); + log_termination("collected zombie", + &si); + } else /* si.si_pid == 0 */ { + break; } } if (child_done) { @@ -482,13 +497,14 @@ main(int argc, char **argv) if (timedout && !preserve) { pstat = EXIT_TIMEOUT; + } else if (child_si.si_code == CLD_DUMPED || + child_si.si_code == CLD_KILLED) { + kill_self(child_si.si_status); + /* NOTREACHED */ + } else if (child_si.si_code == CLD_EXITED) { + pstat = child_si.si_status; } else { - if (WIFSIGNALED(pstat)) - kill_self(WTERMSIG(pstat)); - /* NOTREACHED */ - - if (WIFEXITED(pstat)) - pstat = WEXITSTATUS(pstat); + pstat = EXIT_FAILURE; } return (pstat);