From nobody Sun Aug 27 07:11:41 2023 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 4RYPxn5WyLz4rb8V; Sun, 27 Aug 2023 07:11:41 +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 4RYPxn523Sz4XDQ; Sun, 27 Aug 2023 07:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693120301; 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=W6gKTgunrxiGyvkVneSERxs0DrhGt06eigF5WxoOCzU=; b=AW72FtI2VivOEcKyHzp/qU1opr6Q96B0lLYVTrgzvdlCr8Mvts1CnSVWqTrKx2CNlJXvq1 CwiC9cWIy/36WBjGc86Wf9wuUfUgkqIhr+BsFBaDMo2GEEdcgHkHuMSilofDxvUNMTyKX/ 2GHiMHe4iFhew73e8FyLyUODPjHpiLjgQV11RwC7lIooZ33hOA6mUtK8314YG1+u5wQWph 08xDPdA8P58wVB751R9Hfk8aXcdDF2uMtztrlYE2JPUT87b1TojFX+xgMtYd0/vkZ5PuWp P1MjtNLkwlhZnqCt8yjucTwFtCh+NRQKT+Oj98HPLYMmYGs/9mLOxarkY5HBZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693120301; 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=W6gKTgunrxiGyvkVneSERxs0DrhGt06eigF5WxoOCzU=; b=bY3ui3jTniKkMQpc3ZZIyt2xoa0/dndsmIpwD6EtlUHbzcbF7s0KG5nKXj92Ci1Eb5mM0h bIcI7pYGl362alTNc2msYE85KufZLX4nRrmlg5Eqj14a9ZQhzTBe3UiL7bvffoLMZ6IgWV 2FzLtrZ37rKkIPe9EXB9CDP69K0va3myfIZOTcb8wp2z/YaEQcqGjYZMGhZxp3zN7b7Ube KcsOfTiseUUyKR1udCx7KDFb/pfzB+4dnyLeV7ixfINZJgSRrIcQW2MN+y97cojZ9xaODo iXib1uTNt2Nsl21Py2ee3ZP0mClFO0MXA0452wecgMVCKCR2UhJL9ZsQcNt2tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693120301; a=rsa-sha256; cv=none; b=TSwRX+AybAvtrAGl8+ao4T395FJwJ1OmZ5kDpPpxm/8FcExvPg1dW5HJHav3PB0eab8rNF VN3UmZSFnf/zwKDpQ/eH7EUY7mQtcuizQS6PQXF5wh1qapWn1HHcfVcGxX2oGF2Q0NSHBH d2DH4VyZ58zko8FxEY2uNM72UV4/64nhO5q9S1XYsmoo7dCqsplkqJICgHRPY5Jk7Dg9Gk lYc7iOBMOrUMltGtdbHyh1TDZAfhwpW95lh2XXQDV7jI9wCJWvp6D71vEoOfexramG+se9 7hDOuenIMzKqCOcmMt4SzR98t9adb07q9TAO4lpsHmRwVSp8mTuj3Ql15CnntA== 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 4RYPxn40R9z2kP; Sun, 27 Aug 2023 07:11:41 +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 37R7BfVB062834; Sun, 27 Aug 2023 07:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37R7BfiW062831; Sun, 27 Aug 2023 07:11:41 GMT (envelope-from git) Date: Sun, 27 Aug 2023 07:11:41 GMT Message-Id: <202308270711.37R7BfiW062831@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: 62729a88b85d - stable/12 - libthr: add pshared_destroy() helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/12 X-Git-Reftype: branch X-Git-Commit: 62729a88b85d3ab6fb61940594b0882e7062cc32 Auto-Submitted: auto-generated The branch stable/12 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=62729a88b85d3ab6fb61940594b0882e7062cc32 commit 62729a88b85d3ab6fb61940594b0882e7062cc32 Author: Konstantin Belousov AuthorDate: 2023-02-01 21:06:04 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-27 07:10:45 +0000 libthr: add pshared_destroy() helper (cherry picked from commit 3cf37d1251bf71b2171e67af8f2ca43cbe3d874d) --- lib/libthr/thread/thr_pshared.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/libthr/thread/thr_pshared.c b/lib/libthr/thread/thr_pshared.c index 83714785f9b1..56def22f9ab9 100644 --- a/lib/libthr/thread/thr_pshared.c +++ b/lib/libthr/thread/thr_pshared.c @@ -208,6 +208,17 @@ pshared_clean(void *key, void *val) _umtx_op(NULL, UMTX_OP_SHM, UMTX_SHM_DESTROY, key, NULL); } +static void +pshared_destroy(struct pthread *curthread, void *key) +{ + void *val; + + pshared_wlock(curthread); + val = pshared_remove(key); + pshared_unlock(curthread); + pshared_clean(key, val); +} + void * __thr_pshared_offpage(void *key, int doalloc) { @@ -243,13 +254,9 @@ void __thr_pshared_destroy(void *key) { struct pthread *curthread; - void *val; curthread = _get_curthread(); - pshared_wlock(curthread); - val = pshared_remove(key); - pshared_unlock(curthread); - pshared_clean(key, val); + pshared_destroy(curthread, key); pshared_gc(curthread); }