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

diff --git a/lib/libpthread/thread/thr_yield.c b/lib/libpthread/thread/thr_yield.c
index 7d64283..67ca501 100644
--- a/lib/libpthread/thread/thr_yield.c
+++ b/lib/libpthread/thread/thr_yield.c
@@ -31,15 +31,19 @@
  *
  * $FreeBSD$
  */
-#ifdef _THREAD_SAFE
 #include <pthread.h>
 #include "pthread_private.h"
 
+#pragma weak	sched_yield=_sched_yield
+#pragma weak	pthread_yield=_pthread_yield
+
 int
-sched_yield(void)
+_sched_yield(void)
 {
+	struct pthread	*curthread = _get_curthread();
+
 	/* Reset the accumulated time slice value for the current thread: */
-	_thread_run->slice_usec = -1;
+	curthread->slice_usec = -1;
 
 	/* Schedule the next thread: */
 	_thread_kern_sched(NULL);
@@ -50,12 +54,13 @@ sched_yield(void)
 
 /* Draft 4 yield */
 void
-pthread_yield(void)
+_pthread_yield(void)
 {
+	struct pthread	*curthread = _get_curthread();
+
 	/* Reset the accumulated time slice value for the current thread: */
-	_thread_run->slice_usec = -1;
+	curthread->slice_usec = -1;
 
 	/* Schedule the next thread: */
 	_thread_kern_sched(NULL);
 }
-#endif