Index: include/pthread_np.h =================================================================== --- include/pthread_np.h (revision 218281) +++ include/pthread_np.h (working copy) @@ -48,6 +48,8 @@ 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 *); int pthread_getaffinity_np(pthread_t, size_t, cpuset_t *); +int pthread_getthreadid_np(void); +int pthread_getunique_np(pthread_t, int *); int pthread_main_np(void); int pthread_multi_np(void); int pthread_mutexattr_getkind_np(pthread_mutexattr_t); Index: share/man/man3/Makefile =================================================================== --- share/man/man3/Makefile (revision 218281) +++ share/man/man3/Makefile (working copy) @@ -179,6 +179,8 @@ PTHREAD_MAN= pthread.3 \ pthread_exit.3 \ pthread_getconcurrency.3 \ pthread_getspecific.3 \ + pthread_getthreadid_np.3 \ + pthread_getunique_np.3 \ pthread_join.3 \ pthread_key_create.3 \ pthread_key_delete.3 \ Index: share/man/man3/pthread_getunique_np.3 =================================================================== --- share/man/man3/pthread_getunique_np.3 (revision 0) +++ share/man/man3/pthread_getunique_np.3 (revision 0) @@ -0,0 +1,73 @@ +.\" Copyright (c) 2011 Jung-uk Kim +.\" 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. +.\" +.\" $FreeBSD$ +.\" +.Dd February 4, 2011 +.Dt PTHREAD_GETUNIQUE_NP 3 +.Os +.Sh NAME +.Nm pthread_getunique_np +.Nd get the target thread's unique integral ID +.Sh LIBRARY +.Lb libpthread +.Sh SYNOPSIS +.In pthread_np.h +.Ft int +.Fn pthread_getunique_np "pthread_t thread" "int *id" +.Sh DESCRIPTION +The +.Fn pthread_getunique_np +function returns the unique integral ID of the target thread. +If the target thread is current thread, +.Xr pthread_getthreadid_np 3 +may be preferable. +Its semantics is similar to the AIX's +.Fn pthread_getunique_np +functuion. +.Sh RETURN VALUES +If successful, the +.Fn pthread_getunique_np +function will return zero. +Otherwise an error number will be returned +to indicate the error. +.Sh ERRORS +The +.Fn pthread_getunique_np +will fail if: +.Bl -tag -width Er +.It Bq Er EINVAL +The value specified by +.Fa thread +or +.Fa id +is invalid. +.It Bq Er EINVAL +The target thread is not initialized. +.El +.Sh SEE ALSO +.Xr pthread_getthreadid_np 3 +.Sh AUTHORS +This manual page was written by +.An Jung-uk Kim Aq jkim@FreeBSD.org . Index: share/man/man3/pthread_getthreadid_np.3 =================================================================== --- share/man/man3/pthread_getthreadid_np.3 (revision 0) +++ share/man/man3/pthread_getthreadid_np.3 (revision 0) @@ -0,0 +1,57 @@ +.\" Copyright (c) 2011 Jung-uk Kim +.\" 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. +.\" +.\" $FreeBSD$ +.\" +.Dd February 4, 2011 +.Dt PTHREAD_GETTHREADID_NP 3 +.Os +.Sh NAME +.Nm pthread_getthreadid_np +.Nd get the calling thread's unique integral ID +.Sh LIBRARY +.Lb libpthread +.Sh SYNOPSIS +.In pthread_np.h +.Ft int +.Fn pthread_getthreadid_np void +.Sh DESCRIPTION +The +.Fn pthread_getthreadid_np +function returns the unique integral ID of the calling thread. +Its semantics is similar to the AIX's +.Fn pthread_getthreadid_np +functuion. +.Sh RETURN VALUES +The +.Fn pthread_getthreadid_np +function returns the thread integral ID of the calling thread. +.Sh ERRORS +None. +.Sh SEE ALSO +.Xr pthread_getunique_np 3 , +.Xr pthread_self 3 +.Sh AUTHORS +This manual page was written by +.An Jung-uk Kim Aq jkim@FreeBSD.org . Index: share/man/man3/pthread_self.3 =================================================================== --- share/man/man3/pthread_self.3 (revision 218281) +++ share/man/man3/pthread_self.3 (working copy) @@ -54,7 +54,8 @@ function returns the thread ID of the calling thre None. .Sh SEE ALSO .Xr pthread_create 3 , -.Xr pthread_equal 3 +.Xr pthread_equal 3 , +.Xr pthread_getthreadid_np 3 .Sh STANDARDS The .Fn pthread_self Index: lib/libc/gen/_pthread_stubs.c =================================================================== --- lib/libc/gen/_pthread_stubs.c (revision 218281) +++ lib/libc/gen/_pthread_stubs.c (working copy) @@ -92,6 +92,8 @@ pthread_func_entry_t __thr_jtable[PJT_MAX] = { {PJT_DUAL_ENTRY(stub_true)}, /* PJT_EQUAL */ {PJT_DUAL_ENTRY(stub_exit)}, /* PJT_EXIT */ {PJT_DUAL_ENTRY(stub_null)}, /* PJT_GETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_GETTHREADID_NP */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_GETUNIQUE_NP */ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_JOIN */ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_CREATE */ {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_DELETE */ @@ -216,6 +218,8 @@ STUB_FUNC2(pthread_cond_init, PJT_COND_INIT, int, STUB_FUNC1(pthread_cond_signal, PJT_COND_SIGNAL, int, void *) STUB_FUNC2(pthread_cond_wait, PJT_COND_WAIT, int, void *, void *) STUB_FUNC1(pthread_getspecific, PJT_GETSPECIFIC, void *, pthread_key_t) +STUB_FUNC(pthread_getthreadid_np, PJT_GETTHREADID_NP, int) +STUB_FUNC2(pthread_getunique_np, PJT_GETUNIQUE_NP, void *, void *, int) STUB_FUNC2(pthread_key_create, PJT_KEY_CREATE, int, void *, void *) STUB_FUNC1(pthread_key_delete, PJT_KEY_DELETE, int, pthread_key_t) STUB_FUNC(pthread_main_np, PJT_MAIN_NP, int) Index: lib/libc/include/namespace.h =================================================================== --- lib/libc/include/namespace.h (revision 218281) +++ lib/libc/include/namespace.h (working copy) @@ -137,6 +137,8 @@ #define pthread_getprio _pthread_getprio #define pthread_getschedparam _pthread_getschedparam #define pthread_getspecific _pthread_getspecific +#define pthread_getthreadid_np _pthread_getthreadid_np +#define pthread_getunique_np _pthread_getunique_np #define pthread_join _pthread_join #define pthread_key_create _pthread_key_create #define pthread_key_delete _pthread_key_delete Index: lib/libc/include/libc_private.h =================================================================== --- lib/libc/include/libc_private.h (revision 218281) +++ lib/libc/include/libc_private.h (working copy) @@ -100,6 +100,8 @@ typedef enum { PJT_EQUAL, PJT_EXIT, PJT_GETSPECIFIC, + PJT_GETTHREADID_NP, + PJT_GETUNIQUE_NP, PJT_JOIN, PJT_KEY_CREATE, PJT_KEY_DELETE, Index: lib/libthr/pthread.map =================================================================== --- lib/libthr/pthread.map (revision 218281) +++ lib/libthr/pthread.map (working copy) @@ -272,6 +272,8 @@ FBSDprivate_1.0 { _pthread_getprio; _pthread_getschedparam; _pthread_getspecific; + _pthread_getthreadid_np; + _pthread_getunique_np; _pthread_join; _pthread_key_create; _pthread_key_delete; @@ -403,6 +405,8 @@ FBSD_1.1 { FBSD_1.2 { openat; + pthread_getthreadid_np; + pthread_getunique_np; setcontext; swapcontext; }; Index: lib/libthr/thread/thr_getthreadid_np.c =================================================================== --- lib/libthr/thread/thr_getthreadid_np.c (revision 0) +++ lib/libthr/thread/thr_getthreadid_np.c (revision 0) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2011 Jung-uk Kim + * + * 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. + * + * $FreeBSD$ + */ + +#include "namespace.h" +#include +#include +#include "un-namespace.h" + +#include "thr_private.h" + +__weak_reference(_pthread_getthreadid_np, pthread_getthreadid_np); + +/* + * Provide the equivelant to AIX pthread_getthreadid_np() function. + */ +int +_pthread_getthreadid_np(void) +{ + struct pthread *curthread; + + _thr_check_init(); + curthread = _get_curthread(); + return (TID(curthread)); +} Property changes on: lib/libthr/thread/thr_getthreadid_np.c ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + FreeBSD=%H Added: svn:eol-style + native Index: lib/libthr/thread/Makefile.inc =================================================================== --- lib/libthr/thread/Makefile.inc (revision 218281) +++ lib/libthr/thread/Makefile.inc (working copy) @@ -22,6 +22,8 @@ SRCS+= \ thr_getprio.c \ thr_getcpuclockid.c \ thr_getschedparam.c \ + thr_getthreadid_np.c \ + thr_getunique_np.c \ thr_info.c \ thr_init.c \ thr_join.c \ Index: lib/libthr/thread/thr_init.c =================================================================== --- lib/libthr/thread/thr_init.c (revision 218281) +++ lib/libthr/thread/thr_init.c (working copy) @@ -224,6 +224,8 @@ static pthread_func_t jmp_table[][2] = { {DUAL_ENTRY(_pthread_equal)}, /* PJT_EQUAL */ {DUAL_ENTRY(_pthread_exit)}, /* PJT_EXIT */ {DUAL_ENTRY(_pthread_getspecific)}, /* PJT_GETSPECIFIC */ + {DUAL_ENTRY(_pthread_getthreadid_np)}, /* PJT_GETTHREADID_NP */ + {DUAL_ENTRY(_pthread_getunique_np)}, /* PJT_GETUNIQUE_NP */ {DUAL_ENTRY(_pthread_join)}, /* PJT_JOIN */ {DUAL_ENTRY(_pthread_key_create)}, /* PJT_KEY_CREATE */ {DUAL_ENTRY(_pthread_key_delete)}, /* PJT_KEY_DELETE*/ Index: lib/libthr/thread/thr_getunique_np.c =================================================================== --- lib/libthr/thread/thr_getunique_np.c (revision 0) +++ lib/libthr/thread/thr_getunique_np.c (revision 0) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2011 Jung-uk Kim + * + * 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. + * + * $FreeBSD$ + */ + +#include "namespace.h" +#include +#include +#include "un-namespace.h" + +#include "thr_private.h" + +__weak_reference(_pthread_getunique_np, pthread_getunique_np); + +/* + * Provide the equivelant to AIX pthread_getunique_np() function. + */ +int +_pthread_getunique_np(struct pthread *thread, int *id) +{ + + if (thread == NULL || id == NULL) + return (EINVAL); + if (_thr_initial == NULL || thread->tid == TID_TERMINATED) + return (EINVAL); + *id = TID(thread); + return (0); +} Property changes on: lib/libthr/thread/thr_getunique_np.c ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + FreeBSD=%H Added: svn:eol-style + native