X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgthr-win32.h;h=6b97ed9ea5d78f2b3e55032d5077194716a14ab3;hb=fb20d2ee2e14f53d4a6e90288392bac8afb31d1f;hp=fe8743a86581e24ae2769b903e32ec8848a8d095;hpb=805e22b2051e9c6a75377ea6599654d7415da483;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/gthr-win32.h b/gcc/gthr-win32.h index fe8743a8658..6b97ed9ea5d 100644 --- a/gcc/gthr-win32.h +++ b/gcc/gthr-win32.h @@ -1,6 +1,8 @@ /* Threads compatibility routines for libgcc2 and libobjc. */ /* Compile this one with gcc. */ -/* Copyright (C) 1999, 2000, 2002 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. @@ -17,8 +19,8 @@ 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. */ +Software Foundation, 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, @@ -30,6 +32,11 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #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. @@ -54,10 +61,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA This may cause incorrect error return due to truncation values on hw where sizeof (DWORD) > sizeof (int). - 3. We might consider using Critical Sections instead of Windows32 - mutexes for better performance, but emulating __gthread_mutex_trylock - interface becomes more complicated (Win9x does not support - TryEnterCriticalSectioni, while NT does). + 3. We are currently using a special mutex instead of the Critical + Sections, since Win9x does not support TryEnterCriticalSection + (while NT does). The basic framework should work well enough. In the long term, GCC needs to use Structured Exception Handling on Windows32. */ @@ -72,7 +78,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #ifdef _LIBOBJC /* This is necessary to prevent windef.h (included from windows.h) from - defining it's own BOOL as a typedef. */ + defining its own BOOL as a typedef. */ #ifndef __OBJC__ #define __OBJC__ #endif @@ -89,7 +95,7 @@ static DWORD __gthread_objc_data_tls = (DWORD) -1; int __gthread_objc_init_thread_system (void) { - /* Initialize the thread storage key */ + /* Initialize the thread storage key. */ if ((__gthread_objc_data_tls = TlsAlloc ()) != (DWORD) -1) return 0; else @@ -339,11 +345,24 @@ typedef struct { long started; } __gthread_once_t; -typedef void* __gthread_mutex_t; +typedef struct { + long counter; + void *sema; +} __gthread_mutex_t; + +typedef struct { + long counter; + long depth; + unsigned long owner; + void *sema; +} __gthread_recursive_mutex_t; #define __GTHREAD_ONCE_INIT {0, -1} #define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function -#define __GTHREAD_MUTEX_INIT_DEFAULT 0 +#define __GTHREAD_MUTEX_INIT_DEFAULT {-1, 0} +#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION \ + __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) @@ -355,6 +374,29 @@ extern int _CRT_MT; extern int __mingwthr_key_dtor (unsigned long, void (*) (void *)); #endif /* __MINGW32__ version */ +/* The Windows95 kernel does not export InterlockedCompareExchange. + This provides a substitute. When building apps that reference + gthread_mutex_try_lock, the __GTHREAD_I486_INLINE_LOCK_PRIMITIVES + macro must be defined if Windows95 is a target. Currently + 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) +{ + long result; + __asm__ __volatile__ ("\n\ + lock\n\ + cmpxchg{l} {%4, %1|%1, %4}\n" + : "=a" (result), "=m" (*__dest) + : "0" (__comperand), "m" (*__dest), "r" (__xchg) + : "cc"); + return result; +} +#define __GTHR_W32_InterlockedCompareExchange __gthr_i486_lock_cmp_xchg +#else /* __GTHREAD_I486_INLINE_LOCK_PRIMITIVES */ +#define __GTHR_W32_InterlockedCompareExchange InterlockedCompareExchange +#endif /* __GTHREAD_I486_INLINE_LOCK_PRIMITIVES */ + static inline int __gthread_active_p (void) { @@ -365,7 +407,7 @@ __gthread_active_p (void) #endif } -#ifdef __GTHREAD_HIDE_WIN32API +#if __GTHREAD_HIDE_WIN32API /* The implementations are in config/i386/gthr-win32.c in libgcc.a. Only stubs are exposed to avoid polluting the C++ namespace with @@ -380,69 +422,115 @@ extern void __gthr_win32_mutex_init_function (__gthread_mutex_t *); extern int __gthr_win32_mutex_lock (__gthread_mutex_t *); extern int __gthr_win32_mutex_trylock (__gthread_mutex_t *); extern int __gthr_win32_mutex_unlock (__gthread_mutex_t *); +extern void + __gthr_win32_recursive_mutex_init_function (__gthread_recursive_mutex_t *); +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) +{ + __gthr_win32_recursive_mutex_init_function (__mutex); +} + +static inline int +__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex) +{ + if (__gthread_active_p ()) + return __gthr_win32_recursive_mutex_lock (__mutex); + else + return 0; +} + +static inline int +__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex) +{ + if (__gthread_active_p ()) + return __gthr_win32_recursive_mutex_trylock (__mutex); + else + return 0; +} + +static inline int +__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex) +{ + if (__gthread_active_p ()) + return __gthr_win32_recursive_mutex_unlock (__mutex); else return 0; } @@ -453,19 +541,19 @@ __gthread_mutex_unlock (__gthread_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 { @@ -474,7 +562,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); } } @@ -486,95 +574,190 @@ __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) { - /* Create unnamed mutex with default security attr and no initial owner. */ - *mutex = CreateMutex (NULL, 0, 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 (WaitForSingleObject (*mutex, INFINITE) == WAIT_OBJECT_0) - status = 0; + if (InterlockedIncrement (&__mutex->counter) == 0 || + WaitForSingleObject (__mutex->sema, INFINITE) == WAIT_OBJECT_0) + __status = 0; else - status = 1; + { + /* WaitForSingleObject returns WAIT_FAILED, and we can only do + some best-effort cleanup here. */ + 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 (WaitForSingleObject (*mutex, 0) == WAIT_OBJECT_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 ()) - return (ReleaseMutex (*mutex) != 0) ? 0 : 1; - else - return 0; + { + 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) +{ + __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) +{ + if (__gthread_active_p ()) + { + DWORD __me = GetCurrentThreadId(); + if (InterlockedIncrement (&__mutex->counter) == 0) + { + __mutex->depth = 1; + __mutex->owner = __me; + } + else if (__mutex->owner == __me) + { + InterlockedDecrement (&__mutex->counter); + ++(__mutex->depth); + } + else if (WaitForSingleObject (__mutex->sema, INFINITE) == WAIT_OBJECT_0) + { + __mutex->depth = 1; + __mutex->owner = __me; + } + else + { + /* WaitForSingleObject returns WAIT_FAILED, and we can only do + some best-effort cleanup here. */ + InterlockedDecrement (&__mutex->counter); + return 1; + } + } + return 0; +} + +static inline int +__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) + { + __mutex->depth = 1; + __mutex->owner = __me; + } + else if (__mutex->owner == __me) + ++(__mutex->depth); + else + return 1; + } + return 0; +} + +static inline int +__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex) +{ + if (__gthread_active_p ()) + { + --(__mutex->depth); + if (__mutex->depth == 0) + { + __mutex->owner = 0; + + if (InterlockedDecrement (&__mutex->counter) >= 0) + return ReleaseSemaphore (__mutex->sema, 1, NULL) ? 0 : 1; + } + } + return 0; } #endif /* __GTHREAD_HIDE_WIN32API */