2008-03-01 Neal H. Walfield <neal@gnu.org>

	Add signal implementation.
	* Makefile.am (SYSDEP_PATH): Add $(srcdir)/signal.
	(libpthread_a_SOURCES): Add pt-mutex-transfer-np.c, kill.c,
	killpg.c, pt-kill-siginfo-np.c, raise.c, sigaction.c, sigaddset.c,
	sigaltstack.c, sigdelset.c, sigemptyset.c, sigfillset.c,
	sig-internal.c, sig-internal.h, siginterrupt.c, sigismember.c,
	signal.c, signal-dispatch.c, signal.h, sigpending.c,
	sigprocmask.c, sigsuspend.c, sigtimedwait.c, sigwait.c,
	sigwaiter.c, sigwaitinfo.c, signal-dispatch-lowlevel.c, and
	sigprocmask.c.
	* headers.m4: Link libpthread/signal/signal.h into ../include.
	* sysdeps/generic/pt-mutex-transfer-np.c: New file.
        * signal/README: New file.
        * signal/TODO: Likewise.
        * signal/kill.c: Likewise.
        * signal/pt-kill-siginfo-np.c: Likewise.
        * signal/sig-internal.c: Likewise.
        * signal/sig-internal.h: Likewise.
        * signal/sigaction.c: Likewise.
        * signal/sigaltstack.c: Likewise.
        * signal/signal-dispatch.c: Likewise.
        * signal/signal.h: Likewise.
        * signal/sigpending.c: Likewise.
        * signal/sigsuspend.c: Likewise.
        * signal/sigtimedwait.c: Likewise.
        * signal/sigwaiter.c: Likewise.
        * signal/sigwaitinfo.c: Likewise.
	* sysdeps/l4/hurd/sig-sysdep.h: Likewise.
	* sysdeps/l4/hurd/sigprocmask.c: Likewise.
	* sysdeps/generic/killpg.c: Likewise.
	* sysdeps/generic/pt-kill.c: Likewise.
	* sysdeps/generic/raise.c: Likewise.
	* sysdeps/generic/sigaddset.c: Likewise.
	* sysdeps/generic/sigdelset.c: Likewise.
	* sysdeps/generic/sigemptyset.c: Likewise.
	* sysdeps/generic/sigfillset.c: Likewise.
	* sysdeps/generic/siginterrupt.c: Likewise.
	* sysdeps/generic/sigismember.c: Likewise.
	* sysdeps/generic/signal.c: Likewise.
	* sysdeps/generic/sigwait.c: Likewise.
	* sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c: Likewise.
	* sysdeps/l4/hurd/pt-sysdep.c (sigprocmask): Remove function.
	* sysdeps/l4/hurd/pt-sigstate.c (__pthread_sigstate): Implement
	it.
	* sysdeps/l4/hurd/pt-sigstate-init.c: Include <sig-internal.h>.
	(__pthread_sigstate_init): Initialize THREAD->SS.
	* sysdeps/l4/hurd/pt-kill.c: Remove file.
	* pthread/pt-internal.h: Include <sig-internal.h>.
	(PTHREAD_SIGNAL_MEMBERS) [! PTHREAD_SIGNAL_MEMBERS]: Define.
	(struct __pthread): Add PTHREAD_SIGNAL_MEMBERS.
	* pthread/pt-self.c (pthread_self): Assert that SELF is not NULL.

1 files changed, 74 insertions, 0 deletions

diff --git a/signal/sigwaitinfo.c b/signal/sigwaitinfo.c
new file mode 100644
index 00000000..1b47079e
--- /dev/null
+++ b/signal/sigwaitinfo.c
@@ -0,0 +1,74 @@
+/* sigwaitinfo.c - Generic sigwaitinfo implementation.
+   Copyright (C) 2008 Free Software Foundation, Inc.
+   Written by Neal H. Walfield <neal@gnu.org>.
+
+   This file is part of the GNU Hurd.
+
+   The GNU Hurd is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public License
+   as published by the Free Software Foundation; either version 3 of
+   the License, or (at your option) any later version.
+
+   The GNU Hurd is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this program.  If not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <sig-internal.h>
+#include <pt-internal.h>
+
+int
+sigwaitinfo (const sigset_t *restrict set, siginfo_t *restrict info)
+{
+  pthread_mutex_lock (&sig_lock);
+
+  struct signal_state *ss = &_pthread_self ()->ss;
+
+  pthread_mutex_lock (&ss->lock);
+
+  if ((process_pending & *set) || (ss->pending & *set))
+    /* There is at least one signal pending.  */
+    {
+      bool local = true;
+      sigset_t extant = process_pending & *set;
+      if (! extant)
+	{
+	  local = false;
+	  extant = ss->pending & *set;
+	}
+
+      assert (extant);
+
+      int signo = l4_msb64 (extant);
+
+      if (info)
+	{
+	  if (local)
+	    *info = ss->info[signo - 1];
+	  else
+	    *info = process_pending_info[signo - 1];
+	  info->si_signo = signo;
+	}
+
+      sigdelset (&process_pending, signo);
+      sigdelset (&ss->pending, signo);
+
+      pthread_mutex_unlock (&ss->lock);
+      pthread_mutex_unlock (&sig_lock);
+      return 0;
+    }
+
+  siginfo_t i = sigwaiter_block (ss, set);
+  assert (i.si_signo);
+  assert ((sigmask (i.si_signo) & *set));
+
+  if (info)
+    *info = i;
+
+  return 0;
+}
+