Revamp libpthread so that it has a chance of working in an SMP

environment.  This includes support for multiple KSEs and KSEGs.

The ability to create more than 1 KSE via pthread_setconcurrency()
is in the works as well as support for PTHREAD_SCOPE_SYSTEM threads.
Those should come shortly.

There are still some known issues which davidxu and I are working
on, but it'll make it easier for us by committing what we have.

This library now passes all of the ACE tests that libc_r passes
with the exception of one.  It also seems to work OK with KDE
including konqueror, kwrite, etc.  I haven't been able to get
mozilla to run due to lack of java plugin, so I'd be interested
to see how it works with that.

Reviewed by:	davidxu

1 files changed, 43 insertions, 7 deletions

diff --git a/lib/libpthread/thread/thr_sigsuspend.c b/lib/libpthread/thread/thr_sigsuspend.c
index dc805ac..7ce027a 100644
--- a/lib/libpthread/thread/thr_sigsuspend.c
+++ b/lib/libpthread/thread/thr_sigsuspend.c
@@ -32,22 +32,58 @@
  * $FreeBSD$
  */
 #include <signal.h>
-#include <sys/param.h>
-#include <sys/signalvar.h>
 #include <errno.h>
 #include <pthread.h>
+#include <string.h>
 #include "thr_private.h"
 
 __weak_reference(__sigsuspend, sigsuspend);
 
 int
+_sigsuspend(const sigset_t *set)
+{
+	struct pthread	*curthread = _get_curthread();
+	int             ret = -1;
+
+	/* Check if a new signal set was provided by the caller: */
+	if (set != NULL) {
+		THR_SCHED_LOCK(curthread, curthread);
+
+		/* Change the caller's mask: */
+		memcpy(&curthread->tmbx.tm_context.uc_sigmask,
+		    set, sizeof(sigset_t));
+
+		THR_SET_STATE(curthread, PS_SIGSUSPEND);
+
+		THR_SCHED_UNLOCK(curthread, curthread);
+
+		/* Wait for a signal: */
+		_thr_sched_switch(curthread);
+
+		/* Always return an interrupted error: */
+		errno = EINTR;
+
+		/* Restore the signal mask: */
+		memcpy(&curthread->tmbx.tm_context.uc_sigmask,
+		    &curthread->sigmask, sizeof(sigset_t));
+	} else {
+		/* Return an invalid argument error: */
+		errno = EINVAL;
+	}
+
+	/* Return the completion status: */
+	return (ret);
+}
+
+int
 __sigsuspend(const sigset_t * set)
 {
-	int	ret;
+	struct pthread *curthread = _get_curthread();
+	int		ret;
 
-	_thread_enter_cancellation_point();
-	ret = __sys_sigsuspend(set);
-	_thread_leave_cancellation_point();
+	_thr_enter_cancellation_point(curthread);
+	ret = _sigsuspend(set);
+	_thr_leave_cancellation_point(curthread);
 
-	return ret;
+	return (ret);
 }