From nobody Mon Aug 3 00:25:32 2026 X-Original-To: dev-commits-src-branches@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 4hCyBP40ssz6mjJW for ; Mon, 03 Aug 2026 00:25:33 +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 4hCyBP0wrBz4PHT for ; Mon, 03 Aug 2026 00:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785716733; 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=xAyCmc5VGet0nHVXpIeqCqg2kXRCJWwKjaBw7IqGkfw=; b=FidOVu1oyceg54VVrLYF3wjx7YX7SGexdNhfunaQSVAmfGP832VWPOacEfCLbmCoLDdhZx C0gBMSiF+8K2CxDsRBG7pNdrbAQuUcuYLali0HdMrKhBj47GzwMxHo4QDqWZ/R3Q6sTT0h yRP9T0BwE+OmAskiH54SPaYPOX6Aieqmr82+KGFSzOVE/xdTQhkFWkor0AxgTqvvuPGhd/ XSVAhv5/fEAbfrJxpN7KqPAW87JIC0y7lJvl/G9N5zCHA1jjLrvep2VWNC1S4jiJOPysMw 2cehrpBxoRQT3j5R2Z1SAUi0Id3tgn3Ek7WV1H3zf7gWOZcLJPM+LjtfR4sMjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785716733; a=rsa-sha256; cv=none; b=Ey/sxD5gSUblu2n2/Zbpx6D3jEoHSNFOthNQcAE4xy/MWEf0Vrlbupf+efspPYrjF4sIko 1icfRkTUT9FQAa1AU2NEdvUvIjr2xOoXABZbVAIzYxXV88kK+aRVoaEZ1YJKCBaO68bS7e O5wXrUWsuh2v0RSZHpue1peRpa9MIXHfwHGdDD/zoCZ8/G8yL++NAhtkLV6D85ioiQOcwm m/sZaiEZaaPM8bcA7wbGoh2bdDVx6VBVJB0akn2BncyuMRMvT1QAuVv6ctJF/Ic9bAFQho s8RyciLW77GrMgISiKnDlh+u/jrXIjmKsjijb5Fblkd5S7jrTeC18s7X2Kkqaw== 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=1785716733; 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=xAyCmc5VGet0nHVXpIeqCqg2kXRCJWwKjaBw7IqGkfw=; b=Jpxu13UXgQjlKUUuAKFLBS3zNLlMq8/RVXuWUigJ6i5g3LhTfEuGHFtEu6RWUDnAPQXlZx sTkFlBxXPN93kxT2E2qbwYIYc4JykilD8uQqP401krqTyI8yXjvCYI1gskdtN4THx51fy9 DUHpoLeBccsa3LhQfK2YRDvi7AGUF5k1cKPRR00jxWInS6qpWFDU6QIqIxmqOTVHHZLKtZ 8+VgzaQoQzXna4tOGPzbeaSYkkh2LtiK+o6X40e539p/id7fdE40qhdj0BDEZxFCB8+HgN R06djGwI5k0Ig+4T75NiggzOvSWUUZR2jg+s8qn4rCmpb+WhvwAUDPYb8mpigw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hCyBN6s0czdWw for ; Mon, 03 Aug 2026 00:25:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ca0e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 00:25:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d32bf064e951 - stable/15 - libthr/thread/thr_cond.c: some style List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d32bf064e951837cf815062afa3bfcc24279ebae Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 00:25:32 +0000 Message-Id: <6a6fdffc.1ca0e.76eae454@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d32bf064e951837cf815062afa3bfcc24279ebae commit d32bf064e951837cf815062afa3bfcc24279ebae Author: Konstantin Belousov AuthorDate: 2026-07-26 00:07:37 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-03 00:23:15 +0000 libthr/thread/thr_cond.c: some style (cherry picked from commit 149d3e5fcb76bff86d4343b7378258e9a6d3e25b) --- lib/libthr/thread/thr_cond.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c index 0eb3dac068ca..f8c9118968bb 100644 --- a/lib/libthr/thread/thr_cond.c +++ b/lib/libthr/thread/thr_cond.c @@ -46,11 +46,11 @@ _Static_assert(sizeof(struct pthread_cond) <= THR_PAGE_SIZE_MIN, /* * Prototypes */ -int __pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, - const struct timespec * abstime); +int __pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, + const struct timespec * abstime); static int cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr); static int cond_wait_common(pthread_cond_t *cond, pthread_mutex_t *mutex, - const struct timespec *abstime, int cancel); + const struct timespec *abstime, bool cancel); static int cond_signal_common(pthread_cond_t *cond); static int cond_broadcast_common(pthread_cond_t *cond); @@ -202,7 +202,7 @@ _thr_cond_destroy(pthread_cond_t *cond) */ static int cond_wait_kernel(struct pthread_cond *cvp, struct pthread_mutex *mp, - const struct timespec *abstime, int cancel) + const struct timespec *abstime, bool cancel) { struct pthread *curthread; int error, error2, recurse, robust; @@ -274,7 +274,7 @@ cond_wait_kernel(struct pthread_cond *cvp, struct pthread_mutex *mp, static int cond_wait_user(struct pthread_cond *cvp, struct pthread_mutex *mp, - const struct timespec *abstime, int cancel) + const struct timespec *abstime, bool cancel) { struct pthread *curthread; struct sleepqueue *sq; @@ -350,12 +350,12 @@ cond_wait_user(struct pthread_cond *cvp, struct pthread_mutex *mp, static int cond_wait_common(pthread_cond_t *cond, pthread_mutex_t *mutex, - const struct timespec *abstime, int cancel) + const struct timespec *abstime, bool cancel) { struct pthread *curthread = _get_curthread(); struct pthread_cond *cvp; struct pthread_mutex *mp; - int error; + int error; CHECK_AND_INIT_COND @@ -381,16 +381,14 @@ cond_wait_common(pthread_cond_t *cond, pthread_mutex_t *mutex, int _thr_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) { - - return (cond_wait_common(cond, mutex, NULL, 0)); + return (cond_wait_common(cond, mutex, NULL, false)); } int __thr_cond_wait(pthread_cond_t * __restrict cond, pthread_mutex_t * __restrict mutex) { - - return (cond_wait_common(cond, mutex, NULL, 1)); + return (cond_wait_common(cond, mutex, NULL, true)); } int @@ -398,24 +396,22 @@ _thr_cond_timedwait(pthread_cond_t * __restrict cond, pthread_mutex_t * __restrict mutex, const struct timespec * __restrict abstime) { - if (abstime == NULL || abstime->tv_sec < 0 || abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) return (EINVAL); - return (cond_wait_common(cond, mutex, abstime, 0)); + return (cond_wait_common(cond, mutex, abstime, false)); } int __pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime) { - if (abstime == NULL || abstime->tv_sec < 0 || abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) return (EINVAL); - return (cond_wait_common(cond, mutex, abstime, 1)); + return (cond_wait_common(cond, mutex, abstime, true)); } static int