From nobody Tue Nov 17 01:09:45 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 4jT68V1YB4z71Px5 for ; Tue, 17 Nov 2026 01:09:46 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jT68T6q0cz3CSl for ; Tue, 17 Nov 2026 01:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794877786; 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=e4CBS/LvQn/bpWFdbTQSAKCwb3IYqasNOqqyqONevjE=; b=aUsfayFE24+qBgmmIk5Vgu+yWQOpMVbJ1wOQ0Lmb/I/EWlFfzHwdA6smzUnhB+odl3Vba9 EjMhIhkxIf7oaaqq+ayunI3SfYUgsQf8veBXKv4YtLPkAFY+PWbe19mChLXc83rWF8tlYQ XYuu35l3Ja32wU/oZEMZi/w0My3Zv3zuz1yHM+vRt+v5x1LRD4DeNhKbiyOnVm3fO1Jhme NVf6obRYFk3LBx0bdDvbiQEkuMRHJ2fNmUmPOrSMG8/5oxJZZGjcXaDM2i+YbFqdoujJ4q h/+PcWcCsDSfcHzdOwB0EgvKENXc9OfN6w3sISidzkSsl+V5nl4YdlJjYXtWXw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794877786; b=HEfOb+NcDa9Ptx9jByBgbeE+nunaFxqTGAf+gyaFZA5N+0s1qmz5C4XR0WCzrUX1l7Alc6 SKIwoAedMmFLzite9QUa+Lo2rAbZIn+UBqoPcNMDeCNjhazM6jd3QF7Jb9/9mdRe+qF7Bp deQy6mWyQRM/zKjp//sfZ52LYKe2h7YSzA/weWHBSQQdmaoNrrDEsbQDkVxQH3o1OZP7PM v/A8hTXUL9n7vjtrMO0okvnSP2zp4JChCocSs4vH3gAQz6xvlGv5E9nQDs330Pwmi2OdWE cjcsgnnXP9dm4jQhcHTZj2H0vMBqPaP6RNr+JQ3+aoJU9VzoVJHGdrVL7MtItg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794877786; 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=e4CBS/LvQn/bpWFdbTQSAKCwb3IYqasNOqqyqONevjE=; b=J8e3gpz1a3fT4VtJ9oDvXrFDVUpyUC2yoT4QIHXF8kozYiKIWPnaE1W9+Ja8k5K3Vavdqh 3rOd/ZiY9Hi98YHawkZTvpm3tzIiIflg+tlKc1Yt4CKJuzZjqtrySDu22kFzX9pKYs4W2b +gpLqY53eZxSU17E/EI2Vz0FDO+dj+lrhj3rJozyTtATR4q6rnHJ7f1seqABY90EC4RMEl XlU1Y9JDWrGE3CnUfjyGinPlqd+HdFXCYMUJDeEQevvYF26ykOZUrlDtO7MQazgADvkDzb +LuvL6slUWDsVrhi5fDgRStSdDxj1D6yYc2B+SidH/deHv83zHwIXc36Zw7QmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jT68T6SMmzJF2 for ; Tue, 17 Nov 2026 01:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 15f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 01:09:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a9d7bc9a3242 - stable/15 - libthr cond_wait_user(): do not loop forever on clock error List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a9d7bc9a324277ad5f8bfc75c94da572c4702d27 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 01:09:45 +0000 Message-Id: <6afba959.15f.3bed6a9b@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a9d7bc9a324277ad5f8bfc75c94da572c4702d27 commit a9d7bc9a324277ad5f8bfc75c94da572c4702d27 Author: Konstantin Belousov AuthorDate: 2026-11-06 00:46:06 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-17 00:25:00 +0000 libthr cond_wait_user(): do not loop forever on clock error (cherry picked from commit e81badcfc010268d4935f4b4d28ebdbc0faebe0f) --- lib/libthr/thread/thr_cond.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c index c2ce9565e208..32efd4a14f1a 100644 --- a/lib/libthr/thread/thr_cond.c +++ b/lib/libthr/thread/thr_cond.c @@ -347,7 +347,7 @@ cond_wait_user(struct pthread_cond *cvp, struct pthread_mutex *mp, _pthread_exit(PTHREAD_CANCELED); else /* this should not happen */ return (error2); - } else if (error == ETIMEDOUT) { + } else if (error != 0 && error != EINTR) { sq = _sleepq_lookup(cvp); cvp->__has_user_waiters = _sleepq_remove(sq, curthread);