update

[l4.git] / l4 / pkg / uclibc / lib / contrib / uclibc / libc / sysdeps / linux / common / __rt_sigtimedwait.c

diff --git a/l4/pkg/uclibc/lib/contrib/uclibc/libc/sysdeps/linux/common/__rt_sigtimedwait.c b/l4/pkg/uclibc/lib/contrib/uclibc/libc/sysdeps/linux/common/__rt_sigtimedwait.c
index f9ec0eabf770b583e0dbfc7293e97b7b966622f9..a7ab8fb61fad46b0375aee4ec4f345225c020ce0 100644 (file)
--- a/l4/pkg/uclibc/lib/contrib/uclibc/libc/sysdeps/linux/common/__rt_sigtimedwait.c
+++ b/l4/pkg/uclibc/lib/contrib/uclibc/libc/sysdeps/linux/common/__rt_sigtimedwait.c
@@ -2,44 +2,93 @@
 /*
  * __rt_sigtimedwait() for uClibc
  *
- * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+ * Copyright (C) 2006 by Steven Hill <sjhill@realitydiluted.com>
+ * Copyright (C) 2000-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ * GNU Library General Public License (LGPL) version 2 or later.
  */
 
 #include <sys/syscall.h>
 #include <signal.h>
-#define __need_NULL
-#include <stddef.h>
-
+#include <string.h>
 
 #ifdef __NR_rt_sigtimedwait
-#define __NR___rt_sigtimedwait __NR_rt_sigtimedwait
-static _syscall4(int, __rt_sigtimedwait, const sigset_t *, set, siginfo_t *, info,
-                 const struct timespec *, timeout, size_t, setsize)
 
-int sigwaitinfo(const sigset_t * set, siginfo_t * info)
+# ifdef __UCLIBC_HAS_THREADS_NATIVE__
+#  include <sysdep-cancel.h>
+
+static int do_sigtimedwait(const sigset_t *set, siginfo_t *info,
+                                                  const struct timespec *timeout)
 {
-       return __rt_sigtimedwait(set, info, NULL, _NSIG / 8);
+#  ifdef SIGCANCEL
+       sigset_t tmpset;
+
+       if (set != NULL && (__builtin_expect (__sigismember (set, SIGCANCEL), 0)
+#   ifdef SIGSETXID
+               || __builtin_expect (__sigismember (set, SIGSETXID), 0)
+#   endif
+               ))
+       {
+               /* Create a temporary mask without the bit for SIGCANCEL set.  */
+               // We are not copying more than we have to.
+               memcpy (&tmpset, set, _NSIG / 8);
+               __sigdelset (&tmpset, SIGCANCEL);
+#   ifdef SIGSETXID
+               __sigdelset (&tmpset, SIGSETXID);
+#   endif
+               set = &tmpset;
+       }
+#  endif
+
+       /* XXX The size argument hopefully will have to be changed to the
+          real size of the user-level sigset_t.  */
+       int result = INLINE_SYSCALL (rt_sigtimedwait, 4, set, info,
+                                                                timeout, _NSIG / 8);
+
+       /* The kernel generates a SI_TKILL code in si_code in case tkill is
+          used.  tkill is transparently used in raise().  Since having
+          SI_TKILL as a code is useful in general we fold the results
+          here.  */
+       if (result != -1 && info != NULL && info->si_code == SI_TKILL)
+               info->si_code = SI_USER;
+
+       return result;
 }
 
-int sigtimedwait(const sigset_t * set, siginfo_t * info,
-                                const struct timespec *timeout)
+/* Return any pending signal or wait for one for the given time.  */
+int attribute_hidden __sigtimedwait(const sigset_t *set, siginfo_t *info,
+                                   const struct timespec *timeout)
 {
-       return __rt_sigtimedwait(set, info, timeout, _NSIG / 8);
+       if(SINGLE_THREAD_P)
+               return do_sigtimedwait(set, info, timeout);
+
+       int oldtype = LIBC_CANCEL_ASYNC();
+
+       /* XXX The size argument hopefully will have to be changed to the
+          real size of the user-level sigset_t.  */
+       int result = do_sigtimedwait(set, info, timeout);
+
+       LIBC_CANCEL_RESET(oldtype);
+
+       return result;
 }
-#else
-int sigwaitinfo(const sigset_t * set, siginfo_t * info)
+# else
+#  define __need_NULL
+#  include <stddef.h>
+#  define __NR___rt_sigtimedwait __NR_rt_sigtimedwait
+static _syscall4(int, __rt_sigtimedwait, const sigset_t *, set,
+                                siginfo_t *, info, const struct timespec *, timeout,
+                                size_t, setsize);
+
+int attribute_hidden __sigtimedwait(const sigset_t * set, siginfo_t * info,
+                                                                       const struct timespec *timeout)
 {
-       if (set == NULL)
-               __set_errno(EINVAL);
-       else
-               __set_errno(ENOSYS);
-       return -1;
+       return __rt_sigtimedwait(set, info, timeout, _NSIG / 8);
 }
-
-int sigtimedwait(const sigset_t * set, siginfo_t * info,
-                                const struct timespec *timeout)
+# endif /* !__UCLIBC_HAS_THREADS_NATIVE__ */
+#else
+int attribute_hidden __sigtimedwait(const sigset_t * set, siginfo_t * info,
+                                                                       const struct timespec *timeout)
 {
        if (set == NULL)
                __set_errno(EINVAL);
@@ -48,5 +97,5 @@ int sigtimedwait(const sigset_t * set, siginfo_t * info,
        return -1;
 }
 #endif
-libc_hidden_def(sigwaitinfo)
-libc_hidden_def(sigtimedwait)
+weak_alias(__sigtimedwait,sigtimedwait)
+libc_hidden_weak(sigtimedwait)