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. --- sysdeps/generic/bits/sched.h | 35 +++++++++++++++++++++- sysdeps/generic/sched_getaffinity.c | 7 ++--- sysdeps/generic/sched_setaffinity.c | 5 ++-- sysdeps/i386/i486/bits/atomic.h | 2 +- sysdeps/ia64/bits/atomic.h | 17 ++++------- sysdeps/m68k/m68020/bits/atomic.h | 2 +- sysdeps/powerpc/bits/atomic.h | 17 +++++------ sysdeps/sparc/sparc32/sparcv9/bits/atomic.h | 2 +- sysdeps/sparc/sparc64/bits/atomic.h | 2 +- sysdeps/unix/sysv/linux/bits/sched.h | 35 +++++++++++++++++++++- sysdeps/unix/sysv/linux/sched_getaffinity.c | 45 +++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/sched_setaffinity.c | 37 ++++++++++++++++++++++++ sysdeps/x86_64/bits/atomic.h | 2 +- 13 files changed, 174 insertions(+), 34 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/sched_getaffinity.c create mode 100644 sysdeps/unix/sysv/linux/sched_setaffinity.c (limited to 'sysdeps') diff --git a/sysdeps/generic/bits/sched.h b/sysdeps/generic/bits/sched.h index d0d655d..fc754bf 100644 --- a/sysdeps/generic/bits/sched.h +++ b/sysdeps/generic/bits/sched.h @@ -1,6 +1,6 @@ /* Definitions of constants and data structure for POSIX 1003.1b-1993 scheduling interface. - Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2001, 2003 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 @@ -33,3 +33,36 @@ struct sched_param { int __sched_priority; }; + + +/* Size definition for CPU sets. */ +#define __CPU_SETSIZE 1024 +#define __NCPUBITS (8 * sizeof (__cpu_mask)) + +/* Type for array elements in 'cpu_set'. */ +typedef unsigned long int __cpu_mask; + +/* Basic access functions. */ +#define __CPUELT(cpu) ((cpu) / __NCPUBITS) +#define __CPUMASK(cpu) ((__cpu_mask) 1 << ((cpu) % __NCPUBITS)) + +/* Data structure to describe CPU mask. */ +typedef struct +{ + __cpu_mask __bits[__CPU_SETSIZE / __NCPUBITS]; +} cpu_set_t; + +/* Access functions for CPU masks. */ +#define __CPU_ZERO(cpusetp) \ + do { \ + unsigned int __i; \ + cpu_set *__arr = (cpusetp); \ + for (__i = 0; __i < sizeof (cpu_set) / sizeof (__cpu_mask); ++__i) \ + __arr->__bits[__i] = 0; \ + } while (0) +#define __CPU_SET(cpu, cpusetp) \ + ((cpusetp)->__bits[__CPUELT (cpu)] |= __CPUMASK (cpu)) +#define __CPU_CLR(cpu, cpusetp) \ + ((cpusetp)->__bits[__CPUELT (cpu)] &= ~__CPUMASK (cpu)) +#define __CPU_ISSET(cpu, cpusetp) \ + (((cpusetp)->__bits[__CPUELT (cpu)] & __CPUMASK (cpu)) != 0) diff --git a/sysdeps/generic/sched_getaffinity.c b/sysdeps/generic/sched_getaffinity.c index 5c444cb..b9b7207 100644 --- a/sysdeps/generic/sched_getaffinity.c +++ b/sysdeps/generic/sched_getaffinity.c @@ -17,16 +17,15 @@ 02111-1307 USA. */ #include -#include #include +#include /* Retrieve the CPU affinity mask for a particular process. */ int -sched_getaffinity (pid, len, mask) +sched_getaffinity (pid, cpuset) pid_t pid; - unsigned int len; - unsigned long int *mask; + cpu_set_t *cpuset; { __set_errno (ENOSYS); return -1; diff --git a/sysdeps/generic/sched_setaffinity.c b/sysdeps/generic/sched_setaffinity.c index e734e70..4f85c54 100644 --- a/sysdeps/generic/sched_setaffinity.c +++ b/sysdeps/generic/sched_setaffinity.c @@ -23,10 +23,9 @@ /* Retrieve the CPU affinity mask for a particular process. */ int -sched_setaffinity (pid, len, mask) +sched_setaffinity (pid, mask) pid_t pid; - unsigned int len; - unsigned long int *mask; + const cpu_set_t *cpuset; { __set_errno (ENOSYS); return -1; diff --git a/sysdeps/i386/i486/bits/atomic.h b/sysdeps/i386/i486/bits/atomic.h index aff8cd9..cb2fcdb 100644 --- a/sysdeps/i386/i486/bits/atomic.h +++ b/sysdeps/i386/i486/bits/atomic.h @@ -117,7 +117,7 @@ typedef uintmax_t uatomic_max_t; /* Note that we need no lock prefix. */ -#define atomic_exchange(mem, newvalue) \ +#define atomic_exchange_acq(mem, newvalue) \ ({ __typeof (*mem) result; \ if (sizeof (*mem) == 1) \ __asm __volatile ("xchgb %b0, %1" \ diff --git a/sysdeps/ia64/bits/atomic.h b/sysdeps/ia64/bits/atomic.h index ccbd4f8..2734667 100644 --- a/sysdeps/ia64/bits/atomic.h +++ b/sysdeps/ia64/bits/atomic.h @@ -74,17 +74,12 @@ typedef uintmax_t uatomic_max_t; (long) (newval)) /* Atomically store newval and return the old value. */ -#define atomic_exchange(mem, value) \ - ({ __typeof (*mem) __result; \ - if (sizeof (*mem) == 4) \ - __result = __sync_lock_test_and_set_si ((int *) (mem), (int) (value)); \ - else if (sizeof (*mem) == 8) \ - __result = __sync_lock_test_and_set_di ((long *) (mem), \ - (long) (value)); \ - else \ - abort (); \ - __result; }) - +#define atomic_exchange_acq(mem, value) \ + __sync_lock_test_and_set (mem, value) + +#define atomic_exchange_rel(mem, value) \ + (__sync_synchronize (), __sync_lock_test_and_set (mem, value)) + #define atomic_exchange_and_add(mem, value) \ ({ __typeof (*mem) __result; \ diff --git a/sysdeps/m68k/m68020/bits/atomic.h b/sysdeps/m68k/m68020/bits/atomic.h index 6978b27..bbffc52 100644 --- a/sysdeps/m68k/m68020/bits/atomic.h +++ b/sysdeps/m68k/m68020/bits/atomic.h @@ -76,7 +76,7 @@ typedef uintmax_t uatomic_max_t; : "memory"); \ __ret; }) -#define atomic_exchange(mem, newvalue) \ +#define atomic_exchange_acq(mem, newvalue) \ ({ __typeof (*(mem)) __result = *(mem); \ if (sizeof (*(mem)) == 1) \ __asm __volatile ("1: cas%.b %0,%2,%1;" \ diff --git a/sysdeps/powerpc/bits/atomic.h b/sysdeps/powerpc/bits/atomic.h index c33ae56..ebac76a 100644 --- a/sysdeps/powerpc/bits/atomic.h +++ b/sysdeps/powerpc/bits/atomic.h @@ -19,11 +19,11 @@ 02111-1307 USA. */ /* - * Never include sysdeps/powerpc/bits/atomic.h directly. - * Alway use include/atomic.h which will include either - * sysdeps/powerpc/powerpc32/bits/atomic.h - * or - * sysdeps/powerpc/powerpc64/bits/atomic.h + * Never include sysdeps/powerpc/bits/atomic.h directly. + * Alway use include/atomic.h which will include either + * sysdeps/powerpc/powerpc32/bits/atomic.h + * or + * sysdeps/powerpc/powerpc64/bits/atomic.h * as appropriate and which in turn include this file. */ @@ -44,8 +44,8 @@ typedef uintptr_t uatomicptr_t; typedef intmax_t atomic_max_t; typedef uintmax_t uatomic_max_t; -/* - * Powerpc does not have byte and halfword forms of load and reserve and +/* + * Powerpc does not have byte and halfword forms of load and reserve and * store conditional. So for powerpc we stub out the 8- and 16-bit forms. */ #define __arch_compare_and_exchange_bool_8_acq(mem, newval, oldval) \ @@ -141,7 +141,7 @@ typedef uintmax_t uatomic_max_t; __result; \ }) -#define atomic_exchange(mem, value) \ +#define atomic_exchange_acq(mem, value) \ ({ \ __typeof (*(mem)) __result; \ if (sizeof (*mem) == 4) \ @@ -177,4 +177,3 @@ typedef uintmax_t uatomic_max_t; abort (); \ __result; \ }) - diff --git a/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h b/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h index bb4e2db..6d316f3 100644 --- a/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h +++ b/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h @@ -66,7 +66,7 @@ typedef uintmax_t uatomic_max_t; #define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \ (abort (), (__typeof (*mem)) 0) -#define atomic_exchange(mem, newvalue) \ +#define atomic_exchange_acq(mem, newvalue) \ ({ __typeof (*(mem)) __oldval; \ __typeof (mem) __memp = (mem); \ __typeof (*(mem)) __value = (newvalue); \ diff --git a/sysdeps/sparc/sparc64/bits/atomic.h b/sysdeps/sparc/sparc64/bits/atomic.h index 4df3b25..8f97753 100644 --- a/sysdeps/sparc/sparc64/bits/atomic.h +++ b/sysdeps/sparc/sparc64/bits/atomic.h @@ -72,7 +72,7 @@ typedef uintmax_t uatomic_max_t; "r" (__acev_mem), "0" ((long) (newval))); \ __acev_tmp; }) -#define atomic_exchange(mem, newvalue) \ +#define atomic_exchange_acq(mem, newvalue) \ ({ __typeof (*(mem)) __oldval, __val; \ __typeof (mem) __memp = (mem); \ __typeof (*(mem)) __value = (newvalue); \ diff --git a/sysdeps/unix/sysv/linux/bits/sched.h b/sysdeps/unix/sysv/linux/bits/sched.h index 9aaf96e..63ae0e4 100644 --- a/sysdeps/unix/sysv/linux/bits/sched.h +++ b/sysdeps/unix/sysv/linux/bits/sched.h @@ -1,6 +1,6 @@ /* Definitions of constants and data structure for POSIX 1003.1b-1993 scheduling interface. - Copyright (C) 1996,1997,1998,1999,2001,2002 Free Software Foundation, Inc. + Copyright (C) 1996-1999,2001,2002,2003 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 @@ -86,3 +86,36 @@ struct __sched_param }; # undef __need_schedparam #endif + + +/* Size definition for CPU sets. */ +#define __CPU_SETSIZE 1024 +#define __NCPUBITS (8 * sizeof (__cpu_mask)) + +/* Type for array elements in 'cpu_set'. */ +typedef unsigned long int __cpu_mask; + +/* Basic access functions. */ +#define __CPUELT(cpu) ((cpu) / __NCPUBITS) +#define __CPUMASK(cpu) ((__cpu_mask) 1 << ((cpu) % __NCPUBITS)) + +/* Data structure to describe CPU mask. */ +typedef struct +{ + __cpu_mask __bits[__CPU_SETSIZE / __NCPUBITS]; +} cpu_set_t; + +/* Access functions for CPU masks. */ +#define __CPU_ZERO(cpusetp) \ + do { \ + unsigned int __i; \ + cpu_set *__arr = (cpusetp); \ + for (__i = 0; __i < sizeof (cpu_set) / sizeof (__cpu_mask); ++__i) \ + __arr->__bits[__i] = 0; \ + } while (0) +#define __CPU_SET(cpu, cpusetp) \ + ((cpusetp)->__bits[__CPUELT (cpu)] |= __CPUMASK (cpu)) +#define __CPU_CLR(cpu, cpusetp) \ + ((cpusetp)->__bits[__CPUELT (cpu)] &= ~__CPUMASK (cpu)) +#define __CPU_ISSET(cpu, cpusetp) \ + (((cpusetp)->__bits[__CPUELT (cpu)] & __CPUMASK (cpu)) != 0) diff --git a/sysdeps/unix/sysv/linux/sched_getaffinity.c b/sysdeps/unix/sysv/linux/sched_getaffinity.c new file mode 100644 index 0000000..12e6e16 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sched_getaffinity.c @@ -0,0 +1,45 @@ +/* Copyright (C) 2002, 2003 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 +#include +#include +#include +#include + + +#ifdef __NR_sched_getaffinity +int +sched_getaffinity (pid, cpuset) + pid_t pid; + 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); + + res = 0; + } + return res; +} +#else +# include +#endif diff --git a/sysdeps/unix/sysv/linux/sched_setaffinity.c b/sysdeps/unix/sysv/linux/sched_setaffinity.c new file mode 100644 index 0000000..c12c808 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sched_setaffinity.c @@ -0,0 +1,37 @@ +/* Copyright (C) 2002, 2003 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 +#include +#include +#include +#include + + +#ifdef __NR_sched_setaffinity +int +sched_setaffinity (pid, cpuset) + pid_t pid; + const cpu_set_t *cpuset; +{ + return INLINE_SYSCALL (sched_setaffinity, 3, pid, sizeof (cpu_set_t), + cpuset); +} +#else +# include +#endif diff --git a/sysdeps/x86_64/bits/atomic.h b/sysdeps/x86_64/bits/atomic.h index ece260d..f31bedb 100644 --- a/sysdeps/x86_64/bits/atomic.h +++ b/sysdeps/x86_64/bits/atomic.h @@ -86,7 +86,7 @@ typedef uintmax_t uatomic_max_t; /* Note that we need no lock prefix. */ -#define atomic_exchange(mem, newvalue) \ +#define atomic_exchange_acq(mem, newvalue) \ ({ __typeof (*mem) result; \ if (sizeof (*mem) == 1) \ __asm __volatile ("xchgb %b0, %1" \ -- cgit v1.1