From 949ec7640747878988b3f8019a7b7f98c10ab3ac Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 10 May 2003 05:36:37 +0000 Subject: Update. * posix/sched.h: Change prototypes of sched_getaffinity and sched_setaffinity. Define CPU_SET, CPU_CLR, CPU_ISSET, and CPU_ZERO. * sysdeps/generic/sched_getaffinity.c: Adjust definition. * sysdeps/generic/sched_setaffinity.c: Likewise. * sysdeps/generic/bits/sched.h: Define __CPU_SETSIZE, __NCPUBITS, __CPUELT, __CPUMASK, cpu_set_t, __cpu_mask, __CPU_ZERO, __CPU_SET, __CPU_CLR, and __CPU_ISSET. * sysdeps/unix/sysv/linux/bits/sched.h: Likewise. * sysdeps/unix/sysv/linux/sched_getaffinity.c: New file. * sysdeps/unix/sysv/linux/sched_setaffinity.c: New file. * include/atomic.h (atomic_exchange_acq): Renamed from atomic_exchange. (atomic_exchange_rel): New #define. * sysdeps/ia64/bits/atomic.h: Likewise. * sysdeps/i386/i486/bits/atomic.h (atomic_exchange_acq): Renamed from atomic_exchange. * sysdeps/m68k/m68020/bits/atomic.h: Likewise. * sysdeps/powerpc/bits/atomic.h: Likewise. * sysdeps/sparc/sparc32/sparcv9/bits/atomic.h: Likewise. * sysdeps/sparc/sparc64/bits/atomic.h: Likewise. * sysdeps/x86_64/bits/atomic.h: Likewise. * csu/tst-atomic.c: Use atomic_exchange_acq instead of atomic_exchange. --- nptl/sysdeps/pthread/pthread.h | 10 ++++ nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 60 +++++++++++----------- nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h | 2 +- nptl/sysdeps/unix/sysv/linux/lowlevellock.c | 2 +- nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c | 43 ++++++++++++++++ nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c | 38 ++++++++++++++ 6 files changed, 123 insertions(+), 32 deletions(-) create mode 100644 nptl/sysdeps/unix/sysv/linux/pthread_getaffinity.c create mode 100644 nptl/sysdeps/unix/sysv/linux/pthread_setaffinity.c (limited to 'nptl/sysdeps') diff --git a/nptl/sysdeps/pthread/pthread.h b/nptl/sysdeps/pthread/pthread.h index d06dd8f45a..c0375ae223 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 2318edfcdb..5fd50b97db 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 24cbfe8cc3..92c0b5c524 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 a5cf687612..db10573a45 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 0000000000..70553d7e5f --- /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 , 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 +#include +#include +#include +#include + + +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 0000000000..7680068155 --- /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 , 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 +#include +#include +#include + + +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); +} -- cgit v1.2.3