X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fgthr-win32.h;h=53f8396cc8135ae24e2be3eaa69647a9d5fc3a12;hp=97a50dab0bbd5653662823f08b537db85498be45;hb=0e0581040cbd9394993d4000bc9da4c5ac47d372;hpb=5a54c45ed5c603e6fc35b444d37d52b6f076d5d2 diff --git a/gcc/gthr-win32.h b/gcc/gthr-win32.h index 97a50dab0bb..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 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,28 +17,30 @@ 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 + does not map well into pthread-inspired gcc's threading model, and so there are caveats one needs to be aware of. 1. The destructor supplied to __gthread_key_create is ignored for - generic x86-win32 ports. This will certainly cause memory leaks - due to unreclaimed eh contexts (sizeof (eh_context) is at least + generic x86-win32 ports. This will certainly cause memory leaks + due to unreclaimed eh contexts (sizeof (eh_context) is at least 24 bytes for x86 currently). This memory leak may be significant for long-running applications @@ -47,42 +51,53 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA linked in if -mthreads option is specified, that runs the dtors in the reverse order of registration when each thread exits. If -mthreads option is not given, a stub is linked in instead of the - DLL, which results in memory leak. Other x86-win32 ports can use + DLL, which results in memory leak. Other x86-win32 ports can use the same technique of course to avoid the leak. 2. The error codes returned are non-POSIX like, and cast into ints. - This may cause incorrect error return due to truncation values on + 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. */ #define __GTHREADS 1 -#include #include #ifdef __MINGW32__ #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 + defining its own BOOL as a typedef. */ +#ifndef __OBJC__ +#define __OBJC__ +#endif +#include +/* Now undef the windows BOOL. */ +#undef BOOL + /* Key structure for maintaining thread specific storage */ -static DWORD __gthread_objc_data_tls = (DWORD)-1; +static DWORD __gthread_objc_data_tls = (DWORD) -1; /* Backend initialization functions */ /* Initialize the threads subsystem. */ int -__gthread_objc_init_thread_system(void) +__gthread_objc_init_thread_system (void) { - /* Initialize the thread storage key */ - if ((__gthread_objc_data_tls = TlsAlloc()) != (DWORD)-1) + /* Initialize the thread storage key. */ + if ((__gthread_objc_data_tls = TlsAlloc ()) != (DWORD) -1) return 0; else return -1; @@ -90,10 +105,10 @@ __gthread_objc_init_thread_system(void) /* Close the threads subsystem. */ int -__gthread_objc_close_thread_system(void) +__gthread_objc_close_thread_system (void) { - if (__gthread_objc_data_tls != (DWORD)-1) - TlsFree(__gthread_objc_data_tls); + if (__gthread_objc_data_tls != (DWORD) -1) + TlsFree (__gthread_objc_data_tls); return 0; } @@ -101,21 +116,21 @@ __gthread_objc_close_thread_system(void) /* Create a new thread of execution. */ objc_thread_t -__gthread_objc_thread_detach(void (*func)(void *arg), void *arg) +__gthread_objc_thread_detach (void (*func)(void *arg), void *arg) { DWORD thread_id = 0; HANDLE win32_handle; - if (!(win32_handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, - arg, 0, &thread_id))) + if (!(win32_handle = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) func, + 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. */ int -__gthread_objc_thread_set_priority(int priority) +__gthread_objc_thread_set_priority (int priority) { int sys_priority = 0; @@ -134,7 +149,7 @@ __gthread_objc_thread_set_priority(int priority) } /* Change priority */ - if (SetThreadPriority(GetCurrentThread(), sys_priority)) + if (SetThreadPriority (GetCurrentThread (), sys_priority)) return 0; else return -1; @@ -142,12 +157,12 @@ __gthread_objc_thread_set_priority(int priority) /* Return the current thread's priority. */ int -__gthread_objc_thread_get_priority(void) +__gthread_objc_thread_get_priority (void) { int sys_priority; - sys_priority = GetThreadPriority(GetCurrentThread()); - + sys_priority = GetThreadPriority (GetCurrentThread ()); + switch (sys_priority) { case THREAD_PRIORITY_HIGHEST: @@ -159,7 +174,7 @@ __gthread_objc_thread_get_priority(void) default: case THREAD_PRIORITY_BELOW_NORMAL: return OBJC_THREAD_BACKGROUND_PRIORITY; - + case THREAD_PRIORITY_IDLE: case THREAD_PRIORITY_LOWEST: return OBJC_THREAD_LOW_PRIORITY; @@ -171,17 +186,17 @@ __gthread_objc_thread_get_priority(void) /* Yield our process time to another thread. */ void -__gthread_objc_thread_yield(void) +__gthread_objc_thread_yield (void) { - Sleep(0); + Sleep (0); } /* Terminate the current thread. */ int -__gthread_objc_thread_exit(void) +__gthread_objc_thread_exit (void) { /* exit the thread */ - ExitThread(__gthread_objc_thread_exit_status); + ExitThread (__objc_thread_exit_status); /* Failed if we reached here */ return -1; @@ -189,16 +204,16 @@ __gthread_objc_thread_exit(void) /* Returns an integer value which uniquely describes a thread. */ objc_thread_t -__gthread_objc_thread_id(void) +__gthread_objc_thread_id (void) { - return (objc_thread_t)GetCurrentThreadId(); + return (objc_thread_t) (INT_PTR) GetCurrentThreadId (); } /* Sets the thread's local storage pointer. */ int -__gthread_objc_thread_set_data(void *value) +__gthread_objc_thread_set_data (void *value) { - if (TlsSetValue(__gthread_objc_data_tls, value)) + if (TlsSetValue (__gthread_objc_data_tls, value)) return 0; else return -1; @@ -206,16 +221,16 @@ __gthread_objc_thread_set_data(void *value) /* Returns the thread's local storage pointer. */ void * -__gthread_objc_thread_get_data(void) +__gthread_objc_thread_get_data (void) { DWORD lasterror; void *ptr; - lasterror = GetLastError(); + lasterror = GetLastError (); - ptr = TlsGetValue(__gthread_objc_data_tls); /* Return thread data. */ + ptr = TlsGetValue (__gthread_objc_data_tls); /* Return thread data. */ - SetLastError( lasterror ); + SetLastError (lasterror); return ptr; } @@ -224,9 +239,9 @@ __gthread_objc_thread_get_data(void) /* Allocate a mutex. */ int -__gthread_objc_mutex_allocate(objc_mutex_t mutex) +__gthread_objc_mutex_allocate (objc_mutex_t mutex) { - if ((mutex->backend = (void *)CreateMutex(NULL, 0, NULL)) == NULL) + if ((mutex->backend = (void *) CreateMutex (NULL, 0, NULL)) == NULL) return -1; else return 0; @@ -234,19 +249,19 @@ __gthread_objc_mutex_allocate(objc_mutex_t mutex) /* Deallocate a mutex. */ int -__gthread_objc_mutex_deallocate(objc_mutex_t mutex) +__gthread_objc_mutex_deallocate (objc_mutex_t mutex) { - CloseHandle((HANDLE)(mutex->backend)); + CloseHandle ((HANDLE) (mutex->backend)); return 0; } /* Grab a lock on a mutex. */ int -__gthread_objc_mutex_lock(objc_mutex_t mutex) +__gthread_objc_mutex_lock (objc_mutex_t mutex) { int status; - status = WaitForSingleObject((HANDLE)(mutex->backend), INFINITE); + status = WaitForSingleObject ((HANDLE) (mutex->backend), INFINITE); if (status != WAIT_OBJECT_0 && status != WAIT_ABANDONED) return -1; else @@ -255,11 +270,11 @@ __gthread_objc_mutex_lock(objc_mutex_t mutex) /* Try to grab a lock on a mutex. */ int -__gthread_objc_mutex_trylock(objc_mutex_t mutex) +__gthread_objc_mutex_trylock (objc_mutex_t mutex) { int status; - status = WaitForSingleObject((HANDLE)(mutex->backend), 0); + status = WaitForSingleObject ((HANDLE) (mutex->backend), 0); if (status != WAIT_OBJECT_0 && status != WAIT_ABANDONED) return -1; else @@ -268,9 +283,9 @@ __gthread_objc_mutex_trylock(objc_mutex_t mutex) /* Unlock the mutex */ int -__gthread_objc_mutex_unlock(objc_mutex_t mutex) +__gthread_objc_mutex_unlock (objc_mutex_t mutex) { - if (ReleaseMutex((HANDLE)(mutex->backend)) == 0) + if (ReleaseMutex ((HANDLE) (mutex->backend)) == 0) return -1; else return 0; @@ -280,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; @@ -288,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; @@ -296,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; @@ -304,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; @@ -312,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; @@ -320,31 +336,67 @@ __gthread_objc_condition_signal(objc_condition_t condition) #else /* _LIBOBJC */ -#ifdef __MINGW32__ -#include <_mingw.h> +#ifdef __cplusplus +extern "C" { #endif -typedef DWORD __gthread_key_t; +typedef unsigned long __gthread_key_t; typedef struct { int done; long started; } __gthread_once_t; -typedef HANDLE __gthread_mutex_t; +typedef struct { + long counter; + void *sema; +} __gthread_mutex_t; -#define __GTHREAD_ONCE_INIT {FALSE, -1} +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 {-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) +#if defined (_WIN32) && !defined(__CYGWIN__) #define MINGW32_SUPPORTS_MT_EH 1 -extern int __mingwthr_key_dtor PARAMS ((DWORD, void (*) (void *))); -/* Mingw runtime >= v0.3 provides a magic variable that is set to non-zero - if -mthreads option was specified, or 0 otherwise. This is to get around +/* 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; -#endif +extern int __mingwthr_key_dtor (unsigned long, void (*) (void *)); +#endif /* _WIN32 && !__CYGWIN__ */ + +/* 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) @@ -356,141 +408,365 @@ __gthread_active_p (void) #endif } +#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 + windows api definitions. */ + +extern int __gthr_win32_once (__gthread_once_t *, void (*) (void)); +extern int __gthr_win32_key_create (__gthread_key_t *, void (*) (void*)); +extern int __gthr_win32_key_delete (__gthread_key_t); +extern void * __gthr_win32_getspecific (__gthread_key_t); +extern int __gthr_win32_setspecific (__gthread_key_t, const void *); +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)) +{ + if (__gthread_active_p ()) + return __gthr_win32_once (__once, __func); + else + return -1; +} + +static inline int +__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *)) +{ + return __gthr_win32_key_create (__key, __dtor); +} + static inline int -__gthread_once (__gthread_once_t *once, void (*func) (void)) +__gthread_key_delete (__gthread_key_t __key) +{ + return __gthr_win32_key_delete (__key); +} + +static inline void * +__gthread_getspecific (__gthread_key_t __key) +{ + return __gthr_win32_getspecific (__key); +} + +static inline int +__gthread_setspecific (__gthread_key_t __key, const void *__ptr) +{ + return __gthr_win32_setspecific (__key, __ptr); +} + +static inline void +__gthread_mutex_init_function (__gthread_mutex_t *__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) +{ + if (__gthread_active_p ()) + return __gthr_win32_mutex_lock (__mutex); + else + return 0; +} + +static inline int +__gthread_mutex_trylock (__gthread_mutex_t *__mutex) +{ + if (__gthread_active_p ()) + return __gthr_win32_mutex_trylock (__mutex); + else + return 0; +} + +static inline int +__gthread_mutex_unlock (__gthread_mutex_t *__mutex) +{ + if (__gthread_active_p ()) + 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; +} + +#else /* ! __GTHREAD_HIDE_WIN32API */ + +#include +#include + +static inline int +__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) - { - (*func) (); - once->done = TRUE; + if (InterlockedIncrement (&(__once->started)) == 0) + { + (*__func) (); + __once->done = TRUE; } else { - /* Another thread is currently executing the code, so wait for it - to finish; yield the CPU in the meantime. If performance - 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) + /* Another thread is currently executing the code, so wait for it + to finish; yield the CPU in the meantime. If performance + 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) Sleep (0); } } - + return 0; } /* Windows32 thread local keys don't support destructors; this leads to - leaks, especially in threaded applications making extensive use of + 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; } -/* Currently, this routine is called only for Mingw runtime, and if - -mthreads option is chosen to link in the thread support DLL. */ static inline int -__gthread_key_dtor (__gthread_key_t key, void *ptr) +__gthread_key_delete (__gthread_key_t __key) { - /* Nothing needed. */ - return 0; + return (TlsFree (__key) != 0) ? 0 : (int) GetLastError (); +} + +static inline void * +__gthread_getspecific (__gthread_key_t __key) +{ + DWORD __lasterror; + void *__ptr; + + __lasterror = GetLastError (); + + __ptr = TlsGetValue (__key); + + SetLastError (__lasterror); + + return __ptr; } static inline int -__gthread_key_delete (__gthread_key_t key) +__gthread_setspecific (__gthread_key_t __key, const void *__ptr) { - return (TlsFree (key) != 0) ? 0 : (int) GetLastError (); + if (TlsSetValue (__key, CONST_CAST2(void *, const void *, __ptr)) != 0) + return 0; + else + return GetLastError (); } -static inline void * -__gthread_getspecific (__gthread_key_t key) +static inline void +__gthread_mutex_init_function (__gthread_mutex_t *__mutex) { - DWORD lasterror; - void *ptr; + __mutex->counter = -1; + __mutex->sema = CreateSemaphore (NULL, 0, 65535, NULL); +} + +static inline void +__gthread_mutex_destroy (__gthread_mutex_t *__mutex) +{ + CloseHandle ((HANDLE) __mutex->sema); +} - lasterror = GetLastError(); +static inline int +__gthread_mutex_lock (__gthread_mutex_t *__mutex) +{ + int __status = 0; - ptr = TlsGetValue(key); + if (__gthread_active_p ()) + { + 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; + } + } + return __status; +} - SetLastError( lasterror ); +static inline int +__gthread_mutex_trylock (__gthread_mutex_t *__mutex) +{ + int __status = 0; - return ptr; + if (__gthread_active_p ()) + { + if (__GTHR_W32_InterlockedCompareExchange (&__mutex->counter, 0, -1) < 0) + __status = 0; + else + __status = 1; + } + return __status; } static inline int -__gthread_setspecific (__gthread_key_t key, const void *ptr) +__gthread_mutex_unlock (__gthread_mutex_t *__mutex) { - return (TlsSetValue (key, (void*) ptr) != 0) ? 0 : (int) GetLastError (); + if (__gthread_active_p ()) + { + if (InterlockedDecrement (&__mutex->counter) >= 0) + return ReleaseSemaphore (__mutex->sema, 1, NULL) ? 0 : 1; + } + return 0; } static inline void -__gthread_mutex_init_function (__gthread_mutex_t *mutex) +__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex) { - /* Create unnamed mutex with default security attr and no initial owner. */ - *mutex = CreateMutex (NULL, 0, NULL); + __mutex->counter = -1; + __mutex->depth = 0; + __mutex->owner = 0; + __mutex->sema = CreateSemaphore (NULL, 0, 65535, NULL); } static inline int -__gthread_mutex_lock (__gthread_mutex_t *mutex) +__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex) { - int status = 0; - if (__gthread_active_p ()) { - if (WaitForSingleObject (*mutex, INFINITE) == WAIT_OBJECT_0) - status = 0; + 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 - status = 1; + { + /* WaitForSingleObject returns WAIT_FAILED, and we can only do + some best-effort cleanup here. */ + InterlockedDecrement (&__mutex->counter); + return 1; + } } - return status; + return 0; } static inline int -__gthread_mutex_trylock (__gthread_mutex_t *mutex) +__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex) { - int status = 0; - if (__gthread_active_p ()) { - if (WaitForSingleObject (*mutex, 0) == WAIT_OBJECT_0) - status = 0; + 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 - status = 1; + return 1; } - return status; + return 0; } static inline int -__gthread_mutex_unlock (__gthread_mutex_t *mutex) +__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex) { if (__gthread_active_p ()) - return (ReleaseMutex (*mutex) != 0) ? 0 : 1; - else - return 0; + { + --(__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 */ + +#ifdef __cplusplus +} +#endif + #endif /* _LIBOBJC */ #endif /* ! GCC_GTHR_WIN32_H */ -