* sysdeps/unix/sysv/linux/sched_setaffinity.c

	(__sched_setaffinity_new): If syscall was successful and
	RESET_VGETCPU_CACHE is defined, use it before returning.
	* sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c: New file.

diff --git a/ChangeLog b/ChangeLog
index 3e8edaaa83dba3b6319c3ff42ddbe35f5bba678c..68b1af1d65c218c9b01caf043470f561d618278b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-05-10  Ulrich Drepper  <drepper@redhat.com>
 
+       * sysdeps/unix/sysv/linux/sched_setaffinity.c
+       (__sched_setaffinity_new): If syscall was successful and
+       RESET_VGETCPU_CACHE is defined, use it before returning.
+       * sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c: New file.
+
        * io/sys/stat.h: Make sure struct timespec is defined for
        __USE_ATFILE.
 

diff --git a/io/sys/stat.h b/io/sys/stat.h
index e90eafd3ac450f60c1bebaba0e388f490590a6e9..15ae35b199fcb3bff7d027bb6b6c0e004c65c191 100644 (file)
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -29,7 +29,7 @@
 #include <bits/types.h>                /* For __mode_t and __dev_t.  */
 
 #if defined __USE_XOPEN || defined __USE_XOPEN2K || defined __USE_MISC \
-         || __USE_ATFILE
+         || defined __USE_ATFILE
 # if defined __USE_XOPEN || defined __USE_XOPEN2K
 #  define __need_time_t
 # endif

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index deeb6f1632b3ac928461580091075d5f1d7dd2fe..24511664b790f59a04ea9f309e764a7c9f36b1c4 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-10  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/pthread_setaffinity.c
+       (__pthread_setaffinity_new): If syscall was successful and
+       RESET_VGETCPU_CACHE is defined, use it before returning.
+       * sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c: New file.
+
 2007-05-10  Jakub Jelinek  <jakub@redhat.com>
 
        [BZ #4455]

diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c b/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c
index 3776e26e4b5db1f116171d7acdff598f3bdf3847..fa0f46feecb44d08bd0eb83112ce3bf43743c4e2 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c
+++ b/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -79,6 +79,12 @@ __pthread_setaffinity_new (pthread_t th, size_t cpusetsize,
 
   res = INTERNAL_SYSCALL (sched_setaffinity, err, 3, pd->tid, cpusetsize,
                          cpuset);
+
+#ifdef RESET_VGETCPU_CACHE
+  if (!INTERNAL_SYSCALL_ERROR_P (res, err))
+    RESET_VGETCPU_CACHE ();
+#endif
+
   return (INTERNAL_SYSCALL_ERROR_P (res, err)
          ? INTERNAL_SYSCALL_ERRNO (res, err)
          : 0);

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c
new file mode 100644 (file)
index 0000000..640d304
--- /dev/null
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_setaffinity.c
@@ -0,0 +1,14 @@
+#include <tls.h>
+
+#define RESET_VGETCPU_CACHE() \
+  do {                       \
+    asm volatile ("movl %0, %%fs:%P1\n\t"                                    \
+                 "movl %0, %%fs:%P2"                                         \
+                 :                                                           \
+                 : "ir" (0), "i" (offsetof (struct pthread,                  \
+                                            header.vgetcpu_cache[0])),       \
+                   "i" (offsetof (struct pthread,                            \
+                                  header.vgetcpu_cache[1])));          \
+  } while (0)
+
+#include "../pthread_setaffinity.c"

diff --git a/sysdeps/unix/sysv/linux/sched_setaffinity.c b/sysdeps/unix/sysv/linux/sched_setaffinity.c
index ccd3c8f514308cb691f3917566982e89b3266d98..77cde476921b8b41e7bbe13ff4414361e492168e 100644 (file)
--- a/sysdeps/unix/sysv/linux/sched_setaffinity.c
+++ b/sysdeps/unix/sysv/linux/sched_setaffinity.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005, 2007
+   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
@@ -67,7 +68,14 @@ __sched_setaffinity_new (pid_t pid, size_t cpusetsize, const cpu_set_t *cpuset)
        return -1;
       }
 
-  return INLINE_SYSCALL (sched_setaffinity, 3, pid, cpusetsize, cpuset);
+  int result = INLINE_SYSCALL (sched_setaffinity, 3, pid, cpusetsize, cpuset);
+
+#ifdef RESET_VGETCPU_CACHE
+  if (result != -1)
+    RESET_VGETCPU_CACHE ();
+#endif
+
+  return result;
 }
 versioned_symbol (libc, __sched_setaffinity_new, sched_setaffinity,
                  GLIBC_2_3_4);

diff --git a/sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c b/sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c
new file mode 100644 (file)
index 0000000..d1101c5
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86_64/sched_setaffinity.c
@@ -0,0 +1,14 @@
+#include <tls.h>
+
+#define RESET_VGETCPU_CACHE() \
+  do {                       \
+    asm volatile ("movl %0, %%fs:%P1\n\t"                                    \
+                 "movl %0, %%fs:%P2"                                         \
+                 :                                                           \
+                 : "ir" (0), "i" (offsetof (struct pthread,                  \
+                                            header.vgetcpu_cache[0])),       \
+                   "i" (offsetof (struct pthread,                            \
+                                  header.vgetcpu_cache[1])));          \
+  } while (0)
+
+#include "../sched_setaffinity.c"