diff options
Diffstat (limited to 'libgomp/config/posix/omp-lock.h')
| -rw-r--r-- | libgomp/config/posix/omp-lock.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/libgomp/config/posix/omp-lock.h b/libgomp/config/posix/omp-lock.h index ed70618d87d..e51dc271f8a 100644 --- a/libgomp/config/posix/omp-lock.h +++ b/libgomp/config/posix/omp-lock.h @@ -2,10 +2,22 @@ alignment of the public OpenMP locks, so that we can export data structures without polluting the namespace. - In this default POSIX implementation, we map the two locks to the - same PTHREADS primitive. */ + In this default POSIX implementation, we used to map the two locks to the + same PTHREADS primitive, but for OpenMP 3.0 sem_t needs to be used + instead, as pthread_mutex_unlock should not be called by different + thread than the one that called pthread_mutex_lock. */ #include <pthread.h> +#include <semaphore.h> +typedef pthread_mutex_t omp_lock_25_t; +typedef struct { pthread_mutex_t lock; int count; } omp_nest_lock_25_t; +#ifdef HAVE_BROKEN_POSIX_SEMAPHORES +/* If we don't have working semaphores, we'll make all explicit tasks + tied to the creating thread. */ typedef pthread_mutex_t omp_lock_t; -typedef struct { pthread_mutex_t lock; int count; } omp_nest_lock_t; +typedef struct { pthread_mutex_t lock; int count; void *owner; } omp_nest_lock_t; +#else +typedef sem_t omp_lock_t; +typedef struct { sem_t lock; int count; void *owner; } omp_nest_lock_t; +#endif |