From nobody Mon Jun 16 08:54:05 2025 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 4bLP1n5PMCz5VqBH; Mon, 16 Jun 2025 08:54:05 +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 4bLP1n2S4fz3wlB; Mon, 16 Jun 2025 08:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064045; 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=XT5gbQDmiHDdZEKIoMoDcZeLu3No5U6f4mrVrJOp6z0=; b=NWKqtQ7ks9lIjm2FDv/LFY2R4gYVuVMTnIjBfhHadPpTdKFF8TDm2TPPzpnKiagU8iuwSf FGScz3bY5eUOYYbvzaV9Mj8ECnI/+9+smaw3Ku370AMU4p/XytwGYC0nOKexlDwqQuBBhn zp3UkATaEYdpDWPejN8bXQffEugpEVmp+kzWb4BMMZR8quVpdV2o9nbmR2nbsbRWoJFyqG tzYnU2Uj8xmwppqM5iHQMRq/97UHtsjF6GTJTZuVRJHAJw2Hs5b6s93nZmXkrcuRxkmz+v DczMg+jXJjZYx2UwbxqXNpJrlvd6jnMGxBnqXvkN7JNLx5MCkM58W6kxPANF7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750064045; 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=XT5gbQDmiHDdZEKIoMoDcZeLu3No5U6f4mrVrJOp6z0=; b=tpwt7NSFw8r9snXgEHgW5zFWB2U2LSX6DEAEdoMaoH0ox2hM5d4qoW+SXzBVzj0CVpOUtl CZ/8MDWKQL/1Qd0BBBINr6R1dMWdSr0hyLVYUS/vCYRTmvMjTgaIMihXJv2Erj2lU6KSxQ NFVcWq4heUrYTkN7idExxJxX/d5euGbOqLslN83K7xQqmeNTddoYMWGx4cKC7Gh5KjuHaZ hmlKRCdQQdV8ERcbnr9AIwcdOyPsN5jMvCEgjnOpkPfXlk9wnP8+Mb8/ttGkbtGcfFv0k2 RGLBMAPxULavhP+xLIPIiAe1d7yurhwLBNAIkDd0PlSU3aVJm0aigDNxU3bkMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750064045; a=rsa-sha256; cv=none; b=WwjL5TaVAw+NOKHuIsPUwl5afi/XBMqyXInNWNiugzcpE7Gz/hNS+XnoE+ChPAOcxStTF2 nnP9Tjyc0o2eUH1eu/ZW6mDPoHAWH6HdyjCXNn6kTbX/eLg+2ROsfcBgL8bIYtgiZJKo+R vPIrRh2/wMYUh8AECXxn/bhu2QAo9mVEJ9OlwozD3iCaTT8cVMGUkJ3hnukDf+zTkAwtQX n1PI1kyO9yXwkYPvVRXkbKOK4FvAPwSVkf3cHw8QW8xmGs2kYBsprPTt99lbCdsjFa7PZ4 PZYeF76IrwkmJSaYFwrFWn2OI7cPZuxFdC7Xa2Wx87qii/+TxLLeo6vMEuKJhQ== 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 4bLP1n1vtJzrFl; Mon, 16 Jun 2025 08:54:05 +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 55G8s5hr043353; Mon, 16 Jun 2025 08:54:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55G8s5se043350; Mon, 16 Jun 2025 08:54:05 GMT (envelope-from git) Date: Mon, 16 Jun 2025 08:54:05 GMT Message-Id: <202506160854.55G8s5se043350@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: f358b8dc7418 - stable/14 - timeout(1): Improve to show more verbose log messages 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 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/14 X-Git-Reftype: branch X-Git-Commit: f358b8dc7418776592470b9f08585431ac81632e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f358b8dc7418776592470b9f08585431ac81632e commit f358b8dc7418776592470b9f08585431ac81632e Author: Aaron LI AuthorDate: 2025-04-02 16:17:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-16 08:51:53 +0000 timeout(1): Improve to show more verbose log messages (cherry picked from commit 8e1d9fe06621e22b9de6b3bf1b6164a00f0f26b5) --- bin/timeout/timeout.1 | 6 +++++- bin/timeout/timeout.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bin/timeout/timeout.1 b/bin/timeout/timeout.1 index 3eacdd768410..14fc19292684 100644 --- a/bin/timeout/timeout.1 +++ b/bin/timeout/timeout.1 @@ -89,7 +89,11 @@ By default, .Dv SIGTERM is sent. .It Fl v , Fl -verbose -Show information to stderr about any signal sent on timeout. +Show information to +.Xr stderr 4 +about timeouts, signals to be sent, and the +.Ar command +exits. .El .Ss Duration Format The diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index c3c7532a9d08..8a2f0faecd83 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -344,6 +344,19 @@ main(int argc, char **argv) } else if (cpid == pid) { pstat = status; child_done = true; + logv("child terminated: pid=%d, " + "exit=%d, signal=%d", + (int)pid, WEXITSTATUS(status), + WTERMSIG(status)); + } else { + /* + * 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)); } } if (child_done) { @@ -361,9 +374,12 @@ main(int argc, char **argv) sig = killsig; sig_alrm = 0; timedout = true; + logv("time limit reached or received SIGALRM"); } else { sig = sig_term; sig_term = 0; + logv("received terminating signal %s(%d)", + sys_signame[sig], sig); } send_sig(pid, sig, foreground);