From nobody Fri Jul 7 01:45:57 2023 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 4Qxx7T3V25z4lMLl; Fri, 7 Jul 2023 01:45:57 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qxx7T2ySpz3lGs; Fri, 7 Jul 2023 01:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688694357; 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=9BjGu8ZKp9yBYSERHoStFd+2PlDVB/2gebgAe3JwlhY=; b=H94Qq8KTPwvLcAjVwo5uv+gFc6Z14gVXXGItVMKrGetzS4XHVdzxcI9amwrHEDZFnGxOCE isKaIRoHdTiXfS/T9HMfqPecRNJhJCr80O1DNpZh3GDbxE5MVFGwT5EeOc1uefZqSupMLz BCKXqsCsEPDdL3roK7rPVsZ2ChUaUxZWRfofigk/OFfpJcJCKkgGf+zj6ANgMPVl4pUK52 EZecV+9cPUUtWN+YcG7Z3cYh/sAIzgMxxyXx4QvjsY4WWmt+XsNq9FeqAzW6H//ffKC3Sr nNapLg/rSpIE1VwCxk62d4y4ZyUd8Ye74p0b7icwmWkZsjNcIA1thnBScBbJ8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688694357; 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=9BjGu8ZKp9yBYSERHoStFd+2PlDVB/2gebgAe3JwlhY=; b=kvhhfmxYX7cZE3cBWA0hSuBKdTIWSDyFFo4kBomLENL3Bg4834JoDEE/YwBgmnQsieV0OS KdYNnT2MpJstjG/lgSs7ABPncArXEPVwb5sVibdZBxMx3uFEWoQKu2iFm4uxzUDEGIsW23 0v0CoISNeqmAL5CZsfmkcyMnObgoj3teih1Aqe9gDcYS13Zb8n8KALWAc9aVTk4NqJClvW rNLFWY7fukz+rmmjC9gm458aFYv8UVUGXOb7a90HQhqABYRfNDmLmlcygC7ktg2AjAh7T+ Ygv1XCDdM2KUp4VD4XSqJcP6D5t2ORdVBGk/xzvR21oUZGKFWWg9+uiuGrE3Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688694357; a=rsa-sha256; cv=none; b=JibXc6cqtY7nx4It0sb8gPqvQWpb0wx/Qnc5XYg0mK29SYZahJWFJ81eZk57afMNm91khl eDG7P00HYpSRvvxzi4VgAmNw/TOMpcc+XNS2S+qGYYwu3RJSI3IrkSZZBeU8qpfv7SWxEb a1ha1TiSr1U+vOBSC/SlYLKUYpK/VUqt46YkXCY4B7I9cv2eJYTWgw/JDVGdICdirPm9LS 1KF6gL2I43SKpItmr3Le/IRvMtoEF8ktK5+mSxuSdp/e867f0pRjyhvSHoNGP6NW7PgUEu 78aIq2sjFt9PAkRD7sehlGkWayJWlT8oG8m/829kfQD1Wxwk0lc8IN2Mrhxg3A== 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 4Qxx7T1vwKzKwj; Fri, 7 Jul 2023 01:45:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3671jvLr009344; Fri, 7 Jul 2023 01:45:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3671jvET009343; Fri, 7 Jul 2023 01:45:57 GMT (envelope-from git) Date: Fri, 7 Jul 2023 01:45:57 GMT Message-Id: <202307070145.3671jvET009343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 642cd511028b - main - libthr: Add src.conf variable WITHOUT_PTHREADS_ASSERTIONS 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 642cd511028b8839db2c89a44cf7807d80664f38 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=642cd511028b8839db2c89a44cf7807d80664f38 commit 642cd511028b8839db2c89a44cf7807d80664f38 Author: Greg Becker AuthorDate: 2023-07-07 00:30:02 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-07 01:45:09 +0000 libthr: Add src.conf variable WITHOUT_PTHREADS_ASSERTIONS This patch fixes a bug which prevents building libthr without _PTHREADS_INVARIANTS defined. The default remains to build libthr with -D_PTHREADS_INVARIANTS. However, with this patch, if one builds libthr with WITHOUT_PTHREADS_ASSERTIONS=true then the latency to acquire+release a default pthread mutex is reduced by roughly 5%, and a robust mutex by roughly 18% (as measured by a simple synthetic test on a Xeon E5-2697a based machine). Reviewed by: jhb, kib, mjg MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40900 --- lib/libthr/Makefile | 2 ++ lib/libthr/thread/thr_mutex.c | 2 +- share/mk/src.opts.mk | 1 + tools/build/options/WITHOUT_PTHREADS_ASSERTIONS | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 062f5eec5d88..6337c87d5d6f 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -51,8 +51,10 @@ SYMBOL_MAPS=${.CURDIR}/pthread.map MAN= libthr.3 +.if ${MK_PTHREADS_ASSERTIONS} != "no" # enable extra internal consistency checks CFLAGS+=-D_PTHREADS_INVARIANTS +.endif PRECIOUSLIB= diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 8dccdf4dfa8c..2cbfd9a459d3 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -120,7 +120,7 @@ __weak_reference(_pthread_mutex_getyieldloops_np, pthread_mutex_getyieldloops_np __weak_reference(_pthread_mutex_isowned_np, pthread_mutex_isowned_np); static void -mutex_init_link(struct pthread_mutex *m) +mutex_init_link(struct pthread_mutex *m __unused) { #if defined(_PTHREADS_INVARIANTS) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 3c17f9319619..0e9b5a052ffc 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -159,6 +159,7 @@ __DEFAULT_YES_OPTIONS = \ PKGBOOTSTRAP \ PMC \ PPP \ + PTHREADS_ASSERTIONS \ QUOTAS \ RADIUS_SUPPORT \ RBOOTD \ diff --git a/tools/build/options/WITHOUT_PTHREADS_ASSERTIONS b/tools/build/options/WITHOUT_PTHREADS_ASSERTIONS new file mode 100644 index 000000000000..b0961fa43cb6 --- /dev/null +++ b/tools/build/options/WITHOUT_PTHREADS_ASSERTIONS @@ -0,0 +1 @@ +Disable debugging assertions in pthreads library.