From nobody Mon Dec 15 22:49:38 2025 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 4dVZxt6PDmz6LSSm for ; Mon, 15 Dec 2025 22:49:38 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVZxt4Sl9z3y05 for ; Mon, 15 Dec 2025 22:49:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765838978; 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=VdO3htGy75+575/0hTAscu9TbS5pPWeTm4K6XJMU2d8=; b=ELhU1B0EEh7fIoFgOw/MtaiAcHbGiPcV6wmNBiwZVBLxntq1D8RmeI+rj6wK2ov1wzdIPG FCwaF48JU/ig47uMvI8Lzj3jGMSWVtcZhpadEgngQhYEtrVyoF3/hArxhPR7NeQ0tbokRN KMMjxvYRhQRTR9+cJ3k3LFMQrg5uuTBl6wP/6szyN6CVP8lY6HHSMyDPyN6OzvAfmGT7b4 9Yz1gm/JWpVcuLFrMZbIiEm0RzznITvgovv61pB7zGfbScomJ/b+yGVxPhn/ouzW3WUdZQ tQ7/Bex4kR0zBKaf6dw2uE2kXOY8Kj9ewjtbluV/kcmCR2f7z3QNhggutETayQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765838978; 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=VdO3htGy75+575/0hTAscu9TbS5pPWeTm4K6XJMU2d8=; b=CtEWFtHnyOo4Ur2sCB3h7JuphSrJlWPL7CiqtXF2DQNv6w7k/Pij635byJcKSLOC11HzWv hixJn3w1wRYdhAe7AEUCH/VbvlNpTrDft06m9Dm0paRNhLopfI6WWJaE00epO+Eke4s88V 7OT6GuJwP6atHnIHZTNFdEOI5eq9ke6ahZv3n6y/jyPIZHsu/U57PlcFj/fSfhp1Bm7FEu zk/10d3hg9Eg2SqiXSn9TTQ3MFlrXQONekz7cIAjC81kP4JQXgFClo6hnFUGotjmJc04h7 mJ5cQAnapXcmtor8Oy2XoBoSNVfv2MYr9AoP0XcIz46T83JumXr8BG0rC7lvzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765838978; a=rsa-sha256; cv=none; b=Lo+fvOV7N/uAtx+ugNxI35Nmb0vVLSNTuiKoj7DE1mb3THMalIDjJx/PbRgcjAkYFJGUGB Yt3qU+I568zpAVX2f+ok3pg3JPn5KIrF9LKxeqf+Pvt7dKwWz03o2GTFU05b1/R2z26yFI RMG8iKuoCBh9jYDpG0rtUiQQRl+uExvAD6NEgj8aJvFx/kV+xHMUG2zQKa0dZyHwAkBXru bdfJro8lsX9bbp6+RgHbEkxdSVwPoqTF/WpI7ThXWcCSzxaBQu9FDNwXUOgtUzsHJBWkl6 fbltgYz7BY0kvDq7w93t+UJCwTBfD+iwSNwuHgnLybDBKRRWi2yfbfPQZCM5Fg== 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 4dVZxt3bwczgQq for ; Mon, 15 Dec 2025 22:49:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47078 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 22:49:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Peek Subject: git: 2bf082df4931 - stable/14 - ctfmerge: fix segfault when building on macOS 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2bf082df4931fa0a2c557c428e7e7a333fd95ae5 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 22:49:38 +0000 Message-Id: <69409082.47078.2b7e6386@gitrepo.freebsd.org> The branch stable/14 has been updated by mp: URL: https://cgit.FreeBSD.org/src/commit/?id=2bf082df4931fa0a2c557c428e7e7a333fd95ae5 commit 2bf082df4931fa0a2c557c428e7e7a333fd95ae5 Author: Mark Peek AuthorDate: 2025-12-01 20:50:24 +0000 Commit: Mark Peek CommitDate: 2025-12-15 22:49:04 +0000 ctfmerge: fix segfault when building on macOS The barrier code was using semaphores which have been deprecated in macOS and not working at all, causing a race condition. Since macOS does not have pthread_barrier_*(), this change uses a condition variable instead. PR: 290958 Reported by: wosch Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D54018 (cherry picked from commit 732b4aa05d78ca6831d02e67a43f34ad104f4f01) --- cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c | 26 +++--------------------- cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h | 9 ++------ 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c b/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c index c0719620dbde..e1f54e994ce3 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c @@ -38,9 +38,6 @@ */ #include -#ifdef illumos -#include -#endif #include #include "barrier.h" @@ -49,12 +46,7 @@ void barrier_init(barrier_t *bar, int nthreads) { pthread_mutex_init(&bar->bar_lock, NULL); -#ifdef illumos - sema_init(&bar->bar_sem, 0, USYNC_THREAD, NULL); -#else - sem_init(&bar->bar_sem, 0, 0); -#endif - + pthread_cond_init(&bar->bar_cv, NULL); bar->bar_numin = 0; bar->bar_nthr = nthreads; } @@ -65,26 +57,14 @@ barrier_wait(barrier_t *bar) pthread_mutex_lock(&bar->bar_lock); if (++bar->bar_numin < bar->bar_nthr) { + pthread_cond_wait(&bar->bar_cv, &bar->bar_lock); pthread_mutex_unlock(&bar->bar_lock); -#ifdef illumos - sema_wait(&bar->bar_sem); -#else - sem_wait(&bar->bar_sem); -#endif return (0); - } else { - int i; - /* reset for next use */ bar->bar_numin = 0; - for (i = 1; i < bar->bar_nthr; i++) -#ifdef illumos - sema_post(&bar->bar_sem); -#else - sem_post(&bar->bar_sem); -#endif + pthread_cond_broadcast(&bar->bar_cv); pthread_mutex_unlock(&bar->bar_lock); return (1); diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h b/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h index babf2e64e33f..138386f8ed46 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h @@ -33,12 +33,7 @@ * APIs for the barrier synchronization primitive. */ -#ifdef illumos -#include -#else -#include -typedef sem_t sema_t; -#endif +#include #ifdef __cplusplus extern "C" { @@ -48,7 +43,7 @@ typedef struct barrier { pthread_mutex_t bar_lock; /* protects bar_numin */ int bar_numin; /* current number of waiters */ - sema_t bar_sem; /* where everyone waits */ + pthread_cond_t bar_cv; /* where everyone waits */ int bar_nthr; /* # of waiters to trigger release */ } barrier_t;