X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fgthr-win32.h;h=53f8396cc8135ae24e2be3eaa69647a9d5fc3a12;hp=e9daf3d89d86e1f2d9f210ef6d6d77ef20d0e2ed;hb=eeb74f9f363aad87d2db46e1d0657e9b45bba8c2;hpb=20833d12089d56f5128478b35b8e85a67ccca6f8 diff --git a/gcc/gthr-win32.h b/gcc/gthr-win32.h index e9daf3d89d8..53f8396cc81 100644 --- a/gcc/gthr-win32.h +++ b/gcc/gthr-win32.h @@ -1,13 +1,15 @@ /* Threads compatibility routines for libgcc2 and libobjc. */ /* Compile this one with gcc. */ -/* Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc. + +/* Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2008, 2009 + Free Software Foundation, Inc. Contributed by Mumit Khan . 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 @@ -15,21 +17,23 @@ 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_WIN32_H #define GCC_GTHR_WIN32_H +/* Make sure CONST_CAST2 (origin in system.h) is declared. */ +#ifndef CONST_CAST2 +#define CONST_CAST2(TOTYPE,FROMTYPE,X) ((__extension__(union {FROMTYPE _q; TOTYPE _nq;})(X))._nq) +#endif + /* Windows32 threads specific definitions. The windows32 threading model does not map well into pthread-inspired gcc's threading model, and so there are caveats one needs to be aware of. @@ -68,6 +72,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include <_mingw.h> #endif +#ifndef __UNUSED_PARAM +#define __UNUSED_PARAM(x) x +#endif + #ifdef _LIBOBJC /* This is necessary to prevent windef.h (included from windows.h) from @@ -117,7 +125,7 @@ __gthread_objc_thread_detach (void (*func)(void *arg), void *arg) arg, 0, &thread_id))) thread_id = 0; - return (objc_thread_t) thread_id; + return (objc_thread_t) (INT_PTR) thread_id; } /* Set the current thread's priority. */ @@ -198,7 +206,7 @@ __gthread_objc_thread_exit (void) objc_thread_t __gthread_objc_thread_id (void) { - return (objc_thread_t) GetCurrentThreadId (); + return (objc_thread_t) (INT_PTR) GetCurrentThreadId (); } /* Sets the thread's local storage pointer. */ @@ -287,7 +295,7 @@ __gthread_objc_mutex_unlock (objc_mutex_t mutex) /* Allocate a condition. */ int -__gthread_objc_condition_allocate (objc_condition_t condition) +__gthread_objc_condition_allocate (objc_condition_t __UNUSED_PARAM(condition)) { /* Unimplemented. */ return -1; @@ -295,7 +303,7 @@ __gthread_objc_condition_allocate (objc_condition_t condition) /* Deallocate a condition. */ int -__gthread_objc_condition_deallocate (objc_condition_t condition) +__gthread_objc_condition_deallocate (objc_condition_t __UNUSED_PARAM(condition)) { /* Unimplemented. */ return -1; @@ -303,7 +311,8 @@ __gthread_objc_condition_deallocate (objc_condition_t condition) /* Wait on the condition */ int -__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex) +__gthread_objc_condition_wait (objc_condition_t __UNUSED_PARAM(condition), + objc_mutex_t __UNUSED_PARAM(mutex)) { /* Unimplemented. */ return -1; @@ -311,7 +320,7 @@ __gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex) /* Wake up all threads waiting on this condition. */ int -__gthread_objc_condition_broadcast (objc_condition_t condition) +__gthread_objc_condition_broadcast (objc_condition_t __UNUSED_PARAM(condition)) { /* Unimplemented. */ return -1; @@ -319,7 +328,7 @@ __gthread_objc_condition_broadcast (objc_condition_t condition) /* Wake up one thread waiting on this condition. */ int -__gthread_objc_condition_signal (objc_condition_t condition) +__gthread_objc_condition_signal (objc_condition_t __UNUSED_PARAM(condition)) { /* Unimplemented. */ return -1; @@ -357,15 +366,14 @@ typedef struct { __gthread_recursive_mutex_init_function #define __GTHREAD_RECURSIVE_MUTEX_INIT_DEFAULT {-1, 0, 0, 0} -#if __MINGW32_MAJOR_VERSION >= 1 || \ - (__MINGW32_MAJOR_VERSION == 0 && __MINGW32_MINOR_VERSION > 2) +#if defined (_WIN32) && !defined(__CYGWIN__) #define MINGW32_SUPPORTS_MT_EH 1 /* Mingw runtime >= v0.3 provides a magic variable that is set to nonzero if -mthreads option was specified, or 0 otherwise. This is to get around the lack of weak symbols in PE-COFF. */ extern int _CRT_MT; extern int __mingwthr_key_dtor (unsigned long, void (*) (void *)); -#endif /* __MINGW32__ version */ +#endif /* _WIN32 && !__CYGWIN__ */ /* The Windows95 kernel does not export InterlockedCompareExchange. This provides a substitute. When building apps that reference @@ -374,14 +382,14 @@ extern int __mingwthr_key_dtor (unsigned long, void (*) (void *)); gthread_mutex_try_lock is not referenced by libgcc or libstdc++. */ #ifdef __GTHREAD_I486_INLINE_LOCK_PRIMITIVES static inline long -__gthr_i486_lock_cmp_xchg(long *dest, long xchg, long comperand) +__gthr_i486_lock_cmp_xchg(long *__dest, long __xchg, long __comperand) { long result; __asm__ __volatile__ ("\n\ lock\n\ cmpxchg{l} {%4, %1|%1, %4}\n" - : "=a" (result), "=m" (*dest) - : "0" (comperand), "m" (*dest), "r" (xchg) + : "=a" (result), "=m" (*__dest) + : "0" (__comperand), "m" (*__dest), "r" (__xchg) : "cc"); return result; } @@ -421,102 +429,109 @@ extern int __gthr_win32_recursive_mutex_lock (__gthread_recursive_mutex_t *); extern int __gthr_win32_recursive_mutex_trylock (__gthread_recursive_mutex_t *); extern int __gthr_win32_recursive_mutex_unlock (__gthread_recursive_mutex_t *); +extern void __gthr_win32_mutex_destroy (__gthread_mutex_t *); static inline int -__gthread_once (__gthread_once_t *once, void (*func) (void)) +__gthread_once (__gthread_once_t *__once, void (*__func) (void)) { if (__gthread_active_p ()) - return __gthr_win32_once (once, func); + return __gthr_win32_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 *)) { - return __gthr_win32_key_create (key, dtor); + return __gthr_win32_key_create (__key, __dtor); } static inline int -__gthread_key_delete (__gthread_key_t key) +__gthread_key_delete (__gthread_key_t __key) { - return __gthr_win32_key_delete (key); + return __gthr_win32_key_delete (__key); } static inline void * -__gthread_getspecific (__gthread_key_t key) +__gthread_getspecific (__gthread_key_t __key) { - return __gthr_win32_getspecific (key); + return __gthr_win32_getspecific (__key); } static inline int -__gthread_setspecific (__gthread_key_t key, const void *ptr) +__gthread_setspecific (__gthread_key_t __key, const void *__ptr) { - return __gthr_win32_setspecific (key, ptr); + return __gthr_win32_setspecific (__key, __ptr); } static inline void -__gthread_mutex_init_function (__gthread_mutex_t *mutex) +__gthread_mutex_init_function (__gthread_mutex_t *__mutex) { - __gthr_win32_mutex_init_function (mutex); + __gthr_win32_mutex_init_function (__mutex); +} + +static inline void +__gthread_mutex_destroy (__gthread_mutex_t *__mutex) +{ + __gthr_win32_mutex_destroy (__mutex); } static inline int -__gthread_mutex_lock (__gthread_mutex_t *mutex) +__gthread_mutex_lock (__gthread_mutex_t *__mutex) { if (__gthread_active_p ()) - return __gthr_win32_mutex_lock (mutex); + return __gthr_win32_mutex_lock (__mutex); else return 0; } static inline int -__gthread_mutex_trylock (__gthread_mutex_t *mutex) +__gthread_mutex_trylock (__gthread_mutex_t *__mutex) { if (__gthread_active_p ()) - return __gthr_win32_mutex_trylock (mutex); + return __gthr_win32_mutex_trylock (__mutex); else return 0; } static inline int -__gthread_mutex_unlock (__gthread_mutex_t *mutex) +__gthread_mutex_unlock (__gthread_mutex_t *__mutex) { if (__gthread_active_p ()) - return __gthr_win32_mutex_unlock (mutex); + return __gthr_win32_mutex_unlock (__mutex); else return 0; } static inline void -__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex) { - __gthr_win32_recursive_mutex_init_function (mutex); + __gthr_win32_recursive_mutex_init_function (__mutex); } static inline int -__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex) { if (__gthread_active_p ()) - return __gthr_win32_recursive_mutex_lock (mutex); + return __gthr_win32_recursive_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 (__gthread_active_p ()) - return __gthr_win32_recursive_mutex_trylock (mutex); + return __gthr_win32_recursive_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 (__gthread_active_p ()) - return __gthr_win32_recursive_mutex_unlock (mutex); + return __gthr_win32_recursive_mutex_unlock (__mutex); else return 0; } @@ -527,19 +542,19 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex) #include static inline int -__gthread_once (__gthread_once_t *once, void (*func) (void)) +__gthread_once (__gthread_once_t *__once, void (*__func) (void)) { if (! __gthread_active_p ()) return -1; - else if (once == NULL || func == NULL) + else if (__once == NULL || __func == NULL) return EINVAL; - if (! once->done) + if (! __once->done) { - if (InterlockedIncrement (&(once->started)) == 0) + if (InterlockedIncrement (&(__once->started)) == 0) { - (*func) (); - once->done = TRUE; + (*__func) (); + __once->done = TRUE; } else { @@ -548,7 +563,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void)) does become an issue, the solution is to use an Event that we wait on here (and set above), but that implies a place to create the event before this routine is called. */ - while (! once->done) + while (! __once->done) Sleep (0); } } @@ -560,140 +575,150 @@ __gthread_once (__gthread_once_t *once, void (*func) (void)) leaks, especially in threaded applications making extensive use of C++ EH. Mingw uses a thread-support DLL to work-around this problem. */ static inline int -__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *)) +__gthread_key_create (__gthread_key_t *__key, + void (*__dtor) (void *) __attribute__((unused))) { - int status = 0; - DWORD tls_index = TlsAlloc (); - if (tls_index != 0xFFFFFFFF) + int __status = 0; + DWORD __tls_index = TlsAlloc (); + if (__tls_index != 0xFFFFFFFF) { - *key = tls_index; + *__key = __tls_index; #ifdef MINGW32_SUPPORTS_MT_EH /* Mingw runtime will run the dtors in reverse order for each thread when the thread exits. */ - status = __mingwthr_key_dtor (*key, dtor); + __status = __mingwthr_key_dtor (*__key, __dtor); #endif } else - status = (int) GetLastError (); - return status; + __status = (int) GetLastError (); + return __status; } static inline int -__gthread_key_delete (__gthread_key_t key) +__gthread_key_delete (__gthread_key_t __key) { - return (TlsFree (key) != 0) ? 0 : (int) GetLastError (); + return (TlsFree (__key) != 0) ? 0 : (int) GetLastError (); } static inline void * -__gthread_getspecific (__gthread_key_t key) +__gthread_getspecific (__gthread_key_t __key) { - DWORD lasterror; - void *ptr; + DWORD __lasterror; + void *__ptr; - lasterror = GetLastError (); + __lasterror = GetLastError (); - ptr = TlsGetValue (key); + __ptr = TlsGetValue (__key); - SetLastError (lasterror); + SetLastError (__lasterror); - return ptr; + return __ptr; } static inline int -__gthread_setspecific (__gthread_key_t key, const void *ptr) +__gthread_setspecific (__gthread_key_t __key, const void *__ptr) +{ + if (TlsSetValue (__key, CONST_CAST2(void *, const void *, __ptr)) != 0) + return 0; + else + return GetLastError (); +} + +static inline void +__gthread_mutex_init_function (__gthread_mutex_t *__mutex) { - return (TlsSetValue (key, (void*) ptr) != 0) ? 0 : (int) GetLastError (); + __mutex->counter = -1; + __mutex->sema = CreateSemaphore (NULL, 0, 65535, NULL); } static inline void -__gthread_mutex_init_function (__gthread_mutex_t *mutex) +__gthread_mutex_destroy (__gthread_mutex_t *__mutex) { - mutex->counter = -1; - mutex->sema = CreateSemaphore (NULL, 0, 65535, NULL); + CloseHandle ((HANDLE) __mutex->sema); } static inline int -__gthread_mutex_lock (__gthread_mutex_t *mutex) +__gthread_mutex_lock (__gthread_mutex_t *__mutex) { - int status = 0; + int __status = 0; if (__gthread_active_p ()) { - if (InterlockedIncrement (&mutex->counter) == 0 || - WaitForSingleObject (mutex->sema, INFINITE) == WAIT_OBJECT_0) - status = 0; + if (InterlockedIncrement (&__mutex->counter) == 0 || + WaitForSingleObject (__mutex->sema, INFINITE) == WAIT_OBJECT_0) + __status = 0; else { /* WaitForSingleObject returns WAIT_FAILED, and we can only do some best-effort cleanup here. */ - InterlockedDecrement (&mutex->counter); - status = 1; + InterlockedDecrement (&__mutex->counter); + __status = 1; } } - return status; + return __status; } static inline int -__gthread_mutex_trylock (__gthread_mutex_t *mutex) +__gthread_mutex_trylock (__gthread_mutex_t *__mutex) { - int status = 0; + int __status = 0; if (__gthread_active_p ()) { - if (__GTHR_W32_InterlockedCompareExchange (&mutex->counter, 0, -1) < 0) - status = 0; + if (__GTHR_W32_InterlockedCompareExchange (&__mutex->counter, 0, -1) < 0) + __status = 0; else - status = 1; + __status = 1; } - return status; + return __status; } static inline int -__gthread_mutex_unlock (__gthread_mutex_t *mutex) +__gthread_mutex_unlock (__gthread_mutex_t *__mutex) { if (__gthread_active_p ()) { - if (InterlockedDecrement (&mutex->counter) >= 0) - return ReleaseSemaphore (mutex->sema, 1, NULL) ? 0 : 1; + if (InterlockedDecrement (&__mutex->counter) >= 0) + return ReleaseSemaphore (__mutex->sema, 1, NULL) ? 0 : 1; } return 0; } static inline void -__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex) { - mutex->counter = -1; - mutex->depth = 0; - mutex->owner = 0; - mutex->sema = CreateSemaphore (NULL, 0, 65535, NULL); + __mutex->counter = -1; + __mutex->depth = 0; + __mutex->owner = 0; + __mutex->sema = CreateSemaphore (NULL, 0, 65535, NULL); } static inline int -__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex) { if (__gthread_active_p ()) { - DWORD me = GetCurrentThreadId(); - if (InterlockedIncrement (&mutex->counter) == 0) + DWORD __me = GetCurrentThreadId(); + if (InterlockedIncrement (&__mutex->counter) == 0) { - mutex->depth = 1; - mutex->owner = me; + __mutex->depth = 1; + __mutex->owner = __me; } - else if (mutex->owner == me) + else if (__mutex->owner == __me) { - InterlockedDecrement (&mutex->counter); - ++(mutex->depth); + InterlockedDecrement (&__mutex->counter); + ++(__mutex->depth); } - else if (WaitForSingleObject (mutex->sema, INFINITE) == WAIT_OBJECT_0) + else if (WaitForSingleObject (__mutex->sema, INFINITE) == WAIT_OBJECT_0) { - mutex->depth = 1; - mutex->owner = me; + __mutex->depth = 1; + __mutex->owner = __me; } else { /* WaitForSingleObject returns WAIT_FAILED, and we can only do some best-effort cleanup here. */ - InterlockedDecrement (&mutex->counter); + InterlockedDecrement (&__mutex->counter); return 1; } } @@ -701,18 +726,18 @@ __gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex) } static inline int -__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex) { if (__gthread_active_p ()) { - DWORD me = GetCurrentThreadId(); - if (__GTHR_W32_InterlockedCompareExchange (&mutex->counter, 0, -1) < 0) + DWORD __me = GetCurrentThreadId(); + if (__GTHR_W32_InterlockedCompareExchange (&__mutex->counter, 0, -1) < 0) { - mutex->depth = 1; - mutex->owner = me; + __mutex->depth = 1; + __mutex->owner = __me; } - else if (mutex->owner == me) - ++(mutex->depth); + else if (__mutex->owner == __me) + ++(__mutex->depth); else return 1; } @@ -720,17 +745,17 @@ __gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex) } static inline int -__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex) +__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex) { if (__gthread_active_p ()) { - --(mutex->depth); - if (mutex->depth == 0) + --(__mutex->depth); + if (__mutex->depth == 0) { - mutex->owner = 0; + __mutex->owner = 0; - if (InterlockedDecrement (&mutex->counter) >= 0) - return ReleaseSemaphore (mutex->sema, 1, NULL) ? 0 : 1; + if (InterlockedDecrement (&__mutex->counter) >= 0) + return ReleaseSemaphore (__mutex->sema, 1, NULL) ? 0 : 1; } } return 0;