diff options
190 files changed, 384 insertions, 466 deletions
diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile index efbd364235ba..6d281af9b016 100644 --- a/lib/libkse/Makefile +++ b/lib/libkse/Makefile @@ -7,11 +7,11 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -LIB=c_r +LIB=pthread SHLIB_MAJOR= 5 SHLIB_MINOR= 0 CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE -CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \ +CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include # Uncomment this if you want libc_r to contain debug information for @@ -21,11 +21,11 @@ CFLAGS+=-D_LOCK_DEBUG # enable extra internal consistancy checks CFLAGS+=-D_PTHREADS_INVARIANTS -AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/uthread +AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/thread PRECIOUSLIB= yes .include "${.CURDIR}/man/Makefile.inc" -.include "${.CURDIR}/uthread/Makefile.inc" +.include "${.CURDIR}/thread/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" .include <bsd.lib.mk> diff --git a/lib/libkse/sys/Makefile.inc b/lib/libkse/sys/Makefile.inc index e608afa69909..bfcb3d9c8431 100644 --- a/lib/libkse/sys/Makefile.inc +++ b/lib/libkse/sys/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH} +.PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= uthread_error.c _atomic_lock.S +SRCS+= thr_error.c _atomic_lock.S diff --git a/lib/libkse/sys/thr_error.c b/lib/libkse/sys/thr_error.c index 0d08ae83729a..837c5eee18a6 100644 --- a/lib/libkse/sys/thr_error.c +++ b/lib/libkse/sys/thr_error.c @@ -35,7 +35,7 @@ */ #ifdef _THREAD_SAFE #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" extern int errno; int * __error() diff --git a/lib/libkse/thread/Makefile.inc b/lib/libkse/thread/Makefile.inc index c01f5ceebcc1..6941c6a0b151 100644 --- a/lib/libkse/thread/Makefile.inc +++ b/lib/libkse/thread/Makefile.inc @@ -1,137 +1,96 @@ # $FreeBSD$ -# uthread sources -.PATH: ${.CURDIR}/uthread +# thr sources +.PATH: ${.CURDIR}/thread SRCS+= \ - uthread_accept.c \ - uthread_acl_delete_fd.c \ - uthread_acl_get_fd.c \ - uthread_acl_set_fd.c \ - uthread_acl_aclcheck_fd.c \ - uthread_aio_suspend.c \ - uthread_attr_destroy.c \ - uthread_attr_init.c \ - uthread_attr_getdetachstate.c \ - uthread_attr_getguardsize.c \ - uthread_attr_getinheritsched.c \ - uthread_attr_getschedparam.c \ - uthread_attr_getschedpolicy.c \ - uthread_attr_getscope.c \ - uthread_attr_getstackaddr.c \ - uthread_attr_getstacksize.c \ - uthread_attr_setcreatesuspend_np.c \ - uthread_attr_setdetachstate.c \ - uthread_attr_setguardsize.c \ - uthread_attr_setinheritsched.c \ - uthread_attr_setschedparam.c \ - uthread_attr_setschedpolicy.c \ - uthread_attr_setscope.c \ - uthread_attr_setstackaddr.c \ - uthread_attr_setstacksize.c \ - uthread_autoinit.c \ - uthread_bind.c \ - uthread_cancel.c \ - uthread_clean.c \ - uthread_close.c \ - uthread_cond.c \ - uthread_condattr_destroy.c \ - uthread_condattr_init.c \ - uthread_connect.c \ - uthread_creat.c \ - uthread_create.c \ - uthread_detach.c \ - uthread_dup.c \ - uthread_dup2.c \ - uthread_equal.c \ - uthread_execve.c \ - uthread_exit.c \ - uthread_fchflags.c \ - uthread_fchmod.c \ - uthread_fchown.c \ - uthread_fcntl.c \ - uthread_fd.c \ - uthread_file.c \ - uthread_find_thread.c \ - uthread_flock.c \ - uthread_fork.c \ - uthread_fpathconf.c \ - uthread_fstat.c \ - uthread_fstatfs.c \ - uthread_fsync.c \ - uthread_gc.c \ - uthread_getdirentries.c \ - uthread_getpeername.c \ - uthread_getprio.c \ - uthread_getschedparam.c \ - uthread_getsockname.c \ - uthread_getsockopt.c \ - uthread_info.c \ - uthread_init.c \ - uthread_ioctl.c \ - uthread_jmp.c \ - uthread_join.c \ - uthread_kern.c \ - uthread_kevent.c \ - uthread_kill.c \ - uthread_listen.c \ - uthread_main_np.c \ - uthread_mattr_init.c \ - uthread_mattr_kind_np.c \ - uthread_msync.c \ - uthread_multi_np.c \ - uthread_mutex.c \ - uthread_mutex_prioceiling.c \ - uthread_mutex_protocol.c \ - uthread_mutexattr_destroy.c \ - uthread_nanosleep.c \ - uthread_once.c \ - uthread_open.c \ - uthread_pause.c \ - uthread_pipe.c \ - uthread_poll.c \ - uthread_priority_queue.c \ - uthread_pselect.c \ - uthread_read.c \ - uthread_readv.c \ - uthread_recvfrom.c \ - uthread_recvmsg.c \ - uthread_resume_np.c \ - uthread_rwlock.c \ - uthread_rwlockattr.c \ - uthread_select.c \ - uthread_self.c \ - uthread_sem.c \ - uthread_sendfile.c \ - uthread_sendmsg.c \ - uthread_sendto.c \ - uthread_seterrno.c \ - uthread_setprio.c \ - uthread_setschedparam.c \ - uthread_setsockopt.c \ - uthread_shutdown.c \ - uthread_sig.c \ - uthread_sigaction.c \ - uthread_sigmask.c \ - uthread_sigpending.c \ - uthread_sigprocmask.c \ - uthread_sigsuspend.c \ - uthread_sigwait.c \ - uthread_single_np.c \ - uthread_sleep.c \ - uthread_socket.c \ - uthread_socketpair.c \ - uthread_spec.c \ - uthread_spinlock.c \ - uthread_stack.c \ - uthread_suspend_np.c \ - uthread_switch_np.c \ - uthread_system.c \ - uthread_tcdrain.c \ - uthread_vfork.c \ - uthread_wait.c \ - uthread_wait4.c \ - uthread_waitpid.c \ - uthread_write.c \ - uthread_writev.c \ - uthread_yield.c + thr_aio_suspend.c \ + thr_attr_destroy.c \ + thr_attr_init.c \ + thr_attr_getdetachstate.c \ + thr_attr_getguardsize.c \ + thr_attr_getinheritsched.c \ + thr_attr_getschedparam.c \ + thr_attr_getschedpolicy.c \ + thr_attr_getscope.c \ + thr_attr_getstackaddr.c \ + thr_attr_getstacksize.c \ + thr_attr_setcreatesuspend_np.c \ + thr_attr_setdetachstate.c \ + thr_attr_setguardsize.c \ + thr_attr_setinheritsched.c \ + thr_attr_setschedparam.c \ + thr_attr_setschedpolicy.c \ + thr_attr_setscope.c \ + thr_attr_setstackaddr.c \ + thr_attr_setstacksize.c \ + thr_autoinit.c \ + thr_cancel.c \ + thr_clean.c \ + thr_close.c \ + thr_cond.c \ + thr_condattr_destroy.c \ + thr_condattr_init.c \ + thr_creat.c \ + thr_create.c \ + thr_detach.c \ + thr_equal.c \ + thr_exit.c \ + thr_fcntl.c \ + thr_find_thread.c \ + thr_fork.c \ + thr_fsync.c \ + thr_gc.c \ + thr_getprio.c \ + thr_getschedparam.c \ + thr_info.c \ + thr_init.c \ + thr_join.c \ + thr_kern.c \ + thr_kill.c \ + thr_main_np.c \ + thr_mattr_init.c \ + thr_mattr_kind_np.c \ + thr_msync.c \ + thr_multi_np.c \ + thr_mutex.c \ + thr_mutex_prioceiling.c \ + thr_mutex_protocol.c \ + thr_mutexattr_destroy.c \ + thr_nanosleep.c \ + thr_once.c \ + thr_open.c \ + thr_pause.c \ + thr_poll.c \ + thr_priority_queue.c \ + thr_pselect.c \ + thr_read.c \ + thr_readv.c \ + thr_resume_np.c \ + thr_rwlock.c \ + thr_rwlockattr.c \ + thr_select.c \ + thr_self.c \ + thr_sem.c \ + thr_seterrno.c \ + thr_setprio.c \ + thr_setschedparam.c \ + thr_sigmask.c \ + thr_sigsuspend.c \ + thr_sigwait.c \ + thr_single_np.c \ + thr_sleep.c \ + thr_spec.c \ + thr_spinlock.c \ + thr_stack.c \ + thr_suspend_np.c \ + thr_switch_np.c \ + thr_system.c \ + thr_tcdrain.c \ + thr_vfork.c \ + thr_wait.c \ + thr_wait4.c \ + thr_waitpid.c \ + thr_write.c \ + thr_writev.c \ + thr_yield.c diff --git a/lib/libkse/thread/thr_aio_suspend.c b/lib/libkse/thread/thr_aio_suspend.c index 23d34f9aa52b..05a6c824386b 100644 --- a/lib/libkse/thread/thr_aio_suspend.c +++ b/lib/libkse/thread/thr_aio_suspend.c @@ -31,7 +31,7 @@ #include <aio.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_aio_suspend, aio_suspend); diff --git a/lib/libkse/thread/thr_attr_destroy.c b/lib/libkse/thread/thr_attr_destroy.c index 420bd5a33969..e239a1dc5c41 100644 --- a/lib/libkse/thread/thr_attr_destroy.c +++ b/lib/libkse/thread/thr_attr_destroy.c @@ -34,7 +34,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_destroy, pthread_attr_destroy); diff --git a/lib/libkse/thread/thr_attr_getdetachstate.c b/lib/libkse/thread/thr_attr_getdetachstate.c index 515248d84a6d..d994548de061 100644 --- a/lib/libkse/thread/thr_attr_getdetachstate.c +++ b/lib/libkse/thread/thr_attr_getdetachstate.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getdetachstate, pthread_attr_getdetachstate); diff --git a/lib/libkse/thread/thr_attr_getguardsize.c b/lib/libkse/thread/thr_attr_getguardsize.c index 849bf27a5025..b32015ad0a15 100644 --- a/lib/libkse/thread/thr_attr_getguardsize.c +++ b/lib/libkse/thread/thr_attr_getguardsize.c @@ -31,7 +31,7 @@ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getguardsize, pthread_attr_getguardsize); diff --git a/lib/libkse/thread/thr_attr_getinheritsched.c b/lib/libkse/thread/thr_attr_getinheritsched.c index 6d6d3244e651..26ae9e483113 100644 --- a/lib/libkse/thread/thr_attr_getinheritsched.c +++ b/lib/libkse/thread/thr_attr_getinheritsched.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getinheritsched, pthread_attr_getinheritsched); diff --git a/lib/libkse/thread/thr_attr_getschedparam.c b/lib/libkse/thread/thr_attr_getschedparam.c index cac86fa92882..79911f4ad4ba 100644 --- a/lib/libkse/thread/thr_attr_getschedparam.c +++ b/lib/libkse/thread/thr_attr_getschedparam.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getschedparam, pthread_attr_getschedparam); diff --git a/lib/libkse/thread/thr_attr_getschedpolicy.c b/lib/libkse/thread/thr_attr_getschedpolicy.c index f2b74fccc8fd..1234b7d06849 100644 --- a/lib/libkse/thread/thr_attr_getschedpolicy.c +++ b/lib/libkse/thread/thr_attr_getschedpolicy.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getschedpolicy, pthread_attr_getschedpolicy); diff --git a/lib/libkse/thread/thr_attr_getscope.c b/lib/libkse/thread/thr_attr_getscope.c index 8abf418cfdca..fefe6cf8ee43 100644 --- a/lib/libkse/thread/thr_attr_getscope.c +++ b/lib/libkse/thread/thr_attr_getscope.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getscope, pthread_attr_getscope); diff --git a/lib/libkse/thread/thr_attr_getstackaddr.c b/lib/libkse/thread/thr_attr_getstackaddr.c index 0cef0f3fbe98..d0822489de32 100644 --- a/lib/libkse/thread/thr_attr_getstackaddr.c +++ b/lib/libkse/thread/thr_attr_getstackaddr.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getstackaddr, pthread_attr_getstackaddr); diff --git a/lib/libkse/thread/thr_attr_getstacksize.c b/lib/libkse/thread/thr_attr_getstacksize.c index 091a0c78cd8e..ec1a9beeeb7e 100644 --- a/lib/libkse/thread/thr_attr_getstacksize.c +++ b/lib/libkse/thread/thr_attr_getstacksize.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getstacksize, pthread_attr_getstacksize); diff --git a/lib/libkse/thread/thr_attr_init.c b/lib/libkse/thread/thr_attr_init.c index e10d521b865c..a3befed68752 100644 --- a/lib/libkse/thread/thr_attr_init.c +++ b/lib/libkse/thread/thr_attr_init.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_init, pthread_attr_init); diff --git a/lib/libkse/thread/thr_attr_setcreatesuspend_np.c b/lib/libkse/thread/thr_attr_setcreatesuspend_np.c index be6f8d76e324..eddfc4678dcf 100644 --- a/lib/libkse/thread/thr_attr_setcreatesuspend_np.c +++ b/lib/libkse/thread/thr_attr_setcreatesuspend_np.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setcreatesuspend_np, pthread_attr_setcreatesuspend_np); diff --git a/lib/libkse/thread/thr_attr_setdetachstate.c b/lib/libkse/thread/thr_attr_setdetachstate.c index e0e23c20e95a..4d517f238225 100644 --- a/lib/libkse/thread/thr_attr_setdetachstate.c +++ b/lib/libkse/thread/thr_attr_setdetachstate.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setdetachstate, pthread_attr_setdetachstate); diff --git a/lib/libkse/thread/thr_attr_setguardsize.c b/lib/libkse/thread/thr_attr_setguardsize.c index ad3e8bb9292f..94da871d0447 100644 --- a/lib/libkse/thread/thr_attr_setguardsize.c +++ b/lib/libkse/thread/thr_attr_setguardsize.c @@ -32,7 +32,7 @@ #include <sys/param.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setguardsize, pthread_attr_setguardsize); diff --git a/lib/libkse/thread/thr_attr_setinheritsched.c b/lib/libkse/thread/thr_attr_setinheritsched.c index 3538131ca07a..25ff5e106fda 100644 --- a/lib/libkse/thread/thr_attr_setinheritsched.c +++ b/lib/libkse/thread/thr_attr_setinheritsched.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setinheritsched, pthread_attr_setinheritsched); diff --git a/lib/libkse/thread/thr_attr_setschedparam.c b/lib/libkse/thread/thr_attr_setschedparam.c index c42973e9c0bc..2f34c774b4fe 100644 --- a/lib/libkse/thread/thr_attr_setschedparam.c +++ b/lib/libkse/thread/thr_attr_setschedparam.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setschedparam, pthread_attr_setschedparam); diff --git a/lib/libkse/thread/thr_attr_setschedpolicy.c b/lib/libkse/thread/thr_attr_setschedpolicy.c index d9c83e64b3f7..ddb092157826 100644 --- a/lib/libkse/thread/thr_attr_setschedpolicy.c +++ b/lib/libkse/thread/thr_attr_setschedpolicy.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setschedpolicy, pthread_attr_setschedpolicy); diff --git a/lib/libkse/thread/thr_attr_setscope.c b/lib/libkse/thread/thr_attr_setscope.c index 3614615a3c01..dc9e2dd755d3 100644 --- a/lib/libkse/thread/thr_attr_setscope.c +++ b/lib/libkse/thread/thr_attr_setscope.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setscope, pthread_attr_setscope); diff --git a/lib/libkse/thread/thr_attr_setstackaddr.c b/lib/libkse/thread/thr_attr_setstackaddr.c index 60469324e22d..87837f13388d 100644 --- a/lib/libkse/thread/thr_attr_setstackaddr.c +++ b/lib/libkse/thread/thr_attr_setstackaddr.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setstackaddr, pthread_attr_setstackaddr); diff --git a/lib/libkse/thread/thr_attr_setstacksize.c b/lib/libkse/thread/thr_attr_setstacksize.c index 622ba7f93b0b..e26ab7df948e 100644 --- a/lib/libkse/thread/thr_attr_setstacksize.c +++ b/lib/libkse/thread/thr_attr_setstacksize.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setstacksize, pthread_attr_setstacksize); diff --git a/lib/libkse/thread/thr_cancel.c b/lib/libkse/thread/thr_cancel.c index d9324abf01aa..9c7fc033d2bc 100644 --- a/lib/libkse/thread/thr_cancel.c +++ b/lib/libkse/thread/thr_cancel.c @@ -4,7 +4,7 @@ */ #include <sys/errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" static void finish_cancellation(void *arg); diff --git a/lib/libkse/thread/thr_clean.c b/lib/libkse/thread/thr_clean.c index 6330cb9782d0..8ae6b42add54 100644 --- a/lib/libkse/thread/thr_clean.c +++ b/lib/libkse/thread/thr_clean.c @@ -35,7 +35,7 @@ #include <errno.h> #include <stdlib.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_cleanup_push, pthread_cleanup_push); __weak_reference(_pthread_cleanup_pop, pthread_cleanup_pop); diff --git a/lib/libkse/thread/thr_close.c b/lib/libkse/thread/thr_close.c index 22c939440ddc..c6634a563ba1 100644 --- a/lib/libkse/thread/thr_close.c +++ b/lib/libkse/thread/thr_close.c @@ -37,7 +37,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__close, close); diff --git a/lib/libkse/thread/thr_cond.c b/lib/libkse/thread/thr_cond.c index cb45725531d0..a22d98302f5e 100644 --- a/lib/libkse/thread/thr_cond.c +++ b/lib/libkse/thread/thr_cond.c @@ -35,7 +35,7 @@ #include <errno.h> #include <string.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* * Prototypes diff --git a/lib/libkse/thread/thr_condattr_destroy.c b/lib/libkse/thread/thr_condattr_destroy.c index 3a05487309c8..e0ade00883ee 100644 --- a/lib/libkse/thread/thr_condattr_destroy.c +++ b/lib/libkse/thread/thr_condattr_destroy.c @@ -34,7 +34,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_condattr_destroy, pthread_condattr_destroy); diff --git a/lib/libkse/thread/thr_condattr_init.c b/lib/libkse/thread/thr_condattr_init.c index cfc1e4a4d6a6..1af12e1d30cd 100644 --- a/lib/libkse/thread/thr_condattr_init.c +++ b/lib/libkse/thread/thr_condattr_init.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_condattr_init, pthread_condattr_init); diff --git a/lib/libkse/thread/thr_creat.c b/lib/libkse/thread/thr_creat.c index 92da97179901..3d5be08ec4b8 100644 --- a/lib/libkse/thread/thr_creat.c +++ b/lib/libkse/thread/thr_creat.c @@ -31,7 +31,7 @@ #include <fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(___creat, creat); diff --git a/lib/libkse/thread/thr_create.c b/lib/libkse/thread/thr_create.c index 0f006a9aabfc..5211cb02a508 100644 --- a/lib/libkse/thread/thr_create.c +++ b/lib/libkse/thread/thr_create.c @@ -40,7 +40,7 @@ #include <sys/time.h> #include <machine/reg.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" #include "libc_private.h" static u_int64_t next_uniqueid = 1; diff --git a/lib/libkse/thread/thr_detach.c b/lib/libkse/thread/thr_detach.c index 298fdb41b0db..646dcbfdba5e 100644 --- a/lib/libkse/thread/thr_detach.c +++ b/lib/libkse/thread/thr_detach.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_detach, pthread_detach); diff --git a/lib/libkse/thread/thr_equal.c b/lib/libkse/thread/thr_equal.c index 0dfb63d980a7..f8882f5f073b 100644 --- a/lib/libkse/thread/thr_equal.c +++ b/lib/libkse/thread/thr_equal.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_equal, pthread_equal); diff --git a/lib/libkse/thread/thr_exit.c b/lib/libkse/thread/thr_exit.c index 8af1c1f90da7..88535d047e6b 100644 --- a/lib/libkse/thread/thr_exit.c +++ b/lib/libkse/thread/thr_exit.c @@ -38,7 +38,7 @@ #include <stdlib.h> #include <string.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" #define FLAGS_IN_SCHEDQ \ (PTHREAD_FLAGS_IN_PRIOQ|PTHREAD_FLAGS_IN_WAITQ|PTHREAD_FLAGS_IN_WORKQ) diff --git a/lib/libkse/thread/thr_fcntl.c b/lib/libkse/thread/thr_fcntl.c index a5b64054f6ef..9e78d07fbdf8 100644 --- a/lib/libkse/thread/thr_fcntl.c +++ b/lib/libkse/thread/thr_fcntl.c @@ -35,7 +35,7 @@ #include <unistd.h> #include <fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__fcntl, fcntl); diff --git a/lib/libkse/thread/thr_find_thread.c b/lib/libkse/thread/thr_find_thread.c index e6e9294f2111..032fcfb13b68 100644 --- a/lib/libkse/thread/thr_find_thread.c +++ b/lib/libkse/thread/thr_find_thread.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* Find a thread in the linked list of active threads: */ int diff --git a/lib/libkse/thread/thr_fork.c b/lib/libkse/thread/thr_fork.c index dd6d3ffead7a..0f172917b2b8 100644 --- a/lib/libkse/thread/thr_fork.c +++ b/lib/libkse/thread/thr_fork.c @@ -38,7 +38,7 @@ #include <unistd.h> #include <fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" static void free_thread_resources(struct pthread *thread); diff --git a/lib/libkse/thread/thr_fsync.c b/lib/libkse/thread/thr_fsync.c index b8b9f3c6b910..608e8b055b56 100644 --- a/lib/libkse/thread/thr_fsync.c +++ b/lib/libkse/thread/thr_fsync.c @@ -33,7 +33,7 @@ */ #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__fsync, fsync); diff --git a/lib/libkse/thread/thr_getprio.c b/lib/libkse/thread/thr_getprio.c index a10c88973439..fa95ef9540ae 100644 --- a/lib/libkse/thread/thr_getprio.c +++ b/lib/libkse/thread/thr_getprio.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_getprio, pthread_getprio); diff --git a/lib/libkse/thread/thr_getschedparam.c b/lib/libkse/thread/thr_getschedparam.c index 0d1ffe924ccd..7f1503c78835 100644 --- a/lib/libkse/thread/thr_getschedparam.c +++ b/lib/libkse/thread/thr_getschedparam.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_getschedparam, pthread_getschedparam); diff --git a/lib/libkse/thread/thr_info.c b/lib/libkse/thread/thr_info.c index 305a2b980ece..11b02f39f478 100644 --- a/lib/libkse/thread/thr_info.c +++ b/lib/libkse/thread/thr_info.c @@ -38,7 +38,7 @@ #include <unistd.h> #include <pthread.h> #include <errno.h> -#include "pthread_private.h" +#include "thr_private.h" #ifndef NELEMENTS #define NELEMENTS(arr) (sizeof(arr) / sizeof(arr[0])) diff --git a/lib/libkse/thread/thr_init.c b/lib/libkse/thread/thr_init.c index 74db740a07b8..ba306a6b5ce0 100644 --- a/lib/libkse/thread/thr_init.c +++ b/lib/libkse/thread/thr_init.c @@ -65,7 +65,7 @@ #include <unistd.h> #include "un-namespace.h" -#include "pthread_private.h" +#include "thr_private.h" /* * All weak references used within libc should be in this table. diff --git a/lib/libkse/thread/thr_join.c b/lib/libkse/thread/thr_join.c index 0f5e8fc5c1ed..c2e7cec2e830 100644 --- a/lib/libkse/thread/thr_join.c +++ b/lib/libkse/thread/thr_join.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_join, pthread_join); diff --git a/lib/libkse/thread/thr_kern.c b/lib/libkse/thread/thr_kern.c index 55296eb2ae25..5b196903d689 100644 --- a/lib/libkse/thread/thr_kern.c +++ b/lib/libkse/thread/thr_kern.c @@ -49,7 +49,7 @@ #include <sys/syscall.h> #include <fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* #define DEBUG_THREAD_KERN */ #ifdef DEBUG_THREAD_KERN diff --git a/lib/libkse/thread/thr_kill.c b/lib/libkse/thread/thr_kill.c index 29e181425c31..a8a1fc63978e 100644 --- a/lib/libkse/thread/thr_kill.c +++ b/lib/libkse/thread/thr_kill.c @@ -34,7 +34,7 @@ #include <errno.h> #include <signal.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_kill, pthread_kill); diff --git a/lib/libkse/thread/thr_main_np.c b/lib/libkse/thread/thr_main_np.c index 54c20180df57..1d5849d6d162 100644 --- a/lib/libkse/thread/thr_main_np.c +++ b/lib/libkse/thread/thr_main_np.c @@ -29,7 +29,7 @@ #include <pthread.h> #include <pthread_np.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_main_np, pthread_main_np); diff --git a/lib/libkse/thread/thr_mattr_init.c b/lib/libkse/thread/thr_mattr_init.c index e4e2e5066a8c..6b403d6c998f 100644 --- a/lib/libkse/thread/thr_mattr_init.c +++ b/lib/libkse/thread/thr_mattr_init.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_mutexattr_init, pthread_mutexattr_init); diff --git a/lib/libkse/thread/thr_mattr_kind_np.c b/lib/libkse/thread/thr_mattr_kind_np.c index 04db2a0ffbb5..f3d30ff075b7 100644 --- a/lib/libkse/thread/thr_mattr_kind_np.c +++ b/lib/libkse/thread/thr_mattr_kind_np.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_mutexattr_setkind_np, pthread_mutexattr_setkind_np); __weak_reference(_pthread_mutexattr_getkind_np, pthread_mutexattr_getkind_np); diff --git a/lib/libkse/thread/thr_msync.c b/lib/libkse/thread/thr_msync.c index 24cbaa6053bb..4d9a95093c1a 100644 --- a/lib/libkse/thread/thr_msync.c +++ b/lib/libkse/thread/thr_msync.c @@ -9,7 +9,7 @@ #include <sys/types.h> #include <sys/mman.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__msync, msync); diff --git a/lib/libkse/thread/thr_mutex.c b/lib/libkse/thread/thr_mutex.c index 86e0b8bf324c..7b22fb5a6b4c 100644 --- a/lib/libkse/thread/thr_mutex.c +++ b/lib/libkse/thread/thr_mutex.c @@ -37,7 +37,7 @@ #include <sys/param.h> #include <sys/queue.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" #if defined(_PTHREADS_INVARIANTS) #define _MUTEX_INIT_LINK(m) do { \ diff --git a/lib/libkse/thread/thr_mutex_prioceiling.c b/lib/libkse/thread/thr_mutex_prioceiling.c index 2682abcb74f0..7d2e92e1b91e 100644 --- a/lib/libkse/thread/thr_mutex_prioceiling.c +++ b/lib/libkse/thread/thr_mutex_prioceiling.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_mutexattr_getprioceiling, pthread_mutexattr_getprioceiling); __weak_reference(_pthread_mutexattr_setprioceiling, pthread_mutexattr_setprioceiling); diff --git a/lib/libkse/thread/thr_mutex_protocol.c b/lib/libkse/thread/thr_mutex_protocol.c index 4d020d6c5360..f7be5a60605f 100644 --- a/lib/libkse/thread/thr_mutex_protocol.c +++ b/lib/libkse/thread/thr_mutex_protocol.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_mutexattr_getprotocol, pthread_mutexattr_getprotocol); __weak_reference(_pthread_mutexattr_setprotocol, pthread_mutexattr_setprotocol); diff --git a/lib/libkse/thread/thr_mutexattr_destroy.c b/lib/libkse/thread/thr_mutexattr_destroy.c index bdc85a526130..b9852b57a63c 100644 --- a/lib/libkse/thread/thr_mutexattr_destroy.c +++ b/lib/libkse/thread/thr_mutexattr_destroy.c @@ -34,7 +34,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_mutexattr_destroy, pthread_mutexattr_destroy); diff --git a/lib/libkse/thread/thr_nanosleep.c b/lib/libkse/thread/thr_nanosleep.c index e5569e71e150..6cccb87c9ca3 100644 --- a/lib/libkse/thread/thr_nanosleep.c +++ b/lib/libkse/thread/thr_nanosleep.c @@ -34,7 +34,7 @@ #include <stdio.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__nanosleep, nanosleep); diff --git a/lib/libkse/thread/thr_once.c b/lib/libkse/thread/thr_once.c index 20e29046c2fa..cef478d7dc48 100644 --- a/lib/libkse/thread/thr_once.c +++ b/lib/libkse/thread/thr_once.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_once, pthread_once); diff --git a/lib/libkse/thread/thr_open.c b/lib/libkse/thread/thr_open.c index 380761b9881e..3e0da32af7bc 100644 --- a/lib/libkse/thread/thr_open.c +++ b/lib/libkse/thread/thr_open.c @@ -38,7 +38,7 @@ #include <dirent.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__open, open); diff --git a/lib/libkse/thread/thr_pause.c b/lib/libkse/thread/thr_pause.c index 57b508f266f6..4a46be03f338 100644 --- a/lib/libkse/thread/thr_pause.c +++ b/lib/libkse/thread/thr_pause.c @@ -31,7 +31,7 @@ #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pause, pause); diff --git a/lib/libkse/thread/thr_poll.c b/lib/libkse/thread/thr_poll.c index 62b261394dbb..b4c495c123c9 100644 --- a/lib/libkse/thread/thr_poll.c +++ b/lib/libkse/thread/thr_poll.c @@ -39,7 +39,7 @@ #include <sys/time.h> #include <sys/fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__poll, poll); diff --git a/lib/libkse/thread/thr_priority_queue.c b/lib/libkse/thread/thr_priority_queue.c index b700d97f7955..b938a3c3807e 100644 --- a/lib/libkse/thread/thr_priority_queue.c +++ b/lib/libkse/thread/thr_priority_queue.c @@ -35,7 +35,7 @@ #include <sys/queue.h> #include <string.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* Prototypes: */ static void pq_insert_prio_list(pq_queue_t *pq, int prio); diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h index 97b30b703092..4db52d98b9bf 100644 --- a/lib/libkse/thread/thr_private.h +++ b/lib/libkse/thread/thr_private.h @@ -34,8 +34,8 @@ * $FreeBSD$ */ -#ifndef _PTHREAD_PRIVATE_H -#define _PTHREAD_PRIVATE_H +#ifndef _THR_PRIVATE_H +#define _THR_PRIVATE_H /* * Evaluate the storage class specifier. @@ -1332,4 +1332,4 @@ extern void ___longjmp(jmp_buf, int) __dead2; #endif __END_DECLS -#endif /* !_PTHREAD_PRIVATE_H */ +#endif /* !_THR_PRIVATE_H */ diff --git a/lib/libkse/thread/thr_pselect.c b/lib/libkse/thread/thr_pselect.c index 5a3d378550f7..af22337733d3 100644 --- a/lib/libkse/thread/thr_pselect.c +++ b/lib/libkse/thread/thr_pselect.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <signal.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" extern int __pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *timo, const sigset_t *mask); diff --git a/lib/libkse/thread/thr_read.c b/lib/libkse/thread/thr_read.c index 067befa0c176..f313a9c231aa 100644 --- a/lib/libkse/thread/thr_read.c +++ b/lib/libkse/thread/thr_read.c @@ -38,7 +38,7 @@ #include <errno.h> #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__read, read); diff --git a/lib/libkse/thread/thr_readv.c b/lib/libkse/thread/thr_readv.c index e2b79d73696c..707c04c96809 100644 --- a/lib/libkse/thread/thr_readv.c +++ b/lib/libkse/thread/thr_readv.c @@ -38,7 +38,7 @@ #include <errno.h> #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__readv, readv); diff --git a/lib/libkse/thread/thr_resume_np.c b/lib/libkse/thread/thr_resume_np.c index ed20b6a8d2f5..cc00f09299f0 100644 --- a/lib/libkse/thread/thr_resume_np.c +++ b/lib/libkse/thread/thr_resume_np.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" static void resume_common(struct pthread *); diff --git a/lib/libkse/thread/thr_rwlock.c b/lib/libkse/thread/thr_rwlock.c index 2f55f03b355c..f41e8a2f6f1f 100644 --- a/lib/libkse/thread/thr_rwlock.c +++ b/lib/libkse/thread/thr_rwlock.c @@ -31,7 +31,7 @@ #include <stdlib.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* maximum number of times a read lock may be obtained */ #define MAX_READ_LOCKS (INT_MAX - 1) diff --git a/lib/libkse/thread/thr_rwlockattr.c b/lib/libkse/thread/thr_rwlockattr.c index bc1b9eec0307..8c0697bd671c 100644 --- a/lib/libkse/thread/thr_rwlockattr.c +++ b/lib/libkse/thread/thr_rwlockattr.c @@ -30,7 +30,7 @@ #include <stdlib.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_rwlockattr_destroy, pthread_rwlockattr_destroy); __weak_reference(_pthread_rwlockattr_getpshared, pthread_rwlockattr_getpshared); diff --git a/lib/libkse/thread/thr_select.c b/lib/libkse/thread/thr_select.c index 2776cb2c80fc..a0415137f808 100644 --- a/lib/libkse/thread/thr_select.c +++ b/lib/libkse/thread/thr_select.c @@ -41,7 +41,7 @@ #include <sys/time.h> #include <sys/fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__select, select); diff --git a/lib/libkse/thread/thr_self.c b/lib/libkse/thread/thr_self.c index 1c09e3d206b8..d213e5e782b7 100644 --- a/lib/libkse/thread/thr_self.c +++ b/lib/libkse/thread/thr_self.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_self, pthread_self); diff --git a/lib/libkse/thread/thr_sem.c b/lib/libkse/thread/thr_sem.c index 851eca293ae6..70a97216fe91 100644 --- a/lib/libkse/thread/thr_sem.c +++ b/lib/libkse/thread/thr_sem.c @@ -33,7 +33,7 @@ #include <errno.h> #include <semaphore.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" #define _SEM_CHECK_VALIDITY(sem) \ if ((*(sem))->magic != SEM_MAGIC) { \ diff --git a/lib/libkse/thread/thr_seterrno.c b/lib/libkse/thread/thr_seterrno.c index 0d9474fc26a5..4f585acbf7c5 100644 --- a/lib/libkse/thread/thr_seterrno.c +++ b/lib/libkse/thread/thr_seterrno.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* * This function needs to reference the global error variable which is diff --git a/lib/libkse/thread/thr_setprio.c b/lib/libkse/thread/thr_setprio.c index 9099a6e73815..c5a950600a13 100644 --- a/lib/libkse/thread/thr_setprio.c +++ b/lib/libkse/thread/thr_setprio.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_setprio, pthread_setprio); diff --git a/lib/libkse/thread/thr_setschedparam.c b/lib/libkse/thread/thr_setschedparam.c index 7696762cc5f8..5117a260e995 100644 --- a/lib/libkse/thread/thr_setschedparam.c +++ b/lib/libkse/thread/thr_setschedparam.c @@ -34,7 +34,7 @@ #include <errno.h> #include <sys/param.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_setschedparam, pthread_setschedparam); diff --git a/lib/libkse/thread/thr_sig.c b/lib/libkse/thread/thr_sig.c index cf319c694f5d..5baaab9ab737 100644 --- a/lib/libkse/thread/thr_sig.c +++ b/lib/libkse/thread/thr_sig.c @@ -40,7 +40,7 @@ #include <setjmp.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* Prototypes: */ static void thread_sig_add(struct pthread *pthread, int sig, int has_args); diff --git a/lib/libkse/thread/thr_sigaction.c b/lib/libkse/thread/thr_sigaction.c index 2be587cb7264..741b9c22bb40 100644 --- a/lib/libkse/thread/thr_sigaction.c +++ b/lib/libkse/thread/thr_sigaction.c @@ -34,7 +34,7 @@ #include <signal.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sigaction, sigaction); diff --git a/lib/libkse/thread/thr_sigmask.c b/lib/libkse/thread/thr_sigmask.c index 040e7aad2dba..c26fefc53b8e 100644 --- a/lib/libkse/thread/thr_sigmask.c +++ b/lib/libkse/thread/thr_sigmask.c @@ -37,7 +37,7 @@ #include <errno.h> #include <signal.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_sigmask, pthread_sigmask); diff --git a/lib/libkse/thread/thr_sigpending.c b/lib/libkse/thread/thr_sigpending.c index 5eaf6ff38e51..71c677165124 100644 --- a/lib/libkse/thread/thr_sigpending.c +++ b/lib/libkse/thread/thr_sigpending.c @@ -37,7 +37,7 @@ #include <signal.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sigpending, sigpending); diff --git a/lib/libkse/thread/thr_sigprocmask.c b/lib/libkse/thread/thr_sigprocmask.c index cc0b8da8db8a..a56e63eb2af8 100644 --- a/lib/libkse/thread/thr_sigprocmask.c +++ b/lib/libkse/thread/thr_sigprocmask.c @@ -37,7 +37,7 @@ #include <signal.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sigprocmask, sigprocmask); diff --git a/lib/libkse/thread/thr_sigsuspend.c b/lib/libkse/thread/thr_sigsuspend.c index 42f174b262f5..90638f4a458d 100644 --- a/lib/libkse/thread/thr_sigsuspend.c +++ b/lib/libkse/thread/thr_sigsuspend.c @@ -36,7 +36,7 @@ #include <sys/signalvar.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__sigsuspend, sigsuspend); diff --git a/lib/libkse/thread/thr_sigwait.c b/lib/libkse/thread/thr_sigwait.c index 1e8724987ab1..209d3e70ea4d 100644 --- a/lib/libkse/thread/thr_sigwait.c +++ b/lib/libkse/thread/thr_sigwait.c @@ -36,7 +36,7 @@ #include <sys/signalvar.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sigwait, sigwait); diff --git a/lib/libkse/thread/thr_sleep.c b/lib/libkse/thread/thr_sleep.c index 9e09db775a0a..70b1c9fb70ae 100644 --- a/lib/libkse/thread/thr_sleep.c +++ b/lib/libkse/thread/thr_sleep.c @@ -31,7 +31,7 @@ #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sleep, sleep); diff --git a/lib/libkse/thread/thr_spec.c b/lib/libkse/thread/thr_spec.c index e71f75fb02cb..07ef3875b365 100644 --- a/lib/libkse/thread/thr_spec.c +++ b/lib/libkse/thread/thr_spec.c @@ -36,7 +36,7 @@ #include <string.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" struct pthread_key { spinlock_t lock; diff --git a/lib/libkse/thread/thr_spinlock.c b/lib/libkse/thread/thr_spinlock.c index e05aa4a5fc0b..544ea3cdf857 100644 --- a/lib/libkse/thread/thr_spinlock.c +++ b/lib/libkse/thread/thr_spinlock.c @@ -42,7 +42,7 @@ #include <libc_private.h> -#include "pthread_private.h" +#include "thr_private.h" /* * Lock a location for the running thread. Yield to allow other diff --git a/lib/libkse/thread/thr_stack.c b/lib/libkse/thread/thr_stack.c index 80c9d53ec488..c75d6eeb7786 100644 --- a/lib/libkse/thread/thr_stack.c +++ b/lib/libkse/thread/thr_stack.c @@ -33,7 +33,7 @@ #include <sys/user.h> #include <stdlib.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* Spare thread stack. */ struct stack { diff --git a/lib/libkse/thread/thr_suspend_np.c b/lib/libkse/thread/thr_suspend_np.c index 952baa350ec5..4128437398e6 100644 --- a/lib/libkse/thread/thr_suspend_np.c +++ b/lib/libkse/thread/thr_suspend_np.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" static void suspend_common(struct pthread *thread); diff --git a/lib/libkse/thread/thr_switch_np.c b/lib/libkse/thread/thr_switch_np.c index f24d99f74a4a..45c289e71b12 100644 --- a/lib/libkse/thread/thr_switch_np.c +++ b/lib/libkse/thread/thr_switch_np.c @@ -34,7 +34,7 @@ #include <errno.h> #include <pthread.h> #include <pthread_np.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_switch_add_np, pthread_switch_add_np); diff --git a/lib/libkse/thread/thr_system.c b/lib/libkse/thread/thr_system.c index d63969b08505..591562bab422 100644 --- a/lib/libkse/thread/thr_system.c +++ b/lib/libkse/thread/thr_system.c @@ -31,7 +31,7 @@ #include <stdlib.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_system, system); diff --git a/lib/libkse/thread/thr_tcdrain.c b/lib/libkse/thread/thr_tcdrain.c index 272bdf6e2747..140039bcd933 100644 --- a/lib/libkse/thread/thr_tcdrain.c +++ b/lib/libkse/thread/thr_tcdrain.c @@ -31,7 +31,7 @@ #include <termios.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_tcdrain, tcdrain); diff --git a/lib/libkse/thread/thr_wait.c b/lib/libkse/thread/thr_wait.c index e61138b21451..8e9c8644860b 100644 --- a/lib/libkse/thread/thr_wait.c +++ b/lib/libkse/thread/thr_wait.c @@ -30,7 +30,7 @@ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_wait, wait); diff --git a/lib/libkse/thread/thr_wait4.c b/lib/libkse/thread/thr_wait4.c index 05ed065dd925..90df876b1760 100644 --- a/lib/libkse/thread/thr_wait4.c +++ b/lib/libkse/thread/thr_wait4.c @@ -36,7 +36,7 @@ #include <errno.h> #include <sys/wait.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__wait4, wait4); diff --git a/lib/libkse/thread/thr_waitpid.c b/lib/libkse/thread/thr_waitpid.c index fcbbc9fa44ff..8938a6251b3e 100644 --- a/lib/libkse/thread/thr_waitpid.c +++ b/lib/libkse/thread/thr_waitpid.c @@ -32,7 +32,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_waitpid, waitpid); diff --git a/lib/libkse/thread/thr_write.c b/lib/libkse/thread/thr_write.c index 072b989ee750..80925ec88de2 100644 --- a/lib/libkse/thread/thr_write.c +++ b/lib/libkse/thread/thr_write.c @@ -38,7 +38,7 @@ #include <errno.h> #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__write, write); diff --git a/lib/libkse/thread/thr_writev.c b/lib/libkse/thread/thr_writev.c index b07278ac39b3..4fcb9f1069ab 100644 --- a/lib/libkse/thread/thr_writev.c +++ b/lib/libkse/thread/thr_writev.c @@ -40,7 +40,7 @@ #include <string.h> #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__writev, writev); diff --git a/lib/libkse/thread/thr_yield.c b/lib/libkse/thread/thr_yield.c index ec89255fb92c..ed66da61a804 100644 --- a/lib/libkse/thread/thr_yield.c +++ b/lib/libkse/thread/thr_yield.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sched_yield, sched_yield); __weak_reference(_pthread_yield, pthread_yield); diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index efbd364235ba..6d281af9b016 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -7,11 +7,11 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -LIB=c_r +LIB=pthread SHLIB_MAJOR= 5 SHLIB_MINOR= 0 CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE -CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \ +CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include # Uncomment this if you want libc_r to contain debug information for @@ -21,11 +21,11 @@ CFLAGS+=-D_LOCK_DEBUG # enable extra internal consistancy checks CFLAGS+=-D_PTHREADS_INVARIANTS -AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/uthread +AINC= -I${.CURDIR}/../libc/${MACHINE_ARCH} -I${.CURDIR}/thread PRECIOUSLIB= yes .include "${.CURDIR}/man/Makefile.inc" -.include "${.CURDIR}/uthread/Makefile.inc" +.include "${.CURDIR}/thread/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" .include <bsd.lib.mk> diff --git a/lib/libpthread/sys/Makefile.inc b/lib/libpthread/sys/Makefile.inc index e608afa69909..bfcb3d9c8431 100644 --- a/lib/libpthread/sys/Makefile.inc +++ b/lib/libpthread/sys/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH} +.PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH} -SRCS+= uthread_error.c _atomic_lock.S +SRCS+= thr_error.c _atomic_lock.S diff --git a/lib/libpthread/sys/thr_error.c b/lib/libpthread/sys/thr_error.c index 0d08ae83729a..837c5eee18a6 100644 --- a/lib/libpthread/sys/thr_error.c +++ b/lib/libpthread/sys/thr_error.c @@ -35,7 +35,7 @@ */ #ifdef _THREAD_SAFE #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" extern int errno; int * __error() diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc index c01f5ceebcc1..6941c6a0b151 100644 --- a/lib/libpthread/thread/Makefile.inc +++ b/lib/libpthread/thread/Makefile.inc @@ -1,137 +1,96 @@ # $FreeBSD$ -# uthread sources -.PATH: ${.CURDIR}/uthread +# thr sources +.PATH: ${.CURDIR}/thread SRCS+= \ - uthread_accept.c \ - uthread_acl_delete_fd.c \ - uthread_acl_get_fd.c \ - uthread_acl_set_fd.c \ - uthread_acl_aclcheck_fd.c \ - uthread_aio_suspend.c \ - uthread_attr_destroy.c \ - uthread_attr_init.c \ - uthread_attr_getdetachstate.c \ - uthread_attr_getguardsize.c \ - uthread_attr_getinheritsched.c \ - uthread_attr_getschedparam.c \ - uthread_attr_getschedpolicy.c \ - uthread_attr_getscope.c \ - uthread_attr_getstackaddr.c \ - uthread_attr_getstacksize.c \ - uthread_attr_setcreatesuspend_np.c \ - uthread_attr_setdetachstate.c \ - uthread_attr_setguardsize.c \ - uthread_attr_setinheritsched.c \ - uthread_attr_setschedparam.c \ - uthread_attr_setschedpolicy.c \ - uthread_attr_setscope.c \ - uthread_attr_setstackaddr.c \ - uthread_attr_setstacksize.c \ - uthread_autoinit.c \ - uthread_bind.c \ - uthread_cancel.c \ - uthread_clean.c \ - uthread_close.c \ - uthread_cond.c \ - uthread_condattr_destroy.c \ - uthread_condattr_init.c \ - uthread_connect.c \ - uthread_creat.c \ - uthread_create.c \ - uthread_detach.c \ - uthread_dup.c \ - uthread_dup2.c \ - uthread_equal.c \ - uthread_execve.c \ - uthread_exit.c \ - uthread_fchflags.c \ - uthread_fchmod.c \ - uthread_fchown.c \ - uthread_fcntl.c \ - uthread_fd.c \ - uthread_file.c \ - uthread_find_thread.c \ - uthread_flock.c \ - uthread_fork.c \ - uthread_fpathconf.c \ - uthread_fstat.c \ - uthread_fstatfs.c \ - uthread_fsync.c \ - uthread_gc.c \ - uthread_getdirentries.c \ - uthread_getpeername.c \ - uthread_getprio.c \ - uthread_getschedparam.c \ - uthread_getsockname.c \ - uthread_getsockopt.c \ - uthread_info.c \ - uthread_init.c \ - uthread_ioctl.c \ - uthread_jmp.c \ - uthread_join.c \ - uthread_kern.c \ - uthread_kevent.c \ - uthread_kill.c \ - uthread_listen.c \ - uthread_main_np.c \ - uthread_mattr_init.c \ - uthread_mattr_kind_np.c \ - uthread_msync.c \ - uthread_multi_np.c \ - uthread_mutex.c \ - uthread_mutex_prioceiling.c \ - uthread_mutex_protocol.c \ - uthread_mutexattr_destroy.c \ - uthread_nanosleep.c \ - uthread_once.c \ - uthread_open.c \ - uthread_pause.c \ - uthread_pipe.c \ - uthread_poll.c \ - uthread_priority_queue.c \ - uthread_pselect.c \ - uthread_read.c \ - uthread_readv.c \ - uthread_recvfrom.c \ - uthread_recvmsg.c \ - uthread_resume_np.c \ - uthread_rwlock.c \ - uthread_rwlockattr.c \ - uthread_select.c \ - uthread_self.c \ - uthread_sem.c \ - uthread_sendfile.c \ - uthread_sendmsg.c \ - uthread_sendto.c \ - uthread_seterrno.c \ - uthread_setprio.c \ - uthread_setschedparam.c \ - uthread_setsockopt.c \ - uthread_shutdown.c \ - uthread_sig.c \ - uthread_sigaction.c \ - uthread_sigmask.c \ - uthread_sigpending.c \ - uthread_sigprocmask.c \ - uthread_sigsuspend.c \ - uthread_sigwait.c \ - uthread_single_np.c \ - uthread_sleep.c \ - uthread_socket.c \ - uthread_socketpair.c \ - uthread_spec.c \ - uthread_spinlock.c \ - uthread_stack.c \ - uthread_suspend_np.c \ - uthread_switch_np.c \ - uthread_system.c \ - uthread_tcdrain.c \ - uthread_vfork.c \ - uthread_wait.c \ - uthread_wait4.c \ - uthread_waitpid.c \ - uthread_write.c \ - uthread_writev.c \ - uthread_yield.c + thr_aio_suspend.c \ + thr_attr_destroy.c \ + thr_attr_init.c \ + thr_attr_getdetachstate.c \ + thr_attr_getguardsize.c \ + thr_attr_getinheritsched.c \ + thr_attr_getschedparam.c \ + thr_attr_getschedpolicy.c \ + thr_attr_getscope.c \ + thr_attr_getstackaddr.c \ + thr_attr_getstacksize.c \ + thr_attr_setcreatesuspend_np.c \ + thr_attr_setdetachstate.c \ + thr_attr_setguardsize.c \ + thr_attr_setinheritsched.c \ + thr_attr_setschedparam.c \ + thr_attr_setschedpolicy.c \ + thr_attr_setscope.c \ + thr_attr_setstackaddr.c \ + thr_attr_setstacksize.c \ + thr_autoinit.c \ + thr_cancel.c \ + thr_clean.c \ + thr_close.c \ + thr_cond.c \ + thr_condattr_destroy.c \ + thr_condattr_init.c \ + thr_creat.c \ + thr_create.c \ + thr_detach.c \ + thr_equal.c \ + thr_exit.c \ + thr_fcntl.c \ + thr_find_thread.c \ + thr_fork.c \ + thr_fsync.c \ + thr_gc.c \ + thr_getprio.c \ + thr_getschedparam.c \ + thr_info.c \ + thr_init.c \ + thr_join.c \ + thr_kern.c \ + thr_kill.c \ + thr_main_np.c \ + thr_mattr_init.c \ + thr_mattr_kind_np.c \ + thr_msync.c \ + thr_multi_np.c \ + thr_mutex.c \ + thr_mutex_prioceiling.c \ + thr_mutex_protocol.c \ + thr_mutexattr_destroy.c \ + thr_nanosleep.c \ + thr_once.c \ + thr_open.c \ + thr_pause.c \ + thr_poll.c \ + thr_priority_queue.c \ + thr_pselect.c \ + thr_read.c \ + thr_readv.c \ + thr_resume_np.c \ + thr_rwlock.c \ + thr_rwlockattr.c \ + thr_select.c \ + thr_self.c \ + thr_sem.c \ + thr_seterrno.c \ + thr_setprio.c \ + thr_setschedparam.c \ + thr_sigmask.c \ + thr_sigsuspend.c \ + thr_sigwait.c \ + thr_single_np.c \ + thr_sleep.c \ + thr_spec.c \ + thr_spinlock.c \ + thr_stack.c \ + thr_suspend_np.c \ + thr_switch_np.c \ + thr_system.c \ + thr_tcdrain.c \ + thr_vfork.c \ + thr_wait.c \ + thr_wait4.c \ + thr_waitpid.c \ + thr_write.c \ + thr_writev.c \ + thr_yield.c diff --git a/lib/libpthread/thread/thr_acl_aclcheck_fd.c b/lib/libpthread/thread/thr_acl_aclcheck_fd.c index 19e9aaa6096d..3c30e2c0d91c 100644 --- a/lib/libpthread/thread/thr_acl_aclcheck_fd.c +++ b/lib/libpthread/thread/thr_acl_aclcheck_fd.c @@ -29,7 +29,7 @@ #include <sys/types.h> #include <sys/acl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(___acl_aclcheck_fd, __acl_aclcheck_fd); diff --git a/lib/libpthread/thread/thr_aio_suspend.c b/lib/libpthread/thread/thr_aio_suspend.c index 23d34f9aa52b..05a6c824386b 100644 --- a/lib/libpthread/thread/thr_aio_suspend.c +++ b/lib/libpthread/thread/thr_aio_suspend.c @@ -31,7 +31,7 @@ #include <aio.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_aio_suspend, aio_suspend); diff --git a/lib/libpthread/thread/thr_attr_destroy.c b/lib/libpthread/thread/thr_attr_destroy.c index 420bd5a33969..e239a1dc5c41 100644 --- a/lib/libpthread/thread/thr_attr_destroy.c +++ b/lib/libpthread/thread/thr_attr_destroy.c @@ -34,7 +34,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_destroy, pthread_attr_destroy); diff --git a/lib/libpthread/thread/thr_attr_getdetachstate.c b/lib/libpthread/thread/thr_attr_getdetachstate.c index 515248d84a6d..d994548de061 100644 --- a/lib/libpthread/thread/thr_attr_getdetachstate.c +++ b/lib/libpthread/thread/thr_attr_getdetachstate.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getdetachstate, pthread_attr_getdetachstate); diff --git a/lib/libpthread/thread/thr_attr_getguardsize.c b/lib/libpthread/thread/thr_attr_getguardsize.c index 849bf27a5025..b32015ad0a15 100644 --- a/lib/libpthread/thread/thr_attr_getguardsize.c +++ b/lib/libpthread/thread/thr_attr_getguardsize.c @@ -31,7 +31,7 @@ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getguardsize, pthread_attr_getguardsize); diff --git a/lib/libpthread/thread/thr_attr_getinheritsched.c b/lib/libpthread/thread/thr_attr_getinheritsched.c index 6d6d3244e651..26ae9e483113 100644 --- a/lib/libpthread/thread/thr_attr_getinheritsched.c +++ b/lib/libpthread/thread/thr_attr_getinheritsched.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getinheritsched, pthread_attr_getinheritsched); diff --git a/lib/libpthread/thread/thr_attr_getschedparam.c b/lib/libpthread/thread/thr_attr_getschedparam.c index cac86fa92882..79911f4ad4ba 100644 --- a/lib/libpthread/thread/thr_attr_getschedparam.c +++ b/lib/libpthread/thread/thr_attr_getschedparam.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getschedparam, pthread_attr_getschedparam); diff --git a/lib/libpthread/thread/thr_attr_getschedpolicy.c b/lib/libpthread/thread/thr_attr_getschedpolicy.c index f2b74fccc8fd..1234b7d06849 100644 --- a/lib/libpthread/thread/thr_attr_getschedpolicy.c +++ b/lib/libpthread/thread/thr_attr_getschedpolicy.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getschedpolicy, pthread_attr_getschedpolicy); diff --git a/lib/libpthread/thread/thr_attr_getscope.c b/lib/libpthread/thread/thr_attr_getscope.c index 8abf418cfdca..fefe6cf8ee43 100644 --- a/lib/libpthread/thread/thr_attr_getscope.c +++ b/lib/libpthread/thread/thr_attr_getscope.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getscope, pthread_attr_getscope); diff --git a/lib/libpthread/thread/thr_attr_getstackaddr.c b/lib/libpthread/thread/thr_attr_getstackaddr.c index 0cef0f3fbe98..d0822489de32 100644 --- a/lib/libpthread/thread/thr_attr_getstackaddr.c +++ b/lib/libpthread/thread/thr_attr_getstackaddr.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getstackaddr, pthread_attr_getstackaddr); diff --git a/lib/libpthread/thread/thr_attr_getstacksize.c b/lib/libpthread/thread/thr_attr_getstacksize.c index 091a0c78cd8e..ec1a9beeeb7e 100644 --- a/lib/libpthread/thread/thr_attr_getstacksize.c +++ b/lib/libpthread/thread/thr_attr_getstacksize.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_getstacksize, pthread_attr_getstacksize); diff --git a/lib/libpthread/thread/thr_attr_init.c b/lib/libpthread/thread/thr_attr_init.c index e10d521b865c..a3befed68752 100644 --- a/lib/libpthread/thread/thr_attr_init.c +++ b/lib/libpthread/thread/thr_attr_init.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_init, pthread_attr_init); diff --git a/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c b/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c index be6f8d76e324..eddfc4678dcf 100644 --- a/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c +++ b/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setcreatesuspend_np, pthread_attr_setcreatesuspend_np); diff --git a/lib/libpthread/thread/thr_attr_setdetachstate.c b/lib/libpthread/thread/thr_attr_setdetachstate.c index e0e23c20e95a..4d517f238225 100644 --- a/lib/libpthread/thread/thr_attr_setdetachstate.c +++ b/lib/libpthread/thread/thr_attr_setdetachstate.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setdetachstate, pthread_attr_setdetachstate); diff --git a/lib/libpthread/thread/thr_attr_setguardsize.c b/lib/libpthread/thread/thr_attr_setguardsize.c index ad3e8bb9292f..94da871d0447 100644 --- a/lib/libpthread/thread/thr_attr_setguardsize.c +++ b/lib/libpthread/thread/thr_attr_setguardsize.c @@ -32,7 +32,7 @@ #include <sys/param.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setguardsize, pthread_attr_setguardsize); diff --git a/lib/libpthread/thread/thr_attr_setinheritsched.c b/lib/libpthread/thread/thr_attr_setinheritsched.c index 3538131ca07a..25ff5e106fda 100644 --- a/lib/libpthread/thread/thr_attr_setinheritsched.c +++ b/lib/libpthread/thread/thr_attr_setinheritsched.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setinheritsched, pthread_attr_setinheritsched); diff --git a/lib/libpthread/thread/thr_attr_setschedparam.c b/lib/libpthread/thread/thr_attr_setschedparam.c index c42973e9c0bc..2f34c774b4fe 100644 --- a/lib/libpthread/thread/thr_attr_setschedparam.c +++ b/lib/libpthread/thread/thr_attr_setschedparam.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setschedparam, pthread_attr_setschedparam); diff --git a/lib/libpthread/thread/thr_attr_setschedpolicy.c b/lib/libpthread/thread/thr_attr_setschedpolicy.c index d9c83e64b3f7..ddb092157826 100644 --- a/lib/libpthread/thread/thr_attr_setschedpolicy.c +++ b/lib/libpthread/thread/thr_attr_setschedpolicy.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setschedpolicy, pthread_attr_setschedpolicy); diff --git a/lib/libpthread/thread/thr_attr_setscope.c b/lib/libpthread/thread/thr_attr_setscope.c index 3614615a3c01..dc9e2dd755d3 100644 --- a/lib/libpthread/thread/thr_attr_setscope.c +++ b/lib/libpthread/thread/thr_attr_setscope.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setscope, pthread_attr_setscope); diff --git a/lib/libpthread/thread/thr_attr_setstackaddr.c b/lib/libpthread/thread/thr_attr_setstackaddr.c index 60469324e22d..87837f13388d 100644 --- a/lib/libpthread/thread/thr_attr_setstackaddr.c +++ b/lib/libpthread/thread/thr_attr_setstackaddr.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setstackaddr, pthread_attr_setstackaddr); diff --git a/lib/libpthread/thread/thr_attr_setstacksize.c b/lib/libpthread/thread/thr_attr_setstacksize.c index 622ba7f93b0b..e26ab7df948e 100644 --- a/lib/libpthread/thread/thr_attr_setstacksize.c +++ b/lib/libpthread/thread/thr_attr_setstacksize.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_attr_setstacksize, pthread_attr_setstacksize); diff --git a/lib/libpthread/thread/thr_cancel.c b/lib/libpthread/thread/thr_cancel.c index d9324abf01aa..9c7fc033d2bc 100644 --- a/lib/libpthread/thread/thr_cancel.c +++ b/lib/libpthread/thread/thr_cancel.c @@ -4,7 +4,7 @@ */ #include <sys/errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" static void finish_cancellation(void *arg); diff --git a/lib/libpthread/thread/thr_clean.c b/lib/libpthread/thread/thr_clean.c index 6330cb9782d0..8ae6b42add54 100644 --- a/lib/libpthread/thread/thr_clean.c +++ b/lib/libpthread/thread/thr_clean.c @@ -35,7 +35,7 @@ #include <errno.h> #include <stdlib.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_cleanup_push, pthread_cleanup_push); __weak_reference(_pthread_cleanup_pop, pthread_cleanup_pop); diff --git a/lib/libpthread/thread/thr_close.c b/lib/libpthread/thread/thr_close.c index 22c939440ddc..c6634a563ba1 100644 --- a/lib/libpthread/thread/thr_close.c +++ b/lib/libpthread/thread/thr_close.c @@ -37,7 +37,7 @@ #include <fcntl.h> #include <sys/stat.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__close, close); diff --git a/lib/libpthread/thread/thr_cond.c b/lib/libpthread/thread/thr_cond.c index cb45725531d0..a22d98302f5e 100644 --- a/lib/libpthread/thread/thr_cond.c +++ b/lib/libpthread/thread/thr_cond.c @@ -35,7 +35,7 @@ #include <errno.h> #include <string.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* * Prototypes diff --git a/lib/libpthread/thread/thr_condattr_destroy.c b/lib/libpthread/thread/thr_condattr_destroy.c index 3a05487309c8..e0ade00883ee 100644 --- a/lib/libpthread/thread/thr_condattr_destroy.c +++ b/lib/libpthread/thread/thr_condattr_destroy.c @@ -34,7 +34,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_condattr_destroy, pthread_condattr_destroy); diff --git a/lib/libpthread/thread/thr_condattr_init.c b/lib/libpthread/thread/thr_condattr_init.c index cfc1e4a4d6a6..1af12e1d30cd 100644 --- a/lib/libpthread/thread/thr_condattr_init.c +++ b/lib/libpthread/thread/thr_condattr_init.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_condattr_init, pthread_condattr_init); diff --git a/lib/libpthread/thread/thr_creat.c b/lib/libpthread/thread/thr_creat.c index 92da97179901..3d5be08ec4b8 100644 --- a/lib/libpthread/thread/thr_creat.c +++ b/lib/libpthread/thread/thr_creat.c @@ -31,7 +31,7 @@ #include <fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(___creat, creat); diff --git a/lib/libpthread/thread/thr_create.c b/lib/libpthread/thread/thr_create.c index 0f006a9aabfc..5211cb02a508 100644 --- a/lib/libpthread/thread/thr_create.c +++ b/lib/libpthread/thread/thr_create.c @@ -40,7 +40,7 @@ #include <sys/time.h> #include <machine/reg.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" #include "libc_private.h" static u_int64_t next_uniqueid = 1; diff --git a/lib/libpthread/thread/thr_detach.c b/lib/libpthread/thread/thr_detach.c index 298fdb41b0db..646dcbfdba5e 100644 --- a/lib/libpthread/thread/thr_detach.c +++ b/lib/libpthread/thread/thr_detach.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_detach, pthread_detach); diff --git a/lib/libpthread/thread/thr_equal.c b/lib/libpthread/thread/thr_equal.c index 0dfb63d980a7..f8882f5f073b 100644 --- a/lib/libpthread/thread/thr_equal.c +++ b/lib/libpthread/thread/thr_equal.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_equal, pthread_equal); diff --git a/lib/libpthread/thread/thr_exit.c b/lib/libpthread/thread/thr_exit.c index 8af1c1f90da7..88535d047e6b 100644 --- a/lib/libpthread/thread/thr_exit.c +++ b/lib/libpthread/thread/thr_exit.c @@ -38,7 +38,7 @@ #include <stdlib.h> #include <string.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" #define FLAGS_IN_SCHEDQ \ (PTHREAD_FLAGS_IN_PRIOQ|PTHREAD_FLAGS_IN_WAITQ|PTHREAD_FLAGS_IN_WORKQ) diff --git a/lib/libpthread/thread/thr_fcntl.c b/lib/libpthread/thread/thr_fcntl.c index a5b64054f6ef..9e78d07fbdf8 100644 --- a/lib/libpthread/thread/thr_fcntl.c +++ b/lib/libpthread/thread/thr_fcntl.c @@ -35,7 +35,7 @@ #include <unistd.h> #include <fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__fcntl, fcntl); diff --git a/lib/libpthread/thread/thr_find_thread.c b/lib/libpthread/thread/thr_find_thread.c index e6e9294f2111..032fcfb13b68 100644 --- a/lib/libpthread/thread/thr_find_thread.c +++ b/lib/libpthread/thread/thr_find_thread.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* Find a thread in the linked list of active threads: */ int diff --git a/lib/libpthread/thread/thr_fork.c b/lib/libpthread/thread/thr_fork.c index dd6d3ffead7a..0f172917b2b8 100644 --- a/lib/libpthread/thread/thr_fork.c +++ b/lib/libpthread/thread/thr_fork.c @@ -38,7 +38,7 @@ #include <unistd.h> #include <fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" static void free_thread_resources(struct pthread *thread); diff --git a/lib/libpthread/thread/thr_fsync.c b/lib/libpthread/thread/thr_fsync.c index b8b9f3c6b910..608e8b055b56 100644 --- a/lib/libpthread/thread/thr_fsync.c +++ b/lib/libpthread/thread/thr_fsync.c @@ -33,7 +33,7 @@ */ #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__fsync, fsync); diff --git a/lib/libpthread/thread/thr_gc.c b/lib/libpthread/thread/thr_gc.c index 9c930288f9e3..63e23f8a4afd 100644 --- a/lib/libpthread/thread/thr_gc.c +++ b/lib/libpthread/thread/thr_gc.c @@ -41,7 +41,7 @@ #include <unistd.h> #include <sys/types.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" pthread_addr_t _thread_gc(pthread_addr_t arg) diff --git a/lib/libpthread/thread/thr_getprio.c b/lib/libpthread/thread/thr_getprio.c index a10c88973439..fa95ef9540ae 100644 --- a/lib/libpthread/thread/thr_getprio.c +++ b/lib/libpthread/thread/thr_getprio.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_getprio, pthread_getprio); diff --git a/lib/libpthread/thread/thr_getschedparam.c b/lib/libpthread/thread/thr_getschedparam.c index 0d1ffe924ccd..7f1503c78835 100644 --- a/lib/libpthread/thread/thr_getschedparam.c +++ b/lib/libpthread/thread/thr_getschedparam.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_getschedparam, pthread_getschedparam); diff --git a/lib/libpthread/thread/thr_info.c b/lib/libpthread/thread/thr_info.c index 305a2b980ece..11b02f39f478 100644 --- a/lib/libpthread/thread/thr_info.c +++ b/lib/libpthread/thread/thr_info.c @@ -38,7 +38,7 @@ #include <unistd.h> #include <pthread.h> #include <errno.h> -#include "pthread_private.h" +#include "thr_private.h" #ifndef NELEMENTS #define NELEMENTS(arr) (sizeof(arr) / sizeof(arr[0])) diff --git a/lib/libpthread/thread/thr_init.c b/lib/libpthread/thread/thr_init.c index 74db740a07b8..ba306a6b5ce0 100644 --- a/lib/libpthread/thread/thr_init.c +++ b/lib/libpthread/thread/thr_init.c @@ -65,7 +65,7 @@ #include <unistd.h> #include "un-namespace.h" -#include "pthread_private.h" +#include "thr_private.h" /* * All weak references used within libc should be in this table. diff --git a/lib/libpthread/thread/thr_join.c b/lib/libpthread/thread/thr_join.c index 0f5e8fc5c1ed..c2e7cec2e830 100644 --- a/lib/libpthread/thread/thr_join.c +++ b/lib/libpthread/thread/thr_join.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_join, pthread_join); diff --git a/lib/libpthread/thread/thr_kern.c b/lib/libpthread/thread/thr_kern.c index 55296eb2ae25..5b196903d689 100644 --- a/lib/libpthread/thread/thr_kern.c +++ b/lib/libpthread/thread/thr_kern.c @@ -49,7 +49,7 @@ #include <sys/syscall.h> #include <fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* #define DEBUG_THREAD_KERN */ #ifdef DEBUG_THREAD_KERN diff --git a/lib/libpthread/thread/thr_kill.c b/lib/libpthread/thread/thr_kill.c index 29e181425c31..a8a1fc63978e 100644 --- a/lib/libpthread/thread/thr_kill.c +++ b/lib/libpthread/thread/thr_kill.c @@ -34,7 +34,7 @@ #include <errno.h> #include <signal.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_kill, pthread_kill); diff --git a/lib/libpthread/thread/thr_main_np.c b/lib/libpthread/thread/thr_main_np.c index 54c20180df57..1d5849d6d162 100644 --- a/lib/libpthread/thread/thr_main_np.c +++ b/lib/libpthread/thread/thr_main_np.c @@ -29,7 +29,7 @@ #include <pthread.h> #include <pthread_np.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_main_np, pthread_main_np); diff --git a/lib/libpthread/thread/thr_mattr_init.c b/lib/libpthread/thread/thr_mattr_init.c index e4e2e5066a8c..6b403d6c998f 100644 --- a/lib/libpthread/thread/thr_mattr_init.c +++ b/lib/libpthread/thread/thr_mattr_init.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_mutexattr_init, pthread_mutexattr_init); diff --git a/lib/libpthread/thread/thr_mattr_kind_np.c b/lib/libpthread/thread/thr_mattr_kind_np.c index 04db2a0ffbb5..f3d30ff075b7 100644 --- a/lib/libpthread/thread/thr_mattr_kind_np.c +++ b/lib/libpthread/thread/thr_mattr_kind_np.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_mutexattr_setkind_np, pthread_mutexattr_setkind_np); __weak_reference(_pthread_mutexattr_getkind_np, pthread_mutexattr_getkind_np); diff --git a/lib/libpthread/thread/thr_msync.c b/lib/libpthread/thread/thr_msync.c index 24cbaa6053bb..4d9a95093c1a 100644 --- a/lib/libpthread/thread/thr_msync.c +++ b/lib/libpthread/thread/thr_msync.c @@ -9,7 +9,7 @@ #include <sys/types.h> #include <sys/mman.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__msync, msync); diff --git a/lib/libpthread/thread/thr_mutex.c b/lib/libpthread/thread/thr_mutex.c index 86e0b8bf324c..7b22fb5a6b4c 100644 --- a/lib/libpthread/thread/thr_mutex.c +++ b/lib/libpthread/thread/thr_mutex.c @@ -37,7 +37,7 @@ #include <sys/param.h> #include <sys/queue.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" #if defined(_PTHREADS_INVARIANTS) #define _MUTEX_INIT_LINK(m) do { \ diff --git a/lib/libpthread/thread/thr_mutex_prioceiling.c b/lib/libpthread/thread/thr_mutex_prioceiling.c index 2682abcb74f0..7d2e92e1b91e 100644 --- a/lib/libpthread/thread/thr_mutex_prioceiling.c +++ b/lib/libpthread/thread/thr_mutex_prioceiling.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_mutexattr_getprioceiling, pthread_mutexattr_getprioceiling); __weak_reference(_pthread_mutexattr_setprioceiling, pthread_mutexattr_setprioceiling); diff --git a/lib/libpthread/thread/thr_mutex_protocol.c b/lib/libpthread/thread/thr_mutex_protocol.c index 4d020d6c5360..f7be5a60605f 100644 --- a/lib/libpthread/thread/thr_mutex_protocol.c +++ b/lib/libpthread/thread/thr_mutex_protocol.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_mutexattr_getprotocol, pthread_mutexattr_getprotocol); __weak_reference(_pthread_mutexattr_setprotocol, pthread_mutexattr_setprotocol); diff --git a/lib/libpthread/thread/thr_mutexattr_destroy.c b/lib/libpthread/thread/thr_mutexattr_destroy.c index bdc85a526130..b9852b57a63c 100644 --- a/lib/libpthread/thread/thr_mutexattr_destroy.c +++ b/lib/libpthread/thread/thr_mutexattr_destroy.c @@ -34,7 +34,7 @@ #include <stdlib.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_mutexattr_destroy, pthread_mutexattr_destroy); diff --git a/lib/libpthread/thread/thr_nanosleep.c b/lib/libpthread/thread/thr_nanosleep.c index e5569e71e150..6cccb87c9ca3 100644 --- a/lib/libpthread/thread/thr_nanosleep.c +++ b/lib/libpthread/thread/thr_nanosleep.c @@ -34,7 +34,7 @@ #include <stdio.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__nanosleep, nanosleep); diff --git a/lib/libpthread/thread/thr_once.c b/lib/libpthread/thread/thr_once.c index 20e29046c2fa..cef478d7dc48 100644 --- a/lib/libpthread/thread/thr_once.c +++ b/lib/libpthread/thread/thr_once.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_once, pthread_once); diff --git a/lib/libpthread/thread/thr_open.c b/lib/libpthread/thread/thr_open.c index 380761b9881e..3e0da32af7bc 100644 --- a/lib/libpthread/thread/thr_open.c +++ b/lib/libpthread/thread/thr_open.c @@ -38,7 +38,7 @@ #include <dirent.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__open, open); diff --git a/lib/libpthread/thread/thr_pause.c b/lib/libpthread/thread/thr_pause.c index 57b508f266f6..4a46be03f338 100644 --- a/lib/libpthread/thread/thr_pause.c +++ b/lib/libpthread/thread/thr_pause.c @@ -31,7 +31,7 @@ #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pause, pause); diff --git a/lib/libpthread/thread/thr_poll.c b/lib/libpthread/thread/thr_poll.c index 62b261394dbb..b4c495c123c9 100644 --- a/lib/libpthread/thread/thr_poll.c +++ b/lib/libpthread/thread/thr_poll.c @@ -39,7 +39,7 @@ #include <sys/time.h> #include <sys/fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__poll, poll); diff --git a/lib/libpthread/thread/thr_priority_queue.c b/lib/libpthread/thread/thr_priority_queue.c index b700d97f7955..b938a3c3807e 100644 --- a/lib/libpthread/thread/thr_priority_queue.c +++ b/lib/libpthread/thread/thr_priority_queue.c @@ -35,7 +35,7 @@ #include <sys/queue.h> #include <string.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* Prototypes: */ static void pq_insert_prio_list(pq_queue_t *pq, int prio); diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h index 97b30b703092..4db52d98b9bf 100644 --- a/lib/libpthread/thread/thr_private.h +++ b/lib/libpthread/thread/thr_private.h @@ -34,8 +34,8 @@ * $FreeBSD$ */ -#ifndef _PTHREAD_PRIVATE_H -#define _PTHREAD_PRIVATE_H +#ifndef _THR_PRIVATE_H +#define _THR_PRIVATE_H /* * Evaluate the storage class specifier. @@ -1332,4 +1332,4 @@ extern void ___longjmp(jmp_buf, int) __dead2; #endif __END_DECLS -#endif /* !_PTHREAD_PRIVATE_H */ +#endif /* !_THR_PRIVATE_H */ diff --git a/lib/libpthread/thread/thr_pselect.c b/lib/libpthread/thread/thr_pselect.c index 5a3d378550f7..af22337733d3 100644 --- a/lib/libpthread/thread/thr_pselect.c +++ b/lib/libpthread/thread/thr_pselect.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <signal.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" extern int __pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, const struct timespec *timo, const sigset_t *mask); diff --git a/lib/libpthread/thread/thr_read.c b/lib/libpthread/thread/thr_read.c index 067befa0c176..f313a9c231aa 100644 --- a/lib/libpthread/thread/thr_read.c +++ b/lib/libpthread/thread/thr_read.c @@ -38,7 +38,7 @@ #include <errno.h> #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__read, read); diff --git a/lib/libpthread/thread/thr_readv.c b/lib/libpthread/thread/thr_readv.c index e2b79d73696c..707c04c96809 100644 --- a/lib/libpthread/thread/thr_readv.c +++ b/lib/libpthread/thread/thr_readv.c @@ -38,7 +38,7 @@ #include <errno.h> #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__readv, readv); diff --git a/lib/libpthread/thread/thr_resume_np.c b/lib/libpthread/thread/thr_resume_np.c index ed20b6a8d2f5..cc00f09299f0 100644 --- a/lib/libpthread/thread/thr_resume_np.c +++ b/lib/libpthread/thread/thr_resume_np.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" static void resume_common(struct pthread *); diff --git a/lib/libpthread/thread/thr_rwlock.c b/lib/libpthread/thread/thr_rwlock.c index 2f55f03b355c..f41e8a2f6f1f 100644 --- a/lib/libpthread/thread/thr_rwlock.c +++ b/lib/libpthread/thread/thr_rwlock.c @@ -31,7 +31,7 @@ #include <stdlib.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* maximum number of times a read lock may be obtained */ #define MAX_READ_LOCKS (INT_MAX - 1) diff --git a/lib/libpthread/thread/thr_rwlockattr.c b/lib/libpthread/thread/thr_rwlockattr.c index bc1b9eec0307..8c0697bd671c 100644 --- a/lib/libpthread/thread/thr_rwlockattr.c +++ b/lib/libpthread/thread/thr_rwlockattr.c @@ -30,7 +30,7 @@ #include <stdlib.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_rwlockattr_destroy, pthread_rwlockattr_destroy); __weak_reference(_pthread_rwlockattr_getpshared, pthread_rwlockattr_getpshared); diff --git a/lib/libpthread/thread/thr_select.c b/lib/libpthread/thread/thr_select.c index 2776cb2c80fc..a0415137f808 100644 --- a/lib/libpthread/thread/thr_select.c +++ b/lib/libpthread/thread/thr_select.c @@ -41,7 +41,7 @@ #include <sys/time.h> #include <sys/fcntl.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__select, select); diff --git a/lib/libpthread/thread/thr_self.c b/lib/libpthread/thread/thr_self.c index 1c09e3d206b8..d213e5e782b7 100644 --- a/lib/libpthread/thread/thr_self.c +++ b/lib/libpthread/thread/thr_self.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_self, pthread_self); diff --git a/lib/libpthread/thread/thr_sem.c b/lib/libpthread/thread/thr_sem.c index 851eca293ae6..70a97216fe91 100644 --- a/lib/libpthread/thread/thr_sem.c +++ b/lib/libpthread/thread/thr_sem.c @@ -33,7 +33,7 @@ #include <errno.h> #include <semaphore.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" #define _SEM_CHECK_VALIDITY(sem) \ if ((*(sem))->magic != SEM_MAGIC) { \ diff --git a/lib/libpthread/thread/thr_seterrno.c b/lib/libpthread/thread/thr_seterrno.c index 0d9474fc26a5..4f585acbf7c5 100644 --- a/lib/libpthread/thread/thr_seterrno.c +++ b/lib/libpthread/thread/thr_seterrno.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* * This function needs to reference the global error variable which is diff --git a/lib/libpthread/thread/thr_setprio.c b/lib/libpthread/thread/thr_setprio.c index 9099a6e73815..c5a950600a13 100644 --- a/lib/libpthread/thread/thr_setprio.c +++ b/lib/libpthread/thread/thr_setprio.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_setprio, pthread_setprio); diff --git a/lib/libpthread/thread/thr_setschedparam.c b/lib/libpthread/thread/thr_setschedparam.c index 7696762cc5f8..5117a260e995 100644 --- a/lib/libpthread/thread/thr_setschedparam.c +++ b/lib/libpthread/thread/thr_setschedparam.c @@ -34,7 +34,7 @@ #include <errno.h> #include <sys/param.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_setschedparam, pthread_setschedparam); diff --git a/lib/libpthread/thread/thr_sig.c b/lib/libpthread/thread/thr_sig.c index cf319c694f5d..5baaab9ab737 100644 --- a/lib/libpthread/thread/thr_sig.c +++ b/lib/libpthread/thread/thr_sig.c @@ -40,7 +40,7 @@ #include <setjmp.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* Prototypes: */ static void thread_sig_add(struct pthread *pthread, int sig, int has_args); diff --git a/lib/libpthread/thread/thr_sigaction.c b/lib/libpthread/thread/thr_sigaction.c index 2be587cb7264..741b9c22bb40 100644 --- a/lib/libpthread/thread/thr_sigaction.c +++ b/lib/libpthread/thread/thr_sigaction.c @@ -34,7 +34,7 @@ #include <signal.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sigaction, sigaction); diff --git a/lib/libpthread/thread/thr_sigmask.c b/lib/libpthread/thread/thr_sigmask.c index 040e7aad2dba..c26fefc53b8e 100644 --- a/lib/libpthread/thread/thr_sigmask.c +++ b/lib/libpthread/thread/thr_sigmask.c @@ -37,7 +37,7 @@ #include <errno.h> #include <signal.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_sigmask, pthread_sigmask); diff --git a/lib/libpthread/thread/thr_sigpending.c b/lib/libpthread/thread/thr_sigpending.c index 5eaf6ff38e51..71c677165124 100644 --- a/lib/libpthread/thread/thr_sigpending.c +++ b/lib/libpthread/thread/thr_sigpending.c @@ -37,7 +37,7 @@ #include <signal.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sigpending, sigpending); diff --git a/lib/libpthread/thread/thr_sigprocmask.c b/lib/libpthread/thread/thr_sigprocmask.c index cc0b8da8db8a..a56e63eb2af8 100644 --- a/lib/libpthread/thread/thr_sigprocmask.c +++ b/lib/libpthread/thread/thr_sigprocmask.c @@ -37,7 +37,7 @@ #include <signal.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sigprocmask, sigprocmask); diff --git a/lib/libpthread/thread/thr_sigsuspend.c b/lib/libpthread/thread/thr_sigsuspend.c index 42f174b262f5..90638f4a458d 100644 --- a/lib/libpthread/thread/thr_sigsuspend.c +++ b/lib/libpthread/thread/thr_sigsuspend.c @@ -36,7 +36,7 @@ #include <sys/signalvar.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__sigsuspend, sigsuspend); diff --git a/lib/libpthread/thread/thr_sigwait.c b/lib/libpthread/thread/thr_sigwait.c index 1e8724987ab1..209d3e70ea4d 100644 --- a/lib/libpthread/thread/thr_sigwait.c +++ b/lib/libpthread/thread/thr_sigwait.c @@ -36,7 +36,7 @@ #include <sys/signalvar.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sigwait, sigwait); diff --git a/lib/libpthread/thread/thr_sleep.c b/lib/libpthread/thread/thr_sleep.c index 9e09db775a0a..70b1c9fb70ae 100644 --- a/lib/libpthread/thread/thr_sleep.c +++ b/lib/libpthread/thread/thr_sleep.c @@ -31,7 +31,7 @@ #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sleep, sleep); diff --git a/lib/libpthread/thread/thr_spec.c b/lib/libpthread/thread/thr_spec.c index e71f75fb02cb..07ef3875b365 100644 --- a/lib/libpthread/thread/thr_spec.c +++ b/lib/libpthread/thread/thr_spec.c @@ -36,7 +36,7 @@ #include <string.h> #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" struct pthread_key { spinlock_t lock; diff --git a/lib/libpthread/thread/thr_spinlock.c b/lib/libpthread/thread/thr_spinlock.c index e05aa4a5fc0b..544ea3cdf857 100644 --- a/lib/libpthread/thread/thr_spinlock.c +++ b/lib/libpthread/thread/thr_spinlock.c @@ -42,7 +42,7 @@ #include <libc_private.h> -#include "pthread_private.h" +#include "thr_private.h" /* * Lock a location for the running thread. Yield to allow other diff --git a/lib/libpthread/thread/thr_stack.c b/lib/libpthread/thread/thr_stack.c index 80c9d53ec488..c75d6eeb7786 100644 --- a/lib/libpthread/thread/thr_stack.c +++ b/lib/libpthread/thread/thr_stack.c @@ -33,7 +33,7 @@ #include <sys/user.h> #include <stdlib.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" /* Spare thread stack. */ struct stack { diff --git a/lib/libpthread/thread/thr_suspend_np.c b/lib/libpthread/thread/thr_suspend_np.c index 952baa350ec5..4128437398e6 100644 --- a/lib/libpthread/thread/thr_suspend_np.c +++ b/lib/libpthread/thread/thr_suspend_np.c @@ -33,7 +33,7 @@ */ #include <errno.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" static void suspend_common(struct pthread *thread); diff --git a/lib/libpthread/thread/thr_switch_np.c b/lib/libpthread/thread/thr_switch_np.c index f24d99f74a4a..45c289e71b12 100644 --- a/lib/libpthread/thread/thr_switch_np.c +++ b/lib/libpthread/thread/thr_switch_np.c @@ -34,7 +34,7 @@ #include <errno.h> #include <pthread.h> #include <pthread_np.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_pthread_switch_add_np, pthread_switch_add_np); diff --git a/lib/libpthread/thread/thr_system.c b/lib/libpthread/thread/thr_system.c index d63969b08505..591562bab422 100644 --- a/lib/libpthread/thread/thr_system.c +++ b/lib/libpthread/thread/thr_system.c @@ -31,7 +31,7 @@ #include <stdlib.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_system, system); diff --git a/lib/libpthread/thread/thr_tcdrain.c b/lib/libpthread/thread/thr_tcdrain.c index 272bdf6e2747..140039bcd933 100644 --- a/lib/libpthread/thread/thr_tcdrain.c +++ b/lib/libpthread/thread/thr_tcdrain.c @@ -31,7 +31,7 @@ #include <termios.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_tcdrain, tcdrain); diff --git a/lib/libpthread/thread/thr_wait.c b/lib/libpthread/thread/thr_wait.c index e61138b21451..8e9c8644860b 100644 --- a/lib/libpthread/thread/thr_wait.c +++ b/lib/libpthread/thread/thr_wait.c @@ -30,7 +30,7 @@ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_wait, wait); diff --git a/lib/libpthread/thread/thr_wait4.c b/lib/libpthread/thread/thr_wait4.c index 05ed065dd925..90df876b1760 100644 --- a/lib/libpthread/thread/thr_wait4.c +++ b/lib/libpthread/thread/thr_wait4.c @@ -36,7 +36,7 @@ #include <errno.h> #include <sys/wait.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__wait4, wait4); diff --git a/lib/libpthread/thread/thr_waitpid.c b/lib/libpthread/thread/thr_waitpid.c index fcbbc9fa44ff..8938a6251b3e 100644 --- a/lib/libpthread/thread/thr_waitpid.c +++ b/lib/libpthread/thread/thr_waitpid.c @@ -32,7 +32,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_waitpid, waitpid); diff --git a/lib/libpthread/thread/thr_write.c b/lib/libpthread/thread/thr_write.c index 072b989ee750..80925ec88de2 100644 --- a/lib/libpthread/thread/thr_write.c +++ b/lib/libpthread/thread/thr_write.c @@ -38,7 +38,7 @@ #include <errno.h> #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__write, write); diff --git a/lib/libpthread/thread/thr_writev.c b/lib/libpthread/thread/thr_writev.c index b07278ac39b3..4fcb9f1069ab 100644 --- a/lib/libpthread/thread/thr_writev.c +++ b/lib/libpthread/thread/thr_writev.c @@ -40,7 +40,7 @@ #include <string.h> #include <unistd.h> #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(__writev, writev); diff --git a/lib/libpthread/thread/thr_yield.c b/lib/libpthread/thread/thr_yield.c index ec89255fb92c..ed66da61a804 100644 --- a/lib/libpthread/thread/thr_yield.c +++ b/lib/libpthread/thread/thr_yield.c @@ -32,7 +32,7 @@ * $FreeBSD$ */ #include <pthread.h> -#include "pthread_private.h" +#include "thr_private.h" __weak_reference(_sched_yield, sched_yield); __weak_reference(_pthread_yield, pthread_yield); |