Fix BZ #21654 - grp-merge.c alignment

[thirdparty/glibc.git] / hurd / preempt-sig.c

diff --git a/hurd/preempt-sig.c b/hurd/preempt-sig.c
index 194b49dbe94b6e3486f7f7bf4f66eb7d02d20bf4..81c4e905b4fe27cfb899fea132a34a1e7678e405 100644 (file)
--- a/hurd/preempt-sig.c
+++ b/hurd/preempt-sig.c
@@ -1,67 +1,67 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1994-2017 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   The GNU C Library 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 2.1 of the License, or (at your option) any later version.
 
-The GNU C Library 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
-Library General Public License for more details.
+   The GNU C Library 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 Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
+#include <hurd/sigpreempt.h>
 #include <hurd/signal.h>
+#include <assert.h>
 
-/* Initialize PREEMPTER with the information given and stick it in the
-   chain of preempters for SIGNO.  */
-
-int
-hurd_preempt_signals (struct hurd_signal_preempt *preempter,
-                     int signo, int first_code, int last_code,
-                     sighandler_t (*handler) (thread_t, int, long int, int))
+void
+hurd_preempt_signals (struct hurd_signal_preemptor *preemptor)
 {
-  if (signo <= 0 || signo >= NSIG)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-  preempter->first = first_code;
-  preempter->last = last_code;
-  preempter->handler = handler;
-  __mutex_lock (&_hurd_signal_preempt_lock);
-  preempter->next = _hurd_signal_preempt[signo];
-  _hurd_signal_preempt[signo] = preempter;
-  __mutex_unlock (&_hurd_signal_preempt_lock);
-  return 0;
+  __mutex_lock (&_hurd_siglock);
+  preemptor->next = _hurdsig_preemptors;
+  _hurdsig_preemptors = preemptor;
+  _hurdsig_preempted_set |= preemptor->signals;
+  __mutex_unlock (&_hurd_siglock);
 }
 
-/* Remove PREEMPTER from the chain for SIGNO.  */
-
-int
-hurd_unpreempt_signals (struct hurd_signal_preempt *preempter, int signo)
+void
+hurd_unpreempt_signals (struct hurd_signal_preemptor *preemptor)
 {
-  struct hurd_signal_preempt *p, *lastp;
-  if (signo <= 0 || signo >= NSIG)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-  __mutex_lock (&_hurd_signal_preempt_lock);
-  for (p = _hurd_signal_preempt[signo], lastp = NULL;
-       p != NULL; lastp = p, p = p->next)
-    if (p == preempter)
+  struct hurd_signal_preemptor **p;
+  sigset_t preempted = 0;
+
+  __mutex_lock (&_hurd_siglock);
+
+  p = &_hurdsig_preemptors;
+  while (*p)
+    if (*p == preemptor)
       {
-       (lastp == NULL ? _hurd_signal_preempt[signo] : lastp->next) = p->next;
-       __mutex_unlock (&_hurd_signal_preempt_lock);
-       return 0;
+       /* Found it; take it off the chain.  */
+       *p = (*p)->next;
+       if ((preemptor->signals & preempted) != preemptor->signals)
+         {
+           /* This might have been the only preemptor for some
+              of those signals, so we must collect the full mask
+              from the others.  */
+           struct hurd_signal_preemptor *pp;
+           for (pp = *p; pp; pp = pp->next)
+             preempted |= pp->signals;
+           _hurdsig_preempted_set = preempted;
+         }
+       __mutex_unlock (&_hurd_siglock);
+       return;
       }
-  __mutex_unlock (&_hurd_signal_preempt_lock);
-  errno = ENOENT;
-  return -1;
+    else
+      {
+       preempted |= (*p)->signals;
+       p = &(*p)->next;
+      }
+
+  __mutex_unlock (&_hurd_siglock); /* Avoid deadlock during death rattle.  */
+  assert (! "removing absent preemptor");
 }