From nobody Wed Apr 16 19:46:34 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 4ZdBNr0Hbbz5t8Mt; Wed, 16 Apr 2025 19:46:36 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZdBNq3Cg0z3l3J; Wed, 16 Apr 2025 19:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744832795; 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=eOsQuVZm/kLqva26lbFTbrURKOzsc099HPzMqedgtso=; b=c3TSus0w1TbPDUiygb+T9yP1yGahK9Vhk9UTjNA688rnhcDIkMoNq8oIwiBxxu4vZXghRU cSfCjX5Z5+xqk1OfdVnqkh8Jb2fE/aZ7Q3v8ADHPR6guuR1g5PzvcBPvC9pCDwRxdHdChu 1eLbBR4W/14EFXgAGlvxoBKPJv3eogN5Vt5tv/5YpgPRzlinhCZF2iiaqa2Sor+f6duoZd 5vQQEcBKyhtJylq5ukK7+1UIaEvZpE8t4k/rQastuk72VmiYPLWM7Az4QoTtKJmDVfEpzT U1JH3yydDa0nIEwpMQcjS9zcyvlJf0MgVWADv8NSa7JRexklhdsH1YOQm97eVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744832795; a=rsa-sha256; cv=none; b=I9JQ233+6rbpxNsPnYTvxYMy2XG8Lv0RL+F0mVioNbnMtVbblYkwYx8pwi9gkkEl0fMUXJ 9q2DKTFdUOfZnSkcjlTvakBOptPDwrztCI6tOSFrbbKObtaZkWXa5R0/SEiWsr/HGp+wry 4SBABT20WW3X9iD2RS87+WTeeRFMfjOjvSUtB+oqsu+FNondSb5OWmCz7OUmTYnadPZ4Cl aQKgjE4NCq6J/ST0FZ/fKpRrLTtGRgTQqd4AA+kmSVXbw0yMmfIUY4i3Dd4+e9R5XMc3Ms chGyEzT3BoK5rpbGzksB4AFOUoutZ5tM/s51Fw6O2jt2s96VNp/Z2i90W+9ZDw== 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=1744832795; 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=eOsQuVZm/kLqva26lbFTbrURKOzsc099HPzMqedgtso=; b=hZA4sz2vZN/uSAqPsI6ySHW28VqOLqQZxCHEYIBgBOf/O3g5O0LaAOEqswOqBrVa7oKy33 sxvsSQx2fL37osamYQjGIiDlC0hXNOR802yWxn+JWo+QIomLr06lsDNaYAa1m/WzYBQh8N EZSmthzP2altYC6Z4FOZahjEpJg6hr9GGYxCjg5V8wPN5BN+hU7nTl+ZwrOKHhaHRa+SBu JQYKaQUugYmdZ9JzbrgQ42G0b+XQhNbjiasTJL6EswROmyiLEJI1j0jHiJEYxWCIkjsDSx aq06GtSKGhQYYeb/EKqeWoXQJQE1VHA81vD0QKOCzknlBLRx1lbjjI4OCf/n5Q== 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 4ZdBNq07wJz2JS; Wed, 16 Apr 2025 19:46:35 +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 53GJkYwF063848; Wed, 16 Apr 2025 19:46:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53GJkYRb063845; Wed, 16 Apr 2025 19:46:34 GMT (envelope-from git) Date: Wed, 16 Apr 2025 19:46:34 GMT Message-Id: <202504161946.53GJkYRb063845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8e1d9fe06621 - main - timeout(1): Improve to show more verbose log messages 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e1d9fe06621e22b9de6b3bf1b6164a00f0f26b5 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8e1d9fe06621e22b9de6b3bf1b6164a00f0f26b5 commit 8e1d9fe06621e22b9de6b3bf1b6164a00f0f26b5 Author: Aaron LI AuthorDate: 2025-04-02 16:17:17 +0000 Commit: Baptiste Daroussin CommitDate: 2025-04-16 19:45:38 +0000 timeout(1): Improve to show more verbose log messages --- 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);