Add weak definitions for wrapped system calls. In general:

	_foo - wrapped system call
	foo - weak definition to _foo

and for cancellation points:

	_foo - wrapped system call
	__foo - enter cancellation point, call _foo(), leave
	        cancellation point
	foo - weak definition to __foo

Change use of global _thread_run to call a function to get the
currently running thread.

Make all pthread_foo functions weak definitions to _pthread_foo,
where _pthread_foo is the implementation.  This allows an application
to provide its own pthread functions.

Provide slightly different versions of pthread_mutex_lock and
pthread_mutex_init so that we can tell the difference between
a libc mutex and an application mutex.  Threads holding mutexes
internal to libc should never be allowed to exit, call signal
handlers, or cancel.

Approved by:	-arch

1 files changed, 9 insertions, 6 deletions

diff --git a/lib/libpthread/thread/thr_rwlockattr.c b/lib/libpthread/thread/thr_rwlockattr.c
index 37eb3ea..7dcaaeb 100644
--- a/lib/libpthread/thread/thr_rwlockattr.c
+++ b/lib/libpthread/thread/thr_rwlockattr.c
@@ -26,15 +26,19 @@
  * $FreeBSD$
  */
 
-#ifdef _THREAD_SAFE
 #include <errno.h>
 #include <stdlib.h>
 
 #include <pthread.h>
 #include "pthread_private.h"
 
+#pragma weak	pthread_rwlockattr_destroy=_pthread_rwlockattr_destroy
+#pragma weak	pthread_rwlockattr_getpshared=_pthread_rwlockattr_getpshared
+#pragma weak	pthread_rwlockattr_init=_pthread_rwlockattr_init
+#pragma weak	pthread_rwlockattr_setpshared=_pthread_rwlockattr_setpshared
+
 int
-pthread_rwlockattr_destroy(pthread_rwlockattr_t *rwlockattr)
+_pthread_rwlockattr_destroy(pthread_rwlockattr_t *rwlockattr)
 {
 	pthread_rwlockattr_t prwlockattr;
 
@@ -52,7 +56,7 @@ pthread_rwlockattr_destroy(pthread_rwlockattr_t *rwlockattr)
 }
 
 int
-pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *rwlockattr,
+_pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *rwlockattr,
 	int *pshared)
 {
 	*pshared = (*rwlockattr)->pshared;
@@ -61,7 +65,7 @@ pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *rwlockattr,
 }
 
 int
-pthread_rwlockattr_init(pthread_rwlockattr_t *rwlockattr)
+_pthread_rwlockattr_init(pthread_rwlockattr_t *rwlockattr)
 {
 	pthread_rwlockattr_t prwlockattr;
 
@@ -81,7 +85,7 @@ pthread_rwlockattr_init(pthread_rwlockattr_t *rwlockattr)
 }
 
 int
-pthread_rwlockattr_setpshared(pthread_rwlockattr_t *rwlockattr, int pshared)
+_pthread_rwlockattr_setpshared(pthread_rwlockattr_t *rwlockattr, int pshared)
 {
 	/* Only PTHREAD_PROCESS_PRIVATE is supported. */
 	if (pshared != PTHREAD_PROCESS_PRIVATE)
@@ -92,4 +96,3 @@ pthread_rwlockattr_setpshared(pthread_rwlockattr_t *rwlockattr, int pshared)
 	return(0);
 }
 
-#endif /* _THREAD_SAFE */