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

diff --git a/lib/libc_r/uthread/uthread_wait4.c b/lib/libc_r/uthread/uthread_wait4.c
index da69a4f..8b44366 100644
--- a/lib/libc_r/uthread/uthread_wait4.c
+++ b/lib/libc_r/uthread/uthread_wait4.c
@@ -35,27 +35,29 @@
 
 #include <errno.h>
 #include <sys/wait.h>
-#ifdef _THREAD_SAFE
 #include <pthread.h>
 #include "pthread_private.h"
 
+#pragma weak	wait4=_wait4
+
 pid_t
 _wait4(pid_t pid, int *istat, int options, struct rusage * rusage)
 {
+	struct pthread	*curthread = _get_curthread();
 	pid_t	ret;
 
 	_thread_kern_sig_defer();
 
 	/* Perform a non-blocking wait4 syscall: */
-	while ((ret = _thread_sys_wait4(pid, istat, options | WNOHANG, rusage)) == 0 && (options & WNOHANG) == 0) {
+	while ((ret = __sys_wait4(pid, istat, options | WNOHANG, rusage)) == 0 && (options & WNOHANG) == 0) {
 		/* Reset the interrupted operation flag: */
-		_thread_run->interrupted = 0;
+		curthread->interrupted = 0;
 
 		/* Schedule the next thread while this one waits: */
 		_thread_kern_sched_state(PS_WAIT_WAIT, __FILE__, __LINE__);
 
 		/* Check if this call was interrupted by a signal: */
-		if (_thread_run->interrupted) {
+		if (curthread->interrupted) {
 			errno = EINTR;
 			ret = -1;
 			break;
@@ -66,6 +68,3 @@ _wait4(pid_t pid, int *istat, int options, struct rusage * rusage)
 
 	return (ret);
 }
-
-__strong_reference(_wait4, wait4);
-#endif