summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux/common/waitid.c
diff options
context:
space:
mode:
Diffstat (limited to 'libc/sysdeps/linux/common/waitid.c')
-rw-r--r--libc/sysdeps/linux/common/waitid.c27
1 files changed, 23 insertions, 4 deletions
diff --git a/libc/sysdeps/linux/common/waitid.c b/libc/sysdeps/linux/common/waitid.c
index af55c914a..c8115f9a5 100644
--- a/libc/sysdeps/linux/common/waitid.c
+++ b/libc/sysdeps/linux/common/waitid.c
@@ -14,20 +14,37 @@
# include <sys/syscall.h>
# ifdef __NR_waitid
+
+# ifdef __UCLIBC_HAS_THREADS_NATIVE__
+# include <sysdep-cancel.h>
+# else
+# define SINGLE_THREAD_P 1
+# endif
+
/* The waitid() POSIX interface takes 4 arguments, but the kernel function
* actually takes 5. The fifth is a pointer to struct rusage. Make sure
* we pass NULL rather than letting whatever was in the register bleed up.
*/
#define __NR_waitid5 __NR_waitid
-static _syscall5(int, waitid5, idtype_t, idtype, id_t, id, siginfo_t*, infop,
+static __always_inline
+_syscall5(int, waitid5, idtype_t, idtype, id_t, id, siginfo_t*, infop,
int, options, struct rusage*, ru)
# endif
int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options)
{
# ifdef __NR_waitid
- return waitid5(idtype, id, infop, options, NULL);
-# else
+ if (SINGLE_THREAD_P)
+ return waitid5(idtype, id, infop, options, NULL);
+
+# ifdef __UCLIBC_HAS_THREADS_NATIVE__
+ int oldtype = LIBC_CANCEL_ASYNC ();
+ int result = waitid5(idtype, id, infop, options, NULL);
+ LIBC_CANCEL_RESET (oldtype);
+ return result;
+# endif
+
+# elif defined __NR_waitpid
switch (idtype) {
case P_PID:
if (id <= 0)
@@ -56,7 +73,9 @@ int waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options)
if (infop->si_pid < 0)
return infop->si_pid;
return 0;
+# else
+ __set_errno(ENOSYS);
+ return -1;
# endif
}
-
#endif