X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgthr-nks.h;h=311c6904b1ae8915b8108cd36348bf165db78479;hb=97db846f9ccc1b5c1d2c72869937173bb7c25871;hp=39bf199f1db740c5f8084a6f22ca4758136ae3aa;hpb=590d3b7404eab59e274622965f08dff175c1fea9;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/gthr-nks.h b/gcc/gthr-nks.h index 39bf199f1db..311c6904b1a 100644 --- a/gcc/gthr-nks.h +++ b/gcc/gthr-nks.h @@ -1,12 +1,12 @@ /* Threads compatibility routines for libgcc2 and libobjc. */ /* Compile this one with gcc. */ -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 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,17 +14,14 @@ 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, 59 Temple Place - Suite 330, Boston, MA -02111-1307, 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 +. */ #ifndef GCC_GTHR_NKS_H #define GCC_GTHR_NKS_H @@ -103,7 +100,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg) NXContextFree (context); thread_id = NULL; } - + return thread_id; } @@ -178,7 +175,7 @@ __gthread_objc_mutex_allocate (objc_mutex_t mutex) { static const NX_LOCK_INFO_ALLOC (info, "GNU ObjC", 0); - if ((mutex->backend = NXMutexAlloc (NX_MUTEX_RECURSIVE/*???*/, 0, &info)) == NULL) + if ((mutex->backend = NXMutexAlloc (0, 0, &info)) == NULL) return 0; return -1; } @@ -281,112 +278,118 @@ typedef volatile long __gthread_once_t; #define __GTHREAD_ONCE_INIT 0 static inline int -__gthread_once (__gthread_once_t *once, void (*func) (void)) +__gthread_once (__gthread_once_t *__once, void (*__func) (void)) { - if (__compare_and_swap (once, 0, 1)) + if (__compare_and_swap (__once, 0, 1)) { - func(); - *once |= 2; + __func (); + *__once |= 2; } else { - while (!(*once & 2)) + while (!(*__once & 2)) NXThreadYield (); } return 0; } static inline int -__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *)) +__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *)) { - return NXKeyCreate (dtor, NULL, key); + return NXKeyCreate (__dtor, NULL, __key); } static inline int -__gthread_key_dtor (__gthread_key_t key, void *ptr) +__gthread_key_dtor (__gthread_key_t __key, void *__ptr) { /* Just reset the key value to zero. */ - if (ptr) - return NXKeySetValue (key, NULL); + if (__ptr) + return NXKeySetValue (__key, NULL); return 0; } static inline int -__gthread_key_delete (__gthread_key_t key) +__gthread_key_delete (__gthread_key_t __key) { - return NXKeyDelete (key); + return NXKeyDelete (__key); } static inline void * -__gthread_getspecific (__gthread_key_t key) +__gthread_getspecific (__gthread_key_t __key) { - void *value; + void *__value; - if (NXKeyGetValue (key, &value) == 0) - return value; + if (NXKeyGetValue (__key, &__value) == 0) + return __value; return NULL; } static inline int -__gthread_setspecific (__gthread_key_t key, const void *ptr) +__gthread_setspecific (__gthread_key_t __key, const void *__ptr) { - return NXKeySetValue (key, (void *)ptr); + return NXKeySetValue (__key, (void *)__ptr); } static inline void -__gthread_mutex_init_function (__gthread_mutex_t *mutex) +__gthread_mutex_init_function (__gthread_mutex_t *__mutex) { - static const NX_LOCK_INFO_ALLOC (info, "GTHREADS", 0); + static const NX_LOCK_INFO_ALLOC (__info, "GTHREADS", 0); + + *__mutex = NXMutexAlloc (0, 0, &__info); +} - *mutex = NXMutexAlloc (0, 0, &info); +static inline int +__gthread_mutex_destroy (__gthread_mutex_t * UNUSED(__mutex)) +{ + return 0; } static inline int -__gthread_mutex_lock (__gthread_mutex_t *mutex) +__gthread_mutex_lock (__gthread_mutex_t *__mutex) { - return NXLock (*mutex); + return NXLock (*__mutex); } static inline int -__gthread_mutex_trylock (__gthread_mutex_t *mutex) +__gthread_mutex_trylock (__gthread_mutex_t *__mutex) { - if (NXTryLock (*mutex)) + if (NXTryLock (*__mutex)) return 0; return -1; } static inline int -__gthread_mutex_unlock (__gthread_mutex_t *mutex) +__gthread_mutex_unlock (__gthread_mutex_t *__mutex) { - return NXUnlock (*mutex); + return NXUnlock (*__mutex); } static inline void -__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex) { - static const NX_LOCK_INFO_ALLOC (info, "GTHREADS", 0); + static const NX_LOCK_INFO_ALLOC (__info, "GTHREADS", 0); - *mutex = NXMutexAlloc (NX_MUTEX_RECURSIVE, 0, &info); + *__mutex = NXMutexAlloc (NX_MUTEX_RECURSIVE, 0, &__info); } static inline int -__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex) { - return NXLock (*mutex); + return NXLock (*__mutex); } static inline int -__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex) { - if (NXTryLock (*mutex)) + if (NXTryLock (*__mutex)) return 0; return -1; } static inline int -__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex) { - return NXUnlock (*mutex); + return NXUnlock (*__mutex); } #endif /* _LIBOBJC */