diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-05-30 04:53:50 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-05-30 04:53:50 +0000 |
| commit | b8ba4a2741c2d9e1b723615228bcacedb1b941c2 (patch) | |
| tree | 110bceb6272be371fb4487157a3fe573024ba02d /nptl/sysdeps/unix/sysv/linux/powerpc | |
| parent | 65d46efed2d82da579f9dfb72b51f77fb77470d2 (diff) | |
| download | glibc-b8ba4a2741c2d9e1b723615228bcacedb1b941c2.tar.gz glibc-b8ba4a2741c2d9e1b723615228bcacedb1b941c2.tar.xz glibc-b8ba4a2741c2d9e1b723615228bcacedb1b941c2.zip | |
Update.
* sysdeps/unix/sysv/linux/s390/lowlevellock.h (__lll_mutex_unlock_force): New function (lll_mutex_unlock_force): Use __lll_mutex_unlock_force.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/powerpc')
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h | 1 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h index 9569ba5534..588f2a21b9 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h @@ -93,6 +93,7 @@ typedef union unsigned long long int __total_seq; unsigned long long int __wakeup_seq; unsigned long long int __woken_seq; + void *__mutex; } __data; char __size[__SIZEOF_PTHREAD_COND_T]; long long int __align; diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h index 621fdcee88..877483b22c 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h @@ -29,6 +29,7 @@ #define __NR_futex 221 #define FUTEX_WAIT 0 #define FUTEX_WAKE 1 +#define FUTEX_REQUEUE 3 /* Initializer for compatibility lock. */ #define LLL_MUTEX_LOCK_INITIALIZER (0) @@ -63,6 +64,17 @@ INTERNAL_SYSCALL_ERROR_P (__ret, __err)? -__ret: 0; \ }) +#define lll_futex_requeue(futexp, nr_wake, nr_move, mutex) \ + ({ \ + INTERNAL_SYSCALL_DECL (__err); \ + long int __ret; \ + \ + __ret = INTERNAL_SYSCALL (futex, __err, 5, \ + (futexp), FUTEX_REQUEUE, (nr_wake), (nr_move), \ + (mutex)); \ + INTERNAL_SYSCALL_ERROR_P (__ret, __err)? -__ret: 0; \ + }) + #ifdef UP # define __lll_acq_instr "" # define __lll_rel_instr "" @@ -100,6 +112,15 @@ extern void __lll_lock_wait (int *futex, int val) attribute_hidden; __lll_lock_wait (__futex, __val); \ }) +#define lll_mutex_cond_lock(lock) \ + (void) ({ \ + int *__futex = &(lock); \ + int __val = atomic_exchange_and_add (__futex, 2); \ + __asm __volatile (__lll_acq_instr ::: "memory"); \ + if (__builtin_expect (__val != 0, 0)) \ + __lll_lock_wait (__futex, __val); \ + }) + extern int __lll_timedlock_wait (int *futex, int val, const struct timespec *) attribute_hidden; @@ -120,6 +141,13 @@ extern int __lll_timedlock_wait lll_futex_wake (__futex, 1); \ })) +#define lll_mutex_unlock_force(lock) \ + ((void) ({ \ + int *__futex = &(lock); \ + *__futex = 0; \ + lll_futex_wake (__futex, 1); \ + })) + #define lll_mutex_islocked(futex) \ (futex != 0) |