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

diff --git a/lib/libc_r/uthread/uthread_socketpair.c b/lib/libc_r/uthread/uthread_socketpair.c
index f54256d..f10a1c6 100644
--- a/lib/libc_r/uthread/uthread_socketpair.c
+++ b/lib/libc_r/uthread/uthread_socketpair.c
@@ -36,23 +36,21 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <fcntl.h>
-#ifdef _THREAD_SAFE
 #include <pthread.h>
 #include "pthread_private.h"
 
+#pragma weak	socketpair=_socketpair
+
 int
 _socketpair(int af, int type, int protocol, int pair[2])
 {
 	int             ret;
-	if (!((ret = _thread_sys_socketpair(af, type, protocol, pair)) < 0))
+	if (!((ret = __sys_socketpair(af, type, protocol, pair)) < 0))
 		if (_thread_fd_table_init(pair[0]) != 0 ||
 		    _thread_fd_table_init(pair[1]) != 0) {
-			_thread_sys_close(pair[0]);
-			_thread_sys_close(pair[1]);
+			__sys_close(pair[0]);
+			__sys_close(pair[1]);
 			ret = -1;
 		}
 	return (ret);
 }
-
-__strong_reference(_socketpair, socketpair);
-#endif