X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgthr-tpf.h;h=fb23e91cfcd4d37f5a18eb2c1f8514a392b95676;hb=6620d7d7c5f2fe5df0df2b85e143746f76fdd4cf;hp=e6951e1a01d82b2abf98b60b319cd60d8346aa91;hpb=bfd7d80d7f5a6c61912465bfd81188dd9b6cacaf;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/gthr-tpf.h b/gcc/gthr-tpf.h index e6951e1a01d..fb23e91cfcd 100644 --- a/gcc/gthr-tpf.h +++ b/gcc/gthr-tpf.h @@ -1,12 +1,12 @@ /* Threads compatibility routines for libgcc2 and libobjc. Compile this one with gcc. - Copyright (C) 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2008, 2009 Free Software Foundation, Inc. This file is part of GCC. GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later +Software Foundation; either version 3, or (at your option) any later version. GCC is distributed in the hope that it will be useful, but WITHOUT ANY @@ -14,20 +14,16 @@ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301, USA. */ +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. -/* 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. */ +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ - -/* TPF needs its own version of gthr-*.h because TPF always links to +/* TPF needs its own version of gthr-*.h because TPF always links to the thread library. However, for performance reasons we still do not want to issue thread api calls unless a check is made to see that we are running as a thread. */ @@ -61,6 +57,7 @@ typedef pthread_mutex_t __gthread_recursive_mutex_t; #define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER #define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT +#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function #define NOTATHREAD 00 #define ECBBASEPTR (unsigned long int) *(unsigned int *)0x00000514u @@ -87,6 +84,11 @@ __gthrw(pthread_create) __gthrw(pthread_mutex_lock) __gthrw(pthread_mutex_trylock) __gthrw(pthread_mutex_unlock) +__gthrw(pthread_mutexattr_init) +__gthrw(pthread_mutexattr_settype) +__gthrw(pthread_mutexattr_destroy) +__gthrw(pthread_mutex_init) +__gthrw(pthread_mutex_destroy) static inline int __gthread_active_p (void) @@ -95,102 +97,133 @@ __gthread_active_p (void) } static inline int -__gthread_once (__gthread_once_t *once, void (*func) (void)) +__gthread_once (__gthread_once_t *__once, void (*__func) (void)) { if (__tpf_pthread_active ()) - return __gthrw_(pthread_once) (once, func); + return __gthrw_(pthread_once) (__once, __func); else return -1; } static inline int -__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *)) +__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *)) { if (__tpf_pthread_active ()) - return __gthrw_(pthread_key_create) (key, dtor); + return __gthrw_(pthread_key_create) (__key, __dtor); else return -1; } static inline int -__gthread_key_delete (__gthread_key_t key) +__gthread_key_delete (__gthread_key_t __key) { if (__tpf_pthread_active ()) - return __gthrw_(pthread_key_delete) (key); + return __gthrw_(pthread_key_delete) (__key); else return -1; } static inline void * -__gthread_getspecific (__gthread_key_t key) +__gthread_getspecific (__gthread_key_t __key) { if (__tpf_pthread_active ()) - return __gthrw_(pthread_getspecific) (key); + return __gthrw_(pthread_getspecific) (__key); else return NULL; } static inline int -__gthread_setspecific (__gthread_key_t key, const void *ptr) +__gthread_setspecific (__gthread_key_t __key, const void *__ptr) { if (__tpf_pthread_active ()) - return __gthrw_(pthread_setspecific) (key, ptr); + return __gthrw_(pthread_setspecific) (__key, __ptr); else return -1; } static inline int -__gthread_mutex_lock (__gthread_mutex_t *mutex) +__gthread_mutex_destroy (__gthread_mutex_t *__mutex) +{ + if (__tpf_pthread_active ()) + return __gthrw_(pthread_mutex_destroy) (__mutex); + else + return 0; +} + +static inline int +__gthread_mutex_lock (__gthread_mutex_t *__mutex) { if (__tpf_pthread_active ()) - return __gthrw_(pthread_mutex_lock) (mutex); + return __gthrw_(pthread_mutex_lock) (__mutex); else return 0; } static inline int -__gthread_mutex_trylock (__gthread_mutex_t *mutex) +__gthread_mutex_trylock (__gthread_mutex_t *__mutex) { if (__tpf_pthread_active ()) - return __gthrw_(pthread_mutex_trylock) (mutex); + return __gthrw_(pthread_mutex_trylock) (__mutex); else return 0; } static inline int -__gthread_mutex_unlock (__gthread_mutex_t *mutex) +__gthread_mutex_unlock (__gthread_mutex_t *__mutex) { if (__tpf_pthread_active ()) - return __gthrw_(pthread_mutex_unlock) (mutex); + return __gthrw_(pthread_mutex_unlock) (__mutex); else return 0; } static inline int -__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex) { if (__tpf_pthread_active ()) - return __gthread_mutex_lock (mutex); + return __gthread_mutex_lock (__mutex); else return 0; } static inline int -__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex) { if (__tpf_pthread_active ()) - return __gthread_mutex_trylock (mutex); + return __gthread_mutex_trylock (__mutex); else return 0; } static inline int -__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex) { if (__tpf_pthread_active ()) - return __gthread_mutex_unlock (mutex); + return __gthread_mutex_unlock (__mutex); else return 0; } +static inline int +__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex) +{ + if (__tpf_pthread_active ()) + { + pthread_mutexattr_t __attr; + int __r; + + __r = __gthrw_(pthread_mutexattr_init) (&__attr); + if (!__r) + __r = __gthrw_(pthread_mutexattr_settype) (&__attr, + PTHREAD_MUTEX_RECURSIVE); + if (!__r) + __r = __gthrw_(pthread_mutex_init) (__mutex, &__attr); + if (!__r) + __r = __gthrw_(pthread_mutexattr_destroy) (&__attr); + return __r; + } + return 0; +} + + #endif /* ! GCC_GTHR_TPF_H */