Date: Thu, 4 Jun 2020 09:06:03 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361784 - in head: include lib/libthr lib/libthr/thread share/man/man3 Message-ID: <202006040906.0549639H036912@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Thu Jun 4 09:06:03 2020 New Revision: 361784 URL: https://svnweb.freebsd.org/changeset/base/361784 Log: Revert r361770 "Add pthread_getname_np() and pthread_setname_np() aliases" for now. It is not compatible enough with Linux. Requested by: antoine, jkim Sponsored by: The FreeBSD Foundation Modified: head/include/pthread_np.h head/lib/libthr/pthread.map head/lib/libthr/thread/thr_info.c head/share/man/man3/Makefile head/share/man/man3/pthread_set_name_np.3 Modified: head/include/pthread_np.h ============================================================================== --- head/include/pthread_np.h Thu Jun 4 04:29:43 2020 (r361783) +++ head/include/pthread_np.h Thu Jun 4 09:06:03 2020 (r361784) @@ -50,7 +50,6 @@ int pthread_attr_get_np(pthread_t, pthread_attr_t *); int pthread_attr_getaffinity_np(const pthread_attr_t *, size_t, cpuset_t *); int pthread_attr_setaffinity_np(pthread_attr_t *, size_t, const cpuset_t *); void pthread_get_name_np(pthread_t, char *, size_t); -void pthread_getname_np(pthread_t, char *, size_t); int pthread_getaffinity_np(pthread_t, size_t, cpuset_t *); int pthread_getthreadid_np(void); int pthread_main_np(void); @@ -66,7 +65,6 @@ void pthread_resume_all_np(void); int pthread_resume_np(pthread_t); int pthread_peekjoin_np(pthread_t, void **); void pthread_set_name_np(pthread_t, const char *); -void pthread_setname_np(pthread_t, const char *); int pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *); int pthread_single_np(void); void pthread_suspend_all_np(void); Modified: head/lib/libthr/pthread.map ============================================================================== --- head/lib/libthr/pthread.map Thu Jun 4 04:29:43 2020 (r361783) +++ head/lib/libthr/pthread.map Thu Jun 4 09:06:03 2020 (r361784) @@ -328,7 +328,5 @@ FBSD_1.5 { }; FBSD_1.6 { - pthread_getname_np; pthread_peekjoin_np; - pthread_setname_np; }; Modified: head/lib/libthr/thread/thr_info.c ============================================================================== --- head/lib/libthr/thread/thr_info.c Thu Jun 4 04:29:43 2020 (r361783) +++ head/lib/libthr/thread/thr_info.c Thu Jun 4 09:06:03 2020 (r361784) @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include "thr_private.h" __weak_reference(_pthread_set_name_np, pthread_set_name_np); -__weak_reference(_pthread_set_name_np, pthread_setname_np); static void thr_set_name_np(struct pthread *thread, const char *name) @@ -90,7 +89,6 @@ thr_get_name_np(struct pthread *thread, char *buf, siz } __weak_reference(_pthread_get_name_np, pthread_get_name_np); -__weak_reference(_pthread_get_name_np, pthread_getname_np); void _pthread_get_name_np(pthread_t thread, char *buf, size_t len) Modified: head/share/man/man3/Makefile ============================================================================== --- head/share/man/man3/Makefile Thu Jun 4 04:29:43 2020 (r361783) +++ head/share/man/man3/Makefile Thu Jun 4 09:06:03 2020 (r361784) @@ -493,9 +493,7 @@ PTHREAD_MLINKS+=pthread_rwlock_rdlock.3 pthread_rwlock PTHREAD_MLINKS+=pthread_rwlock_wrlock.3 pthread_rwlock_trywrlock.3 PTHREAD_MLINKS+=pthread_schedparam.3 pthread_getschedparam.3 \ pthread_schedparam.3 pthread_setschedparam.3 -PTHREAD_MLINKS+=pthread_set_name_np.3 pthread_get_name_np.3 \ - pthread_set_name_np.3 pthread_getname_np.3 \ - pthread_set_name_np.3 pthread_setname_np.3 +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 Modified: head/share/man/man3/pthread_set_name_np.3 ============================================================================== --- head/share/man/man3/pthread_set_name_np.3 Thu Jun 4 04:29:43 2020 (r361783) +++ head/share/man/man3/pthread_set_name_np.3 Thu Jun 4 09:06:03 2020 (r361784) @@ -24,14 +24,12 @@ .\" .\" $FreeBSD$ .\" -.Dd June 3, 2020 +.Dd August 12, 2018 .Dt PTHREAD_SET_NAME_NP 3 .Os .Sh NAME .Nm pthread_get_name_np , -.Nm pthread_getname_np , .Nm pthread_set_name_np -.Nm pthread_setname_np .Nd set and retrieve the thread name .Sh LIBRARY .Lb libpthread @@ -40,26 +38,18 @@ .Ft void .Fn pthread_get_name_np "pthread_t thread" "char *name" "size_t len" .Ft void -.Fn pthread_getname_np "pthread_t thread" "char *name" "size_t len" -.Ft void .Fn pthread_set_name_np "pthread_t thread" "const char *name" -.Ft void -.Fn pthread_setname_np "pthread_t thread" "const char *name" .Sh DESCRIPTION The .Fn pthread_set_name_np -and -.Fn pthread_setname_np -functions applies a copy of the given +function applies a copy of the given .Fa name to the given .Fa thread . .Pp The .Fn pthread_get_name_np -and -.Fn pthread_getname_np -functions retrieves the +function retrieves the .Fa name associated with .Fa thread . @@ -80,11 +70,6 @@ appear inside are silently ignored. and .Fn pthread_get_name_np are non-standard extensions. -.Fn pthread_setname_np -and -.Fn pthread_getname_np -are also non-standard, but are implemented by larger number of operating -systems so they are in fact more portable. .Sh AUTHORS This manual page was written by .An Alexey Zelkin Aq Mt phantom@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006040906.0549639H036912>