From nobody Mon May 26 08:17:05 2025 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 4b5TBn67G0z5xSkC; Mon, 26 May 2025 08:17:05 +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 4b5TBn56gcz3RXD; Mon, 26 May 2025 08:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748247425; 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=2KH5xL89NDHDTjof2akXu38U+nYXsXyOKBLFNuG6Mbw=; b=ozUK4ow9dkmWw0w324b5IfkuN67dHEL3HLPlE4E3Y6OkQkwUHyzOS937VDj/ajIgGgV3PP 1GQyUG1Cl415N8NPKYwsKXA7OfzC4RqfLFZyIdwCOALj5UN2PEe2wLbL/RqxHRJ9L4l4Iy FsUlhAvuw9RMBe2qdYgQJoeImsVHwBByBWD4jzSb/Dv4tWxttj7xEjw3ldIq75t+PEU0Z3 LPswjG6mwn9jfgn+Mvg4AZ8pyL+VjhH/AwaKITj6FCYke/qZ7O6UWTy5aI5o7dwFgySalB e6Nml16PgirSdQjQHytPTbh4zdPOqK89pBa925oFmciJr/U7qV9ka5YdvvGl9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748247425; 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=2KH5xL89NDHDTjof2akXu38U+nYXsXyOKBLFNuG6Mbw=; b=B/D98pZul/Vdlxp9B6Bo0/A23vSnyBcedf7LvIwaqE+6dI821xufOImlw6aOQwbT1LLR4p AFzkkviLj7sRMeGx66wnIE7E1xJ6v20hVnTt8KDr3G2io+M7UhFAbXRszj9uFMkfL2pCRZ rYXwQk8hYVsJtyXNX9CKu5khNNcn664RE/G63LBAvtML/PBQLf4pNC/IDIfQciOdnieZsX E6luoj7846j+8v6ls+d+fnn+CtCwMOTqSbvt/e1MZS/D/YPfTHk6GX071LTJHhAmb+Oaj4 AwdDiB4oNE9NMaWTu2oDGJbT7o9p7v7Yze9nZDCHn1TTJPbSrRLSUJuvYwOk2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748247425; a=rsa-sha256; cv=none; b=CqO0CnEUYF9aUxtSNG8N2aqtlA0vjDT/fXiiFc6q0kI+I8mk/+IWVqnvY3hoqyDdTMih95 NDlcECqTCbPw8IIZjOLNb88DPvcCV2EBKNdnzw6a0pnGuY/NL8VxaODTit83WMzCw64k2R 1rWcW1BusIVEVl6dRRMgOjS7DiHDKg1kXPAwlVP4D+GoW0nUyXaCgwP+yl5BW9JQleUECJ Sp69FII6PodWr5otNdRxt6f8O5fcaT3qr2i7Rr7RdVr/e7JNvgIJ5GmyPb0RGJQAF2JABO K/vjhhgLt8YVQ19xJ8EOUbWn6QVT99/2emrkexDy5rV40nIQ5levb1IZolUUHw== 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 4b5TBn49dKzyGR; Mon, 26 May 2025 08:17:05 +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 54Q8H5MP021091; Mon, 26 May 2025 08:17:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54Q8H5hc021088; Mon, 26 May 2025 08:17:05 GMT (envelope-from git) Date: Mon, 26 May 2025 08:17:05 GMT Message-Id: <202505260817.54Q8H5hc021088@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: 39f442502167 - stable/14 - pthread_switch_add_np(3): remove 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: 39f4425021678ee9069aa15946c4946e0bdd49e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=39f4425021678ee9069aa15946c4946e0bdd49e3 commit 39f4425021678ee9069aa15946c4946e0bdd49e3 Author: Konstantin Belousov AuthorDate: 2025-05-16 13:25:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-26 08:16:35 +0000 pthread_switch_add_np(3): remove (cherry picked from commit c0fdd2bf944bb646116c6cd9879560579ebaa563) --- include/pthread_np.h | 7 --- lib/libthr/thread/thr_switch_np.c | 5 +- share/man/man3/Makefile | 2 - share/man/man3/pthread_np.3 | 10 ---- share/man/man3/pthread_switch_add_np.3 | 86 ---------------------------------- 5 files changed, 4 insertions(+), 106 deletions(-) diff --git a/include/pthread_np.h b/include/pthread_np.h index 8f0180d4bd04..dcc762156a67 100644 --- a/include/pthread_np.h +++ b/include/pthread_np.h @@ -34,11 +34,6 @@ #include #include -/* - * Non-POSIX type definitions: - */ -typedef void (*pthread_switch_routine_t)(pthread_t, pthread_t); - /* * Non-POSIX thread function prototype definitions: */ @@ -67,8 +62,6 @@ int pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); int pthread_single_np(void); void pthread_suspend_all_np(void); int pthread_suspend_np(pthread_t); -int pthread_switch_add_np(pthread_switch_routine_t); -int pthread_switch_delete_np(pthread_switch_routine_t); int pthread_timedjoin_np(pthread_t, void **, const struct timespec *); __END_DECLS diff --git a/lib/libthr/thread/thr_switch_np.c b/lib/libthr/thread/thr_switch_np.c index 80cd34c15650..59a9a4c7e1a3 100644 --- a/lib/libthr/thread/thr_switch_np.c +++ b/lib/libthr/thread/thr_switch_np.c @@ -40,10 +40,13 @@ #include "thr_private.h" - __weak_reference(_pthread_switch_add_np, pthread_switch_add_np); __weak_reference(_pthread_switch_delete_np, pthread_switch_delete_np); +typedef void (*pthread_switch_routine_t)(pthread_t, pthread_t); +int _pthread_switch_add_np(pthread_switch_routine_t routine); +int _pthread_switch_delete_np(pthread_switch_routine_t routine); + int _pthread_switch_add_np(pthread_switch_routine_t routine __unused) { diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 5f336b6b7d2a..3aa215d095e7 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -463,7 +463,6 @@ PTHREAD_MAN= pthread.3 \ pthread_spin_lock.3 \ pthread_suspend_all_np.3 \ pthread_suspend_np.3 \ - pthread_switch_add_np.3 \ pthread_testcancel.3 \ pthread_yield.3 @@ -528,7 +527,6 @@ PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 \ PTHREAD_MLINKS+=pthread_spin_init.3 pthread_spin_destroy.3 \ pthread_spin_lock.3 pthread_spin_trylock.3 \ pthread_spin_lock.3 pthread_spin_unlock.3 -PTHREAD_MLINKS+=pthread_switch_add_np.3 pthread_switch_delete_np.3 PTHREAD_MLINKS+=pthread_testcancel.3 pthread_setcancelstate.3 \ pthread_testcancel.3 pthread_setcanceltype.3 PTHREAD_MLINKS+=pthread_join.3 pthread_peekjoin_np.3 \ diff --git a/share/man/man3/pthread_np.3 b/share/man/man3/pthread_np.3 index caab8cc13209..9fb2544dd3c9 100644 --- a/share/man/man3/pthread_np.3 +++ b/share/man/man3/pthread_np.3 @@ -132,16 +132,6 @@ Suspend the specified thread. Suspend all active threads. .It Xo .Ft int -.Fn pthread_switch_add_np "pthread_switch_routine_t routine" -.Xc -Install a routine that is called every time a thread context switches. -.It Xo -.Ft int -.Fn pthread_switch_delete_np "pthread_switch_routine_t routine" -.Xc -Remove a routine that is called every time a thread context switches. -.It Xo -.Ft int .Fo pthread_timedjoin_np .Fa "pthread_t thread" "void **value_ptr" "const struct timespec *abstime" .Fc diff --git a/share/man/man3/pthread_switch_add_np.3 b/share/man/man3/pthread_switch_add_np.3 deleted file mode 100644 index f02ff15eedc3..000000000000 --- a/share/man/man3/pthread_switch_add_np.3 +++ /dev/null @@ -1,86 +0,0 @@ -.\" Copyright (c) 2003 Alexey Zelkin -.\" All rights reserved. -.\" -.\" 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. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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. -.\" -.Dd October 12, 2021 -.Dt PTHREAD_SWITCH_ADD_NP 3 -.Os -.Sh NAME -.Nm pthread_switch_add_np , -.Nm pthread_switch_delete_np -.Nd thread context switches debugging primitives -.Sh LIBRARY -.Lb libpthread -.Sh SYNOPSIS -.In pthread_np.h -.Ft int -.Fn pthread_switch_add_np "pthread_switch_routine_t routine" -.Ft int -.Fn pthread_switch_delete_np "pthread_switch_routine_t routine" -.Sh DESCRIPTION -An application is allowed to monitor the thread context switches inside -the threading library. -An application can install a routine that gets called every time a thread -(explicitly created by an application with the -.Xr pthread_create 3 -function) gets the context switched. -The routine is passed the thread IDs of the threads that are -being switched in and out. -Installation and removal of these hooks may be done using the -.Fn pthread_switch_add_np -and -.Fn pthread_switch_delete_np -functions respectively. -.Sh RETURN VALUES -If successful, -these functions return 0. -Otherwise, an error number is returned to indicate the error. -.Sh ERRORS -The -.Fn pthread_switch_add_np -may fail if: -.Bl -tag -width Er -.It Bq Er EINVAL -.Dv NULL -pointer was passed in the -.Fa routine -argument. -.El -.Pp -The -.Fn pthread_switch_delete_np -may fail if: -.Bl -tag -width Er -.It Bq Er EINVAL -The -.Fa routine -argument is different from the argument previously passed to the -.Fn pthread_switch_add_np -function. -.El -.Sh SEE ALSO -.Xr pthread_create 3 , -.Xr pthread_np 3 -.Sh AUTHORS -This manual page was written by -.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .