diff options
| -rw-r--r-- | libgomp/ChangeLog | 8 | ||||
| -rw-r--r-- | libgomp/config/posix95/lock.c | 131 | ||||
| -rw-r--r-- | libgomp/config/posix95/omp-lock.h | 17 | ||||
| -rw-r--r-- | libgomp/configure.tgt | 5 |
4 files changed, 161 insertions, 0 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 6723d5c52b2..d5788240f80 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,11 @@ +2006-10-24 Eric Botcazou <ebotcazou@libertysurf.fr> + + PR libgomp/29494 + * configure.tgt: Use posix95 configuration for Solaris 2.5.1 and 2.6. + * config/posix95: New directory. + * config/posix95/omp-lock.h: New file. + * config/posix95/lock.c: Likewise. + 2006-10-14 Geoffrey Keating <geoffk@apple.com> * aclocal.m4: Regenerate. diff --git a/libgomp/config/posix95/lock.c b/libgomp/config/posix95/lock.c new file mode 100644 index 00000000000..2416f1131c7 --- /dev/null +++ b/libgomp/config/posix95/lock.c @@ -0,0 +1,131 @@ +/* Copyright (C) 2006 Free Software Foundation, Inc. + + This file is part of the GNU OpenMP Library (libgomp). + + Libgomp 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. + + Libgomp 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 libgomp; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA. */ + +/* As a special exception, if you link this library with other files, some + of which are compiled with GCC, to produce an executable, this library + does not by itself cause the resulting executable to be covered by the + GNU General Public License. This exception does not however invalidate + any other reasons why the executable file might be covered by the GNU + General Public License. */ + +/* This is the POSIX95 implementation of the public OpenMP locking primitives. + + Because OpenMP uses different entry points for normal and recursive + locks, and pthreads uses only one entry point, a system may be able + to do better and streamline the locking as well as reduce the size + of the types exported. */ + +#include "libgomp.h" + + +void +omp_init_lock (omp_lock_t *lock) +{ + pthread_mutex_init (lock, NULL); +} + +void +omp_destroy_lock (omp_lock_t *lock) +{ + pthread_mutex_destroy (lock); +} + +void +omp_set_lock (omp_lock_t *lock) +{ + pthread_mutex_lock (lock); +} + +void +omp_unset_lock (omp_lock_t *lock) +{ + pthread_mutex_unlock (lock); +} + +int +omp_test_lock (omp_lock_t *lock) +{ + return pthread_mutex_trylock (lock) == 0; +} + +void +omp_init_nest_lock (omp_nest_lock_t *lock) +{ + pthread_mutex_init (&lock->lock, NULL); + lock->owner = (pthread_t) 0; + lock->count = 0; +} + +void +omp_destroy_nest_lock (omp_nest_lock_t *lock) +{ + pthread_mutex_destroy (&lock->lock); +} + +void +omp_set_nest_lock (omp_nest_lock_t *lock) +{ + pthread_t me = pthread_self (); + + if (lock->owner != me) + { + pthread_mutex_lock (&lock->lock); + lock->owner = me; + } + + lock->count++; +} + +void +omp_unset_nest_lock (omp_nest_lock_t *lock) +{ + lock->count--; + + if (lock->count == 0) + { + lock->owner = (pthread_t) 0; + pthread_mutex_unlock (&lock->lock); + } +} + +int +omp_test_nest_lock (omp_nest_lock_t *lock) +{ + pthread_t me = pthread_self (); + + if (lock->owner != me) + { + if (pthread_mutex_trylock (&lock->lock) != 0) + return 0; + lock->owner = me; + } + + return ++lock->count; +} + +ialias (omp_init_lock) +ialias (omp_init_nest_lock) +ialias (omp_destroy_lock) +ialias (omp_destroy_nest_lock) +ialias (omp_set_lock) +ialias (omp_set_nest_lock) +ialias (omp_unset_lock) +ialias (omp_unset_nest_lock) +ialias (omp_test_lock) +ialias (omp_test_nest_lock) diff --git a/libgomp/config/posix95/omp-lock.h b/libgomp/config/posix95/omp-lock.h new file mode 100644 index 00000000000..c446aec01e5 --- /dev/null +++ b/libgomp/config/posix95/omp-lock.h @@ -0,0 +1,17 @@ +/* This header is used during the build process to find the size and + alignment of the public OpenMP locks, so that we can export data + structures without polluting the namespace. + + In this POSIX95 implementation, we map the two locks to the + same PTHREADS primitive. */ + +#include <pthread.h> + +typedef pthread_mutex_t omp_lock_t; + +typedef struct +{ + pthread_mutex_t lock; + pthread_t owner; + int count; +} omp_nest_lock_t; diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt index f27f9287f24..7464d6a1cdf 100644 --- a/libgomp/configure.tgt +++ b/libgomp/configure.tgt @@ -95,6 +95,11 @@ case "${target}" in config_path="mingw32 posix" ;; + *-*-solaris2.[56]*) + config_path="posix95 posix" + XLDFLAGS="${XLDFLAGS} -lposix4" + ;; + *) ;; |