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

diff --git a/lib/libc_r/uthread/uthread_socket.c b/lib/libc_r/uthread/uthread_socket.c
index 5cd8f75..cbbbe82 100644
--- a/lib/libc_r/uthread/uthread_socket.c
+++ b/lib/libc_r/uthread/uthread_socket.c
@@ -35,26 +35,24 @@
 #include <sys/socket.h>
 #include <fcntl.h>
 #include <unistd.h>
-#ifdef _THREAD_SAFE
 #include <pthread.h>
 #include "pthread_private.h"
 
+#pragma weak	socket=_socket
+
 int
 _socket(int af, int type, int protocol)
 {
 	int fd;
 
 	/* Create a socket: */
-	if ((fd = _thread_sys_socket(af, type, protocol)) < 0) {
+	if ((fd = __sys_socket(af, type, protocol)) < 0) {
 		/* Error creating socket. */
 
 	/* Initialise the entry in the file descriptor table: */
 	} else if (_thread_fd_table_init(fd) != 0) {
-		_thread_sys_close(fd);
+		__sys_close(fd);
 		fd = -1;
 	}
 	return (fd);
 }
-
-__strong_reference(_socket, socket);
-#endif