From nobody Tue Apr 30 00:49:01 2024 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 4VT1mG0cnQz5HjvG; Tue, 30 Apr 2024 00:49:02 +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 4VT1mF5kxZz4KlH; Tue, 30 Apr 2024 00:49:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714438141; 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=czofkP3NiaWq5jKXjgfajBQUOvE6pqi734e+RRxDEoo=; b=ZUg2rP0rQFEjHoa0xWimBvwFGCzm50ghQ0g/nlu87kinJJXCGh+Qx5hNp1mgIJF+P0FQ82 pJzGktZvtPfjnlBW3hDj5yBLKm2z3rniupgQh5QcQAjrNdZIQA2XhepCXxU6uTeztojWik 8sfl89dHCG6/9Y9sc+Kzs6eqV1kqOc2qKQCyyt+saTeOQJnzpTRzXmppxs3UPzzjxGTQ8B WWhGyXkAQdhz9SbGujzuJWFpiOfpeCAzjRWgOTAkNWBTQe+NOCEhNrlmxXhyzVrBTr+Lue jdYnvYUGJIAY+jLw+/StGIPWlJI3IYKhLi9iRehdBwVG/VijFH5un2ZBV5rtfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714438141; a=rsa-sha256; cv=none; b=dqMigBRHxeZZjO+YomMn5rejFfsQy+wUbl95TtzYCWMzGp1YKmLgBGoQdTFMcl/Rr+k/1z BtK3v79I1FUy2PULko2Dn7QxfPH4Oo5qGj0za7P8unH3GA7zCK2lVmGtvkhtvJCGnew3OM yqIkmMnzL+fRkWy3WfJK+0gmmkvQMtqOFOmHSnUI4/s/TVjsoq5QpaJLZ00fNh4EwXp8WN a4+TVy3fwwfDsXL694oDJWsmybQ8nyDVb1qpoteNUOS2gNhxTUBqgwLSxCoHOLCh773Uup qeqy9SyY60Ccxu9uqLO/VcS5vVTn78xfpCzctiaLZDR8Mhvx4aZ2g8DtwwjjCA== 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=1714438141; 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=czofkP3NiaWq5jKXjgfajBQUOvE6pqi734e+RRxDEoo=; b=yoS+Z1+tw4sG9DaFXxUiS9EwFKvqMXXg4CqVk9iR9DyDsmRzvk2fAHxorE4SyR/OHQGdJ9 RmmHmEwaEOyaFFKMC8NRTx9Y5BKJ8IMa35Ld0ttS6Xw1wN7vYKSbG6FLRe6n8x5H/3Is/T Te17GTD76tc01vDqk1EBLjm6OuEiaAUUqerqV8zIAFQuf1EfQ9wmd8ITtUYNt+9Ecs5i7Y lrsKuXvm50lTMNej08fGIqSq+UtkjQTXzwfJbo/UyAkunTtN3a7Vx2LTZhVbhfeUiXRoKP fOqfLEjNNOSBiQ7vCssanrY6oS2Y3J1owVZsw4hF7Lz6yRXKr96g5kiQdHY4Pw== 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 4VT1mF5Ls7z1STX; Tue, 30 Apr 2024 00:49:01 +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 43U0n1Ur012916; Tue, 30 Apr 2024 00:49:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U0n18O012913; Tue, 30 Apr 2024 00:49:01 GMT (envelope-from git) Date: Tue, 30 Apr 2024 00:49:01 GMT Message-Id: <202404300049.43U0n18O012913@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: e449481bee5f - stable/14 - libthr: add pthread_sigqueue(3) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: e449481bee5fd08d4342156696eb4a6eef531ef0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e449481bee5fd08d4342156696eb4a6eef531ef0 commit e449481bee5fd08d4342156696eb4a6eef531ef0 Author: Konstantin Belousov AuthorDate: 2024-04-19 14:40:40 +0000 Commit: Konstantin Belousov CommitDate: 2024-04-30 00:48:09 +0000 libthr: add pthread_sigqueue(3) PR: 278459 (cherry picked from commit 220aa0f450409948b869237e5c4505f992c913ce) --- include/pthread.h | 7 ++++ lib/libthr/pthread.map | 4 ++ lib/libthr/thread/Makefile.inc | 1 + lib/libthr/thread/thr_private.h | 1 + lib/libthr/thread/thr_sigqueue.c | 79 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+) diff --git a/include/pthread.h b/include/pthread.h index feb094c39fce..311211cb48f1 100644 --- a/include/pthread.h +++ b/include/pthread.h @@ -43,6 +43,9 @@ #include #include #include +#if __BSD_VISIBLE +#include +#endif #include #include @@ -302,6 +305,10 @@ void pthread_yield(void); int pthread_getname_np(pthread_t, char *, size_t); int pthread_setname_np(pthread_t, const char *); + +int pthread_sigqueue(pthread_t thread, int sig, + const union sigval value); + #endif int pthread_mutexattr_getprioceiling( diff --git a/lib/libthr/pthread.map b/lib/libthr/pthread.map index 348fd48df398..76c574e783a2 100644 --- a/lib/libthr/pthread.map +++ b/lib/libthr/pthread.map @@ -334,3 +334,7 @@ FBSD_1.6 { pthread_peekjoin_np; pthread_setname_np; }; + +FBSD_1.8 { + pthread_sigqueue; +}; diff --git a/lib/libthr/thread/Makefile.inc b/lib/libthr/thread/Makefile.inc index 33b95e9dd76d..c75322d6be95 100644 --- a/lib/libthr/thread/Makefile.inc +++ b/lib/libthr/thread/Makefile.inc @@ -47,6 +47,7 @@ SRCS+= \ thr_setprio.c \ thr_setschedparam.c \ thr_sig.c \ + thr_sigqueue.c \ thr_single_np.c \ thr_sleepq.c \ thr_spec.c \ diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index e590fb0c1e7a..f89941f96c78 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -1102,6 +1102,7 @@ int __Tthr_mutex_lock(pthread_mutex_t *); int __Tthr_mutex_trylock(pthread_mutex_t *); bool __thr_get_main_stack_base(char **base); bool __thr_get_main_stack_lim(size_t *lim); +int _Tthr_sigqueue(pthread_t pthread, int sig, const union sigval value); __END_DECLS __NULLABILITY_PRAGMA_POP diff --git a/lib/libthr/thread/thr_sigqueue.c b/lib/libthr/thread/thr_sigqueue.c new file mode 100644 index 000000000000..6f7ad8c63bad --- /dev/null +++ b/lib/libthr/thread/thr_sigqueue.c @@ -0,0 +1,79 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 1997 John Birrell . + * All rights reserved. + * + * Copyright 2024 The FreeBSD Foundation + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "namespace.h" +#include +#include +#include +#include "un-namespace.h" + +#include "thr_private.h" + +__weak_reference(_Tthr_sigqueue, _pthread_sigqueue); +__weak_reference(_Tthr_sigqueue, pthread_sigqueue); + +int +_Tthr_sigqueue(pthread_t pthread, int sig, const union sigval value) +{ + struct pthread *curthread; + int e, ret; + + if (sig < 0 || sig > _SIG_MAXSIG) + return (EINVAL); + + curthread = _get_curthread(); + ret = 0; + + if (curthread == pthread) { + if (sig > 0) { + e = sigqueue(pthread->tid, sig | __SIGQUEUE_TID, + value); + if (e == -1) + ret = errno; + } + } else if ((ret = _thr_find_thread(curthread, pthread, + 0)) == 0) { + if (sig > 0) { + e = sigqueue(pthread->tid, sig | __SIGQUEUE_TID, + value); + if (e == -1) + ret = errno; + } + THR_THREAD_UNLOCK(curthread, pthread); + } + + return (ret); +}