diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-05-26 16:19:15 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-05-26 16:19:15 +0000 |
| commit | d8ff3792a8020ff25b703109a763161236cfa8dd (patch) | |
| tree | 64c957412858723994412de62d1f13a6e5ff2ece /nptl/pthread_barrier_init.c | |
| parent | 42e6c66593eb7a07afd58e70bef9aeed9f910548 (diff) | |
| download | glibc-d8ff3792a8020ff25b703109a763161236cfa8dd.tar glibc-d8ff3792a8020ff25b703109a763161236cfa8dd.tar.gz glibc-d8ff3792a8020ff25b703109a763161236cfa8dd.tar.bz2 glibc-d8ff3792a8020ff25b703109a763161236cfa8dd.zip | |
* sysdeps/unix/sysv/linux/internaltypes.h (struct pthread_barrier):
Add private field.
* sysdeps/unix/sysv/linux/lowlevelbarrier.sym: Add PRIVATE definition.
* pthread_barrier_init.c: Set private flag if pshared and private
futexes are supported.
* sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S: Use
private field in futex command setup.
* sysdeps/unix/sysv/linux/x86_64/pthread_barrier_wait.S: Likewise.
Diffstat (limited to 'nptl/pthread_barrier_init.c')
| -rw-r--r-- | nptl/pthread_barrier_init.c | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/nptl/pthread_barrier_init.c b/nptl/pthread_barrier_init.c index 19e82fa38d..8dfc444965 100644 --- a/nptl/pthread_barrier_init.c +++ b/nptl/pthread_barrier_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -20,6 +20,13 @@ #include <errno.h> #include "pthreadP.h" #include <lowlevellock.h> +#include <kernel-features.h> + + +static const struct pthread_barrierattr default_attr = + { + .pshared = PTHREAD_PROCESS_PRIVATE + }; int @@ -33,17 +40,15 @@ pthread_barrier_init (barrier, attr, count) if (__builtin_expect (count == 0, 0)) return EINVAL; - if (attr != NULL) - { - struct pthread_barrierattr *iattr; - - iattr = (struct pthread_barrierattr *) attr; + struct pthread_barrierattr *iattr + = (attr != NULL + ? iattr = (struct pthread_barrierattr *) attr + : &default_attr); - if (iattr->pshared != PTHREAD_PROCESS_PRIVATE - && __builtin_expect (iattr->pshared != PTHREAD_PROCESS_SHARED, 0)) - /* Invalid attribute. */ - return EINVAL; - } + if (iattr->pshared != PTHREAD_PROCESS_PRIVATE + && __builtin_expect (iattr->pshared != PTHREAD_PROCESS_SHARED, 0)) + /* Invalid attribute. */ + return EINVAL; ibarrier = (struct pthread_barrier *) barrier; @@ -53,5 +58,14 @@ pthread_barrier_init (barrier, attr, count) ibarrier->init_count = count; ibarrier->curr_event = 0; +#ifdef __ASSUME_PRIVATE_FUTEX + ibarrier->private = (iattr->pshared != PTHREAD_PROCESS_PRIVATE + ? 0 : FUTEX_PRIVATE_FLAG); +#else + ibarrier->private = (iattr->pshared != PTHREAD_PROCESS_PRIVATE + ? 0 : THREAD_GETMEM (THREAD_SELF, + header.private_futex)); +#endif + return 0; } |