diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 21 | ||||
| -rw-r--r-- | nptl/Makefile | 5 | ||||
| -rw-r--r-- | nptl/Versions | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread.h | 10 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 60 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/lowlevellock.c | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c | 43 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c | 38 | ||||
| -rw-r--r-- | nptl/tst-sem6.c | 81 |
10 files changed, 231 insertions, 34 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index f46c221..e01a48c 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,26 @@ 2003-05-09 Ulrich Drepper <drepper@redhat.com> + * tst-sem6.c: New file. + * Makefile (tests): Add tst-sem6. + + * sysdeps/unix/sysv/linux/ia64/lowlevellock.h (___lll_mutex_unlock): + Use atomic_exchange_rel instead of atomic_exchange. + * sysdeps/unix/sysv/linux/lowlevellock.c (lll_unlock_wake_cb): + Likewise. + + * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Improve quality of + code for lll_futex_wait and lll_futex_wake in static apps. Use + vsyscall is possible. + + * sysdeps/unix/sysv/linux/pthread_getaffinity.c: New file. + * sysdeps/unix/sysv/linux/pthread_setaffinity.c: New file. + * sysdeps/pthread/pthread.h: Declare pthread_getaffinity_np and + pthread_setaffinity_np. + * Versions [libpthread] (GLIBC_2.3.3): Add pthread_getaffinity_np + and pthread_setaffinity_np. + * Makefile (libpthread-routines): Add pthread_getaffinity and + pthread_setaffinity. + * allocatestack.c (allocate_stack): If ARCH_RETRY_MMAP is defined, use it in case mmap to allocate the stack fails. * sysdeps/unix/sysv/linux/x86_64/Makefile: Don't define diff --git a/nptl/Makefile b/nptl/Makefile index a0bd364..4260c70 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -115,7 +115,8 @@ libpthread-routines = init events version \ flockfile ftrylockfile funlockfile \ sigaction \ herrno res pt-allocrtsig \ - pthread_kill_other_threads + pthread_kill_other_threads \ + pthread_getaffinity pthread_setaffinity libpthread-shared-only-routines = version pt-allocrtsig libpthread-static-only-routines = pthread_atfork @@ -148,7 +149,7 @@ tests = tst-attr1 tst-attr2 \ tst-rwlock11 \ tst-once1 tst-once2 tst-once3 tst-once4 \ tst-key1 tst-key2 tst-key3 tst-key4 \ - tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 \ + tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 \ tst-barrier1 tst-barrier2 tst-barrier3 \ tst-align \ tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \ diff --git a/nptl/Versions b/nptl/Versions index 4f52eb6..c602d5e 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -216,6 +216,9 @@ libpthread { __pthread_register_cancel; __pthread_unregister_cancel; __pthread_register_cancel_defer; __pthread_unregister_cancel_restore; __pthread_unwind_next; + + # New affinity interfaces. + pthread_getaffinity_np; pthread_setaffinity_np; } GLIBC_PRIVATE { diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index d06dd8f..c0375ae 100644 --- a/nptl/sysdeps/pthread/pthread.h +++ b/nptl/sysdeps/pthread/pthread.h @@ -355,6 +355,16 @@ extern int pthread_setconcurrency (int __level) __THROW; might be differently implemented in the case of a m-on-n thread implementation. */ extern int pthread_yield (void) __THROW; + + +/* Limit specified thread TH to run only on the processors represented + in CPUSET. */ +extern int pthread_setaffinity_np (pthread_t __th, const cpu_set_t *__cpuset) + __THROW; + +/* Get bit set in CPUSET representing the processors TH can run on. */ +extern int pthread_getaffinity_np (pthread_t __th, cpu_set_t *__cpuset) + __THROW; #endif diff --git a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h index 2318edf..5fd50b9 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -41,17 +41,34 @@ #define LLL_MUTEX_LOCK_INITIALIZER (0) -#define LLL_ENTER_KERNEL "int $0x80\n\t" +#ifdef PIC +# define LLL_EBX_LOAD "xchgl %2, %%ebx\n" +# define LLL_EBX_REG "D" +#else +# define LLL_EBX_LOAD +# define LLL_EBX_REG "b" +#endif + +#ifdef I386_USE_SYSENTER +# ifdef SHARED +# define LLL_ENTER_KERNEL "call *%%gs:%P6\n\t" +# else +# define LLL_ENTER_KERNEL "call *_dl_sysinfo\n\t" +# endif +#else +# define LLL_ENTER_KERNEL "int $0x80\n\t" +#endif + #define lll_futex_wait(futex, val) \ do { \ int __ignore; \ register __typeof (val) _val asm ("edx") = (val); \ - __asm __volatile ("xchgl %2, %%ebx\n\t" \ + __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ - "xchgl %2, %%ebx" \ + LLL_EBX_LOAD \ : "=a" (__ignore) \ - : "0" (SYS_futex), "D" (&futex), "S" (0), \ + : "0" (SYS_futex), LLL_EBX_REG (&futex), "S" (0), \ "c" (FUTEX_WAIT), "d" (_val), \ "i" (offsetof (tcbhead_t, sysinfo))); \ } while (0) @@ -61,12 +78,13 @@ do { \ int __ignore; \ register __typeof (nr) _nr asm ("edx") = (nr); \ - __asm __volatile ("xchgl %2, %%ebx\n\t" \ + __asm __volatile (LLL_EBX_LOAD \ LLL_ENTER_KERNEL \ - "xchgl %2, %%ebx" \ + LLL_EBX_LOAD \ : "=a" (__ignore) \ - : "0" (SYS_futex), "D" (&futex), "c" (FUTEX_WAKE), \ - "d" (_nr), "i" (0), \ + : "0" (SYS_futex), LLL_EBX_REG (&futex), \ + "c" (FUTEX_WAKE), "d" (_nr), \ + "i" (0) /* phony, to align next arg's number */, \ "i" (offsetof (tcbhead_t, sysinfo))); \ } while (0) @@ -277,37 +295,19 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden; afterwards. The macro parameter must not have any side effect. */ -#ifdef PIC -# define LLL_TID_EBX_LOAD "xchgl %2, %%ebx\n" -# define LLL_TID_EBX_REG "D" -#else -# define LLL_TID_EBX_LOAD -# define LLL_TID_EBX_REG "b" -#endif - -#ifdef I386_USE_SYSENTER -# ifdef SHARED -# define LLL_TID_ENTER_KERNEL "call *%%gs:%P6\n\t" -# else -# define LLL_TID_ENTER_KERNEL "call *_dl_sysinfo\n\t" -# endif -#else -# define LLL_TID_ENTER_KERNEL "int $0x80\n\t" -#endif - #define lll_wait_tid(tid) \ do { \ int __ignore; \ register __typeof (tid) _tid asm ("edx") = (tid); \ if (_tid != 0) \ - __asm __volatile (LLL_TID_EBX_LOAD \ + __asm __volatile (LLL_EBX_LOAD \ "1:\tmovl %1, %%eax\n\t" \ - LLL_TID_ENTER_KERNEL \ + LLL_ENTER_KERNEL \ "cmpl $0, (%%ebx)\n\t" \ "jne,pn 1b\n\t" \ - LLL_TID_EBX_LOAD \ + LLL_EBX_LOAD \ : "=&a" (__ignore) \ - : "i" (SYS_futex), LLL_TID_EBX_REG (&tid), "S" (0), \ + : "i" (SYS_futex), LLL_EBX_REG (&tid), "S" (0), \ "c" (FUTEX_WAIT), "d" (_tid), \ "i" (offsetof (tcbhead_t, sysinfo))); \ } while (0) diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h index 24cbfe8..92c0b5c 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h @@ -135,7 +135,7 @@ static inline void __attribute__ ((always_inline)) __lll_mutex_unlock (int *futex) { - int val = atomic_exchange (futex, 0); + int val = atomic_exchange_rel (futex, 0); if (__builtin_expect (val > 1, 0)) lll_futex_wake (futex, 1); diff --git a/nptl/sysdeps/unix/sysv/linux/lowlevellock.c b/nptl/sysdeps/unix/sysv/linux/lowlevellock.c index a5cf687..db10573 100644 --- a/nptl/sysdeps/unix/sysv/linux/lowlevellock.c +++ b/nptl/sysdeps/unix/sysv/linux/lowlevellock.c @@ -83,7 +83,7 @@ hidden_proto (__lll_timedlock_wait) int lll_unlock_wake_cb (int *futex) { - int val = atomic_exchange (futex, 0); + int val = atomic_exchange_rel (futex, 0); if (__builtin_expect (val > 1, 0)) lll_futex_wake (futex, 1); diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c b/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c new file mode 100644 index 0000000..70553d7 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c @@ -0,0 +1,43 @@ +/* Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. + + 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 <pthreadP.h> +#include <string.h> +#include <sysdep.h> +#include <sys/types.h> + + +int +pthread_getaffinity_np (th, cpuset) + pthread_t th; + cpu_set_t *cpuset; +{ + struct pthread *pd = (struct pthread *) th; + INTERNAL_SYSCALL_DECL (err); + int res = INTERNAL_SYSCALL (sched_getaffinity, err, 3, pd->tid, + sizeof (cpu_set_t), cpuset); + if (INTERNAL_SYSCALL_ERROR_P (res, err)) + return INTERNAL_SYSCALL_ERRNO (res, err); + + /* Clean the rest of the memory the kernel didn't do. */ + memset ((char *) cpuset + res, '\0', sizeof (cpu_set_t) - res); + + return 0; +} diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c b/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c new file mode 100644 index 0000000..7680068 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c @@ -0,0 +1,38 @@ +/* Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. + + 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 <pthreadP.h> +#include <sysdep.h> +#include <sys/types.h> + + +int +pthread_setaffinity_np (th, cpuset) + pthread_t th; + const cpu_set_t *cpuset; +{ + struct pthread *pd = (struct pthread *) th; + INTERNAL_SYSCALL_DECL (err); + int res = INTERNAL_SYSCALL (sched_setaffinity, err, 3, pd->tid, + sizeof (cpu_set_t), cpuset); + return (INTERNAL_SYSCALL_ERROR_P (res, err) + ? INTERNAL_SYSCALL_ERRNO (res, err) + : 0); +} diff --git a/nptl/tst-sem6.c b/nptl/tst-sem6.c new file mode 100644 index 0000000..49240d9 --- /dev/null +++ b/nptl/tst-sem6.c @@ -0,0 +1,81 @@ +/* Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2003. + + 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 <semaphore.h> +#include <signal.h> +#include <stdio.h> +#include <unistd.h> + + +static void +handler (int sig) +{ + struct sigaction sa; + + sa.sa_handler = SIG_DFL; + sa.sa_flags = 0; + sigemptyset (&sa.sa_mask); + + sigaction (SIGALRM, &sa, NULL); + + /* Rearm the timer. */ + alarm (1); +} + + +static int +do_test (void) +{ + sem_t s; + struct sigaction sa; + + sa.sa_handler = handler; + sa.sa_flags = 0; + sigemptyset (&sa.sa_mask); + + sigaction (SIGALRM, &sa, NULL); + + if (sem_init (&s, 0, 0) == -1) + { + puts ("init failed"); + return 1; + } + + /* Set an alarm for 1 second. The wrapper will expect this. */ + alarm (1); + + int res = sem_wait (&s); + if (res == 0) + { + puts ("wait succeeded"); + return 1; + } + if (res != -1 || errno != EINTR) + { + puts ("wait didn't fail with EINTR"); + return 1; + } + + return 0; +} + +#define TIMEOUT 3 +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |