From nobody Sat May 10 19:33:07 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 4ZvwyD42svz5vkLq; Sat, 10 May 2025 19:33:08 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZvwyD173Pz3T5g; Sat, 10 May 2025 19:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905588; 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=k66RbioinW9sTqDNr0zA6FNwaaIN2rSN9eB61XG/IGw=; b=NsEBL9DB8/rrhy8waT3xnkFloWYBRgxgKzmX1OWiAgDd16cZjpKZr+NAJJv0ivJQCoEb+k yiX3TgBMFBFyVO2J5KbbfhKfCXGPWZ7vXZ1Omfrsg8P+TdxpHtQtTFsnUUvFSAWjP5uVTM gyigxNh7TeqZVYZ8sEBvw5wWEhTaOX9T6OvJ2iIsLYhK6GlZ6fMQqlXuPqVQKTgV4EtHNl 5aIy1hawhWyuLTmq3cR4pO/VQQ3Xk68PU1W6uLItvx2/MdSWqlrvDI+M2bHh7wRoxH0OOy im1aXdRKI3GzvOn6odj8AF3x3+UbsJJOzyQg0uCgqN3mYJPqoxE8yjGZyXbGPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746905588; 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=k66RbioinW9sTqDNr0zA6FNwaaIN2rSN9eB61XG/IGw=; b=j6Ro3JYzVk3ifWafe/e8vtdDRH8UWS+6v+yzXcy6dVtDWVrd4Lu5IWIHDu2Dxs1uGBvskF 6VHpgCZqXzXIyeKDYWQQrrbeRI7SW5tTF6i3XWRwzYT4FfYWWEU3wA5CnvXGac/8c3Vf7e cEkdTtWfKYqDTY2nU2pqm/56fa6x95iiyNeCdnnMpY4hz6TdAJlea77tX9V2bdwOZvTzi/ MtK00iXRyyD5hLlof1BeuQMWmvbWk2QYOVjDSdupxWJtDUw31Y3NIstkzLv6B+uCuic1CG Y25fWINVU8MCYUb5x23C8p7MQa7Ur6iXAaZtFRxhUi0B+rRyCvrC3askWOHyDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746905588; a=rsa-sha256; cv=none; b=JA7wlsA9nZdJ/o/GwMdl8hwr3DL3q7ZnFXzJFIxS7k62Br0Nkmn8903mfX4yX6DH6COeIk 3aX4gU4cmkg8Ggyu/qER6ISS4L0UXGY4zp9dG+1YmLictP5AZj5f9LfhcnLIVPvdMDbrgC K+YH9UkHpGu24bY0ctuIdmTOgMEVFejbGEMS9dqQ4b90NM8LIMrZQMwFlfpY3lij4DW0Ac 0SI3m/D+rU0VIB1SX98GwXm8xVl7vp5j+WkK7z79xqZhJvfQBuKtcPHEjBFAOw0Gtbw7ph eqTi4jH3LnHPePAZ/L1ri7tSpCRZYOKpmi03MS39WGfwCwnRMXmaaEQ4sIaTGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZvwyD0bkxzyfj; Sat, 10 May 2025 19:33:08 +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 54AJX7TR054921; Sat, 10 May 2025 19:33:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54AJX7wn054918; Sat, 10 May 2025 19:33:07 GMT (envelope-from git) Date: Sat, 10 May 2025 19:33:07 GMT Message-Id: <202505101933.54AJX7wn054918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c8f21c33fd46 - stable/14 - rtld: add lockstate_wlocked() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8f21c33fd46aac5cfbfddeee90c178b2b0279f7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c8f21c33fd46aac5cfbfddeee90c178b2b0279f7 commit c8f21c33fd46aac5cfbfddeee90c178b2b0279f7 Author: Konstantin Belousov AuthorDate: 2025-05-01 15:43:30 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-10 18:15:21 +0000 rtld: add lockstate_wlocked() (cherry picked from commit bcbc19335a702a05ed89369c1662a91b686324ce) --- libexec/rtld-elf/rtld_lock.c | 6 ++++++ libexec/rtld-elf/rtld_lock.h | 1 + 2 files changed, 7 insertions(+) diff --git a/libexec/rtld-elf/rtld_lock.c b/libexec/rtld-elf/rtld_lock.c index 323bb7494c32..d16549871217 100644 --- a/libexec/rtld-elf/rtld_lock.c +++ b/libexec/rtld-elf/rtld_lock.c @@ -326,6 +326,12 @@ lock_restart_for_upgrade(RtldLockState *lockstate) } } +bool +lockstate_wlocked(const RtldLockState *lockstate) +{ + return (lockstate->lockstate == RTLD_LOCK_WLOCKED); +} + void dlerror_dflt_init(void) { diff --git a/libexec/rtld-elf/rtld_lock.h b/libexec/rtld-elf/rtld_lock.h index f41c23d7f69a..c9b11176b7de 100644 --- a/libexec/rtld-elf/rtld_lock.h +++ b/libexec/rtld-elf/rtld_lock.h @@ -93,6 +93,7 @@ void wlock_acquire(rtld_lock_t, RtldLockState *); void lock_release(rtld_lock_t, RtldLockState *); void lock_upgrade(rtld_lock_t, RtldLockState *); void lock_restart_for_upgrade(RtldLockState *); +bool lockstate_wlocked(const RtldLockState *); void dlerror_dflt_init(void);