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, 16 insertions, 8 deletions

diff --git a/lib/libc_r/uthread/uthread_jmp.c b/lib/libc_r/uthread/uthread_jmp.c
index db19ebd..a350280 100644
--- a/lib/libc_r/uthread/uthread_jmp.c
+++ b/lib/libc_r/uthread/uthread_jmp.c
@@ -35,7 +35,6 @@
 #include <setjmp.h>
 #include <sys/param.h>
 #include <sys/user.h>
-#ifdef _THREAD_SAFE
 #include <machine/reg.h>
 #include <pthread.h>
 #include "pthread_private.h"
@@ -43,10 +42,16 @@
 /* Prototypes: */
 static inline int	check_stack(pthread_t thread, void *stackp);
 
+#pragma weak	siglongjmp=_thread_siglongjmp
+#pragma weak	longjmp=_thread_longjmp
+#pragma weak	_longjmp=__thread_longjmp
+
 void
-siglongjmp(sigjmp_buf env, int savemask)
+_thread_siglongjmp(sigjmp_buf env, int savemask)
 {
-	if (check_stack(_thread_run, (void *) GET_STACK_SJB(env)))
+	struct pthread	*curthread = _get_curthread();
+
+	if (check_stack(curthread, (void *) GET_STACK_SJB(env)))
 		PANIC("siglongjmp()ing between thread contexts is undefined by "
 		    "POSIX 1003.1");
 
@@ -58,9 +63,11 @@ siglongjmp(sigjmp_buf env, int savemask)
 }
 
 void
-longjmp(jmp_buf env, int val)
+_thread_longjmp(jmp_buf env, int val)
 {
-	if (check_stack(_thread_run, (void *) GET_STACK_JB(env)))
+	struct pthread	*curthread = _get_curthread();
+
+	if (check_stack(curthread, (void *) GET_STACK_JB(env)))
 		PANIC("longjmp()ing between thread contexts is undefined by "
 		    "POSIX 1003.1");
 
@@ -72,9 +79,11 @@ longjmp(jmp_buf env, int val)
 }
 
 void
-_longjmp(jmp_buf env, int val)
+__thread_longjmp(jmp_buf env, int val)
 {
-	if (check_stack(_thread_run, (void *) GET_STACK_JB(env)))
+	struct pthread	*curthread = _get_curthread();
+
+	if (check_stack(curthread, (void *) GET_STACK_JB(env)))
 		PANIC("_longjmp()ing between thread contexts is undefined by "
 		    "POSIX 1003.1");
 
@@ -108,4 +117,3 @@ check_stack(pthread_t thread, void *stackp)
 	else
 		return (0);
 }
-#endif