diff options
author | Roland McGrath <roland@gnu.org> | 2003-03-17 11:25:18 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2003-03-17 11:25:18 +0000 |
commit | de4471dd559ab27a8927135fb5a475eaa613c437 (patch) | |
tree | e73d0843dd5e4445a09e9e0e55b9c1ce5887b058 /nptl/sysdeps | |
parent | f3c13160fe2f53dd4971fe9772c9c23300a287be (diff) | |
download | glibc-de4471dd559ab27a8927135fb5a475eaa613c437.zip glibc-de4471dd559ab27a8927135fb5a475eaa613c437.tar.gz glibc-de4471dd559ab27a8927135fb5a475eaa613c437.tar.bz2 |
PowerPC port contributed by Paul Mackerras <paulus@samba.org>.
* sysdeps/pthread/pthread_spin_init.c: New file.
* sysdeps/pthread/pthread_spin_unlock.c: New file.
* sysdeps/powerpc/Makefile: New file.
* sysdeps/powerpc/pthread_spin_lock.c: New file.
* sysdeps/powerpc/pthread_spin_trylock.c: New file.
* sysdeps/powerpc/pthreaddef.h: New file.
* sysdeps/powerpc/tcb-offsets.sym: New file.
* sysdeps/powerpc/td_ta_map_lwp2thr.c: New file.
* sysdeps/powerpc/tls.h: New file.
* sysdeps/powerpc/bits/atomic.h: New file.
* sysdeps/unix/sysv/linux/libc-lowlevelmutex.c: New file.
* sysdeps/unix/sysv/linux/libc-lowlevellock.c: New file.
* sysdeps/unix/sysv/linux/lowlevellock.c: New file.
* sysdeps/unix/sysv/linux/lowlevelmutex.c: New file.
* sysdeps/unix/sysv/linux/sem_post.c: New file.
* sysdeps/unix/sysv/linux/sem_timedwait.c: New file.
* sysdeps/unix/sysv/linux/sem_trywait.c: New file.
* sysdeps/unix/sysv/linux/sem_wait.c: New file.
* sysdeps/unix/sysv/linux/powerpc/Makefile: New file.
* sysdeps/unix/sysv/linux/powerpc/createthread.c: New file.
* sysdeps/unix/sysv/linux/powerpc/fork.c: New file.
* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: New file.
* sysdeps/unix/sysv/linux/powerpc/pt-vfork.S: New file.
* sysdeps/unix/sysv/linux/powerpc/pthread_once.c: New file.
* sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: New file.
* sysdeps/unix/sysv/linux/powerpc/bits/semaphore.h: New file.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: New file.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: New file.
* sysdeps/unix/sysv/linux/ia64/lowlevellock.c: Use __gettimeofday,
not gettimeofday.
* sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c: Likewise.
* sysdeps/unix/sysv/linux/ia64/sem_timedwait.c: Likewise.
* sysdeps/unix/sysv/linux/s390/lowlevellock.c: Likewise.
* sysdeps/unix/sysv/linux/s390/lowlevelmutex.c: Likewise.
* sysdeps/unix/sysv/linux/s390/sem_timedwait.c: Likewise.
Diffstat (limited to 'nptl/sysdeps')
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.c | 4 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c | 2 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c | 2 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/lowlevelmutex.c | 1 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.c | 2 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/lowlevelmutex.c | 2 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c | 2 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sem_wait.c | 58 |
8 files changed, 66 insertions, 7 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.c b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.c index 651fb88..1a1a2e1 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.c +++ b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.c @@ -29,7 +29,7 @@ lll_unlock_wake_cb (futex) { int oldval; int val = *futex; - + do oldval = val; while ((val = lll_compare_and_swap (futex, oldval, 0)) != oldval); @@ -55,7 +55,7 @@ ___lll_timedwait_tid (ptid, abstime) { /* Get current time. */ struct timeval tv; - gettimeofday (&tv, NULL); + __gettimeofday (&tv, NULL); /* Determine relative timeout. */ struct timespec rt; diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c index 7ab67ca..bf6f5f3 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c +++ b/nptl/sysdeps/unix/sysv/linux/ia64/lowlevelmutex.c @@ -62,7 +62,7 @@ ___lll_mutex_timedlock (futex, abstime, newval) { /* Get the current time. */ struct timeval tv; - gettimeofday (&tv, NULL); + __gettimeofday (&tv, NULL); /* Compute relative timeout. */ struct timespec rt; diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c index b271217..881e6e2 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c +++ b/nptl/sysdeps/unix/sysv/linux/ia64/sem_timedwait.c @@ -47,7 +47,7 @@ sem_timedwait (sem, abstime) /* Get the current time. */ struct timeval tv; - (void) gettimeofday(&tv, NULL); + (void) __gettimeofday(&tv, NULL); /* Compute the relative timeout. */ struct timespec rt; diff --git a/nptl/sysdeps/unix/sysv/linux/lowlevelmutex.c b/nptl/sysdeps/unix/sysv/linux/lowlevelmutex.c new file mode 100644 index 0000000..7c594e3 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/lowlevelmutex.c @@ -0,0 +1 @@ +/* Nothing needed here in fact. */ diff --git a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.c b/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.c index f98e163..60c39d0 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.c @@ -72,7 +72,7 @@ ___lll_timedwait_tid (ptid, abstime) { /* Get current time. */ struct timeval tv; - gettimeofday (&tv, NULL); + __gettimeofday (&tv, NULL); /* Determine relative timeout. */ struct timespec rt; diff --git a/nptl/sysdeps/unix/sysv/linux/s390/lowlevelmutex.c b/nptl/sysdeps/unix/sysv/linux/s390/lowlevelmutex.c index 3f1889b..d4d91db 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/lowlevelmutex.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/lowlevelmutex.c @@ -56,7 +56,7 @@ ___lll_mutex_timedlock (futex, abstime, newval) { /* Get the current time. */ struct timeval tv; - gettimeofday (&tv, NULL); + __gettimeofday (&tv, NULL); /* Compute relative timeout. */ struct timespec rt; diff --git a/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c b/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c index d2ef2ce..42433de 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c +++ b/nptl/sysdeps/unix/sysv/linux/s390/sem_timedwait.c @@ -51,7 +51,7 @@ sem_timedwait (sem, abstime) /* Get the current time. */ struct timeval tv; - (void) gettimeofday (&tv, NULL); + (void) __gettimeofday (&tv, NULL); /* Compute the relative timeout. */ struct timespec rt; diff --git a/nptl/sysdeps/unix/sysv/linux/sem_wait.c b/nptl/sysdeps/unix/sysv/linux/sem_wait.c new file mode 100644 index 0000000..0e50067 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/sem_wait.c @@ -0,0 +1,58 @@ +/* sem_wait -- wait on a semaphore. Generic futex-using version. + Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Paul Mackerras <paulus@au.ibm.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 <sysdep.h> +#include <lowlevellock.h> +#include <internaltypes.h> +#include <semaphore.h> + +#include <shlib-compat.h> + + +int +__new_sem_wait (sem_t *sem) +{ + int *futex = (int *) sem; + int val; + int err; + + do + { + if (*futex > 0) + { + val = __lll_dec_if_positive (futex); + if (val > 0) + return 0; + } + + err = lll_futex_wait (futex, 0); + } + while (err == 0 || err == -EWOULDBLOCK); + + __set_errno (-err); + return -1; +} + +versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1); +#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1) +strong_alias (__new_sem_wait, __old_sem_wait) +compat_symbol (libpthread, __old_sem_wait, sem_wait, GLIBC_2_0); +#endif |