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, 20 insertions, 11 deletions

diff --git a/lib/libpthread/thread/thr_sem.c b/lib/libpthread/thread/thr_sem.c
index eb42919..926f498 100644
--- a/lib/libpthread/thread/thr_sem.c
+++ b/lib/libpthread/thread/thr_sem.c
@@ -31,7 +31,6 @@
 
 #include <stdlib.h>
 #include <errno.h>
-#ifdef _THREAD_SAFE
 #include <semaphore.h>
 #include <pthread.h>
 #include "pthread_private.h"
@@ -43,8 +42,19 @@
 		goto RETURN;			\
 	}
 
+#pragma weak	sem_init=_sem_init
+#pragma weak	sem_destroy=_sem_destroy
+#pragma weak	sem_open=_sem_open
+#pragma weak	sem_close=_sem_close
+#pragma weak	sem_unlink=_sem_unlink
+#pragma weak	sem_wait=_sem_wait
+#pragma weak	sem_trywait=_sem_trywait
+#pragma weak	sem_post=_sem_post
+#pragma weak	sem_getvalue=_sem_getvalue
+
+
 int
-sem_init(sem_t *sem, int pshared, unsigned int value)
+_sem_init(sem_t *sem, int pshared, unsigned int value)
 {
 	int	retval;
 
@@ -103,7 +113,7 @@ sem_init(sem_t *sem, int pshared, unsigned int value)
 }
 
 int
-sem_destroy(sem_t *sem)
+_sem_destroy(sem_t *sem)
 {
 	int	retval;
 	
@@ -131,28 +141,28 @@ sem_destroy(sem_t *sem)
 }
 
 sem_t *
-sem_open(const char *name, int oflag, ...)
+_sem_open(const char *name, int oflag, ...)
 {
 	errno = ENOSYS;
 	return SEM_FAILED;
 }
 
 int
-sem_close(sem_t *sem)
+_sem_close(sem_t *sem)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
 int
-sem_unlink(const char *name)
+_sem_unlink(const char *name)
 {
 	errno = ENOSYS;
 	return -1;
 }
 
 int
-sem_wait(sem_t *sem)
+_sem_wait(sem_t *sem)
 {
 	int	retval;
 
@@ -178,7 +188,7 @@ sem_wait(sem_t *sem)
 }
 
 int
-sem_trywait(sem_t *sem)
+_sem_trywait(sem_t *sem)
 {
 	int	retval;
 
@@ -201,7 +211,7 @@ sem_trywait(sem_t *sem)
 }
 
 int
-sem_post(sem_t *sem)
+_sem_post(sem_t *sem)
 {
 	int	retval;
 
@@ -235,7 +245,7 @@ sem_post(sem_t *sem)
 }
 
 int
-sem_getvalue(sem_t *sem, int *sval)
+_sem_getvalue(sem_t *sem, int *sval)
 {
 	int	retval;
 
@@ -249,4 +259,3 @@ sem_getvalue(sem_t *sem, int *sval)
   RETURN:
 	return retval;
 }
-#endif