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

diff --git a/lib/libpthread/thread/thr_gc.c b/lib/libpthread/thread/thr_gc.c
index a81ea91..cdc9681 100644
--- a/lib/libpthread/thread/thr_gc.c
+++ b/lib/libpthread/thread/thr_gc.c
@@ -47,6 +47,7 @@
 pthread_addr_t
 _thread_gc(pthread_addr_t arg)
 {
+	struct pthread	*curthread = _get_curthread();
 	int		f_debug;
 	int		f_done = 0;
 	int		ret;
@@ -61,13 +62,13 @@ _thread_gc(pthread_addr_t arg)
 	pthread_sigmask(SIG_BLOCK, &mask, NULL);
 
 	/* Mark this thread as a library thread (not a user thread). */
-	_thread_run->flags |= PTHREAD_FLAGS_PRIVATE;
+	curthread->flags |= PTHREAD_FLAGS_PRIVATE;
 
 	/* Set a debug flag based on an environment variable. */
 	f_debug = (getenv("LIBC_R_DEBUG") != NULL);
 
 	/* Set the name of this thread. */
-	pthread_set_name_np(_thread_run,"GC");
+	pthread_set_name_np(curthread,"GC");
 
 	while (!f_done) {
 		/* Check if debugging this application. */
@@ -82,8 +83,8 @@ _thread_gc(pthread_addr_t arg)
 		_thread_kern_sig_defer();
 
 		/* Check if this is the last running thread: */
-		if (TAILQ_FIRST(&_thread_list) == _thread_run &&
-		    TAILQ_NEXT(_thread_run, tle) == NULL)
+		if (TAILQ_FIRST(&_thread_list) == curthread &&
+		    TAILQ_NEXT(curthread, tle) == NULL)
 			/*
 			 * This is the last thread, so it can exit
 			 * now.