Update.

2004-03-18  Ulrich Drepper  <drepper@redhat.com>

	* posix/sched.h: Change sched_getaffinity and sched_setaffinity
	interfaces: add new second parameter.
	* sysdeps/generic/sched_getaffinity.c: Implement interface change.
	* sysdeps/generic/sched_setaffinity.c: Likewise.
	* sysdeps/unix/sysv/linux/sched_getaffinity.c: Likewise.  Add
	compatibility interface.
	* sysdeps/unix/sysv/linux/sched_setaffinity.c: Likewise.
	* sysdeps/unix/sysv/linux/Versions: Add versions for changed
	interfaces.

5 files changed, 80 insertions, 15 deletions

diff --git a/sysdeps/generic/sched_getaffinity.c b/sysdeps/generic/sched_getaffinity.c
index b9b7207d3f..b2e452f879 100644
--- a/sysdeps/generic/sched_getaffinity.c
+++ b/sysdeps/generic/sched_getaffinity.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 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
@@ -23,8 +23,9 @@
 
 /* Retrieve the CPU affinity mask for a particular process.  */
 int
-sched_getaffinity (pid, cpuset)
+sched_getaffinity (pid, cpusetsize, cpuset)
      pid_t pid;
+     size_t cpusetsize;
      cpu_set_t *cpuset;
 {
   __set_errno (ENOSYS);
diff --git a/sysdeps/generic/sched_setaffinity.c b/sysdeps/generic/sched_setaffinity.c
index e07e54ba1a..652163db85 100644
--- a/sysdeps/generic/sched_setaffinity.c
+++ b/sysdeps/generic/sched_setaffinity.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 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
@@ -23,8 +23,9 @@
 
 /* Retrieve the CPU affinity mask for a particular process.  */
 int
-sched_setaffinity (pid, cpuset)
+sched_setaffinity (pid, cpusetsize, cpuset)
      pid_t pid;
+     size_t cpusetsize;
      const cpu_set_t *cpuset;
 {
   __set_errno (ENOSYS);
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index 6a60315ee4..0fa782a0d7 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -112,6 +112,9 @@ libc {
   GLIBC_2.3.3 {
     gnu_dev_major; gnu_dev_minor; gnu_dev_makedev;
   }
+  GLIBC_2.3.4 {
+    sched_getaffinity; sched_setaffinity;
+  }
   GLIBC_PRIVATE {
     # needed by libpthread.
     __libc_sigaction;
diff --git a/sysdeps/unix/sysv/linux/sched_getaffinity.c b/sysdeps/unix/sysv/linux/sched_getaffinity.c
index 12e6e1603a..09787f277f 100644
--- a/sysdeps/unix/sysv/linux/sched_getaffinity.c
+++ b/sysdeps/unix/sysv/linux/sched_getaffinity.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 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
@@ -21,25 +21,38 @@
 #include <string.h>
 #include <sysdep.h>
 #include <sys/types.h>
+#include <shlib-compat.h>
 
 
 #ifdef __NR_sched_getaffinity
 int
-sched_getaffinity (pid, cpuset)
-     pid_t pid;
-     cpu_set_t *cpuset;
+__sched_getaffinity_new (pid_t pid, size_t cpusetsize, cpu_set_t *cpuset)
 {
   int res = INLINE_SYSCALL (sched_getaffinity, 3, pid, sizeof (cpu_set_t),
 			    cpuset);
   if (res != -1)
     {
       /* Clean the rest of the memory the kernel didn't do.  */
-      memset ((char *) cpuset + res, '\0', sizeof (cpu_set_t) - res);
+      memset ((char *) cpuset + res, '\0', cpusetsize - res);
 
       res = 0;
     }
   return res;
 }
+versioned_symbol (libc, __sched_getaffinity_new, sched_getaffinity,
+		  GLIBC_2_3_4);
+
+
+# if SHLIB_COMPAT(libc, 2_3_3, 2_3_4)
+int
+attribute_compat_text_section
+__sched_getaffinity_old (const pthread_attr_t *attr, cpu_set_t *cpuset)
+{
+  /* The old interface by default assumed a 1024 processor bitmap.  */
+  return __sched_getaffinity_new (attr, 128, cpuset);
+}
+compat_symbol (libc, __sched_getaffinity_old, sched_getaffinity, GLIBC_2_3_3);
+# endif
 #else
 # include <sysdeps/generic/sched_getaffinity.c>
 #endif
diff --git a/sysdeps/unix/sysv/linux/sched_setaffinity.c b/sysdeps/unix/sysv/linux/sched_setaffinity.c
index c12c808b78..0e2d5b55e8 100644
--- a/sysdeps/unix/sysv/linux/sched_setaffinity.c
+++ b/sysdeps/unix/sysv/linux/sched_setaffinity.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 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
@@ -20,18 +20,65 @@
 #include <sched.h>
 #include <string.h>
 #include <sysdep.h>
+#include <unistd.h>
 #include <sys/types.h>
+#include <shlib-compat.h>
 
 
 #ifdef __NR_sched_setaffinity
+static size_t __kernel_cpumask_size;
+
+
+int
+__sched_setaffinity_new (pid_t pid, size_t cpusetsize, const cpu_set_t *cpuset)
+{
+  if (__builtin_expect (__kernel_cpumask_size == 0, 0))
+    {
+      INTERNAL_SYSCALL_DECL (err);
+      int res;
+
+      size_t psize = 128;
+      void *p = alloca (psize);
+
+      while (res = INTERNAL_SYSCALL (sched_getaffinity, err, 3, getpid (),
+				     psize, p),
+	     INTERNAL_SYSCALL_ERROR_P (res, err)
+	     && INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL)
+	p = extend_alloca (p, psize, 2 * psize);
+
+      if (res == 0 || INTERNAL_SYSCALL_ERROR_P (res, err))
+	{
+	  __set_errno (INTERNAL_SYSCALL_ERRNO (res, err));
+	  return -1;
+	}
+
+      __kernel_cpumask_size = res;
+    }
+
+  /* We now know the size of the kernel cpumask_t.  Make sure the user
+     does not request to set a bit beyond that.  */
+  for (size_t cnt = __kernel_cpumask_size; cnt < cpusetsize; ++cnt)
+    if (((char *) cpuset)[cnt] != '\0')
+      /* Found a nonzero byte.  This means the user request cannot be
+	 fulfilled.  */
+      return EINVAL;
+
+  return INLINE_SYSCALL (sched_setaffinity, 3, pid, cpusetsize, cpuset);
+}
+versioned_symbol (libc, __sched_setaffinity_new, sched_setaffinity,
+		  GLIBC_2_3_4);
+
+
+# if SHLIB_COMPAT(libc, 2_3_3, 2_3_4)
 int
-sched_setaffinity (pid, cpuset)
-     pid_t pid;
-     const cpu_set_t *cpuset;
+attribute_compat_text_section
+__sched_setaffinity_old (const pthread_attr_t *attr, const cpu_set_t *cpuset)
 {
-  return INLINE_SYSCALL (sched_setaffinity, 3, pid, sizeof (cpu_set_t),
-			 cpuset);
+  /* The old interface by default assumed a 1024 processor bitmap.  */
+  return __sched_setaffinity_new (attr, 128, cpuset);
 }
+compat_symbol (libc, __sched_setaffinity_old, sched_setaffinity, GLIBC_2_3_3);
+# endif
 #else
 # include <sysdeps/generic/sched_setaffinity.c>
 #endif