* sysdeps/unix/sysv/linux/bits/waitflags.h

	(WSTOPPED, WEXITED, WCONTINUED, WNOWAIT): New macros.
	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_WAITID_SYSCALL):
	New macro.
	* sysdeps/unix/sysv/linux/waitid.c: New file.  Use new syscall when
	available, or fall back to the waitpid-based generic code.

diff --git a/ChangeLog b/ChangeLog
index 6dee5b46eb0ccf07ae20efa5c41ea337c6a24b83..aa996f10b8122853f1f9b25f3c8fdf0b8ec594d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-01  Roland McGrath  <roland@redhat.com>
+
+       * sysdeps/unix/sysv/linux/bits/waitflags.h
+       (WSTOPPED, WEXITED, WCONTINUED, WNOWAIT): New macros.
+       * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_WAITID_SYSCALL):
+       New macro.
+       * sysdeps/unix/sysv/linux/waitid.c: New file.  Use new syscall when
+       available, or fall back to the waitpid-based generic code.
+
 2004-08-14  Alfred M. Szmidt  <ams@kemisten.nu>
 
        * sysdeps/mach/hurd/i386/init-first.c (_hurd_stack_setup): Let gcc

diff --git a/sysdeps/unix/sysv/linux/bits/waitflags.h b/sysdeps/unix/sysv/linux/bits/waitflags.h
index 1303c6c366d1cc09d44eb03d42c5f856056757a2..e3f80f68144d2b26b04a0995e070abd9d3debff4 100644 (file)
--- a/sysdeps/unix/sysv/linux/bits/waitflags.h
+++ b/sysdeps/unix/sysv/linux/bits/waitflags.h
@@ -1,5 +1,5 @@
 /* Definitions of flag bits for `waitpid' et al.
-   Copyright (C) 1992, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1996, 1997, 2000, 2004 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
@@ -26,5 +26,11 @@
 #define        WNOHANG         1       /* Don't block waiting.  */
 #define        WUNTRACED       2       /* Report status of stopped children.  */
 
+/* Bits in the fourth argument to `waitid'.  */
+#define WSTOPPED       2       /* Report stopped child (same as WUNTRACED). */
+#define WEXITED                4       /* Report dead child.  */
+#define WCONTINUED     8       /* Report continued child.  */
+#define WNOWAIT                0x01000000 /* Don't reap, just poll status.  */
+
 #define __WALL         0x40000000 /* Wait for any child.  */
 #define __WCLONE       0x80000000 /* Wait for cloned process.  */

diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 6f19fc6360088b14bc25b09d70b0bdce31fc2fc5..2a84f1502a50a1aa89fb71bf71d39095f19b952e 100644 (file)
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -406,3 +406,8 @@
 #if __LINUX_KERNEL_VERSION >= 132355
 # define __ASSUME_BRK_PAGE_ROUNDED     1
 #endif
+
+/* Starting with version 2.6.9, the waitid system call is available.  */
+#if __LINUX_KERNEL_VERSION >=  0x020609
+# define __ASSUME_WAITID_SYSCALL       1
+#endif

diff --git a/sysdeps/unix/sysv/linux/waitid.c b/sysdeps/unix/sysv/linux/waitid.c
new file mode 100644 (file)
index 0000000..8dcee0c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/waitid.c
@@ -0,0 +1,67 @@
+/* Linux implementation of waitid.
+   Copyright (C) 2004 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 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <sys/wait.h>
+#include <kernel-features.h>
+#include <sysdep.h>
+
+
+#ifdef __NR_waitid
+
+# if __ASSUME_WAITID_SYSCALL > 0
+
+static inline int
+do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options)
+{
+  return INLINE_SYSCALL (waitid, 4, idtype, id, infop, options);
+}
+# define NO_DO_WAITID
+
+# else
+
+static int do_compat_waitid (idtype_t idtype, id_t id,
+                            siginfo_t *infop, int options);
+# define DO_WAITID do_compat_waitid
+
+static int
+do_waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options)
+{
+  static int waitid_works;
+  if (waitid_works > 0)
+    return INLINE_SYSCALL (waitid, 4, idtype, id, infop, options);
+  if (waitid_works == 0)
+    {
+      int result = INLINE_SYSCALL (waitid, 4, idtype, id, infop, options);
+      if (result < 0 && errno == ENOSYS)
+       waitid_works = -1;
+      else
+       {
+         waitid_works = 1;
+         return result;
+       }
+    }
+  return do_compat_waitid (idtype, id, infop, options);
+}
+
+# endif
+
+#endif
+
+#include "sysdeps/posix/waitid.c"