summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--thread_win32.c26
-rw-r--r--thread_win32.h7
3 files changed, 24 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 02dc8ec..23d0904 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Sun Jun 17 16:20:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jun 17 16:21:01 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread_win32.h (rb_thread_lock_t): make a union for USE_WIN32_MUTEX.
+ this internal is used only in thread_win32.c, but has to be complete
+ to define rb_thread_t.
* thread_win32.c (native_mutex_lock, native_mutex_destroy): fix for
USE_WIN32_MUTEX.
diff --git a/thread_win32.c b/thread_win32.c
index b77fdbb..c8da1f9 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -340,9 +340,9 @@ static int
native_mutex_lock(rb_thread_lock_t *lock)
{
#if USE_WIN32_MUTEX
- w32_mutex_lock(*lock);
+ w32_mutex_lock(lock->mutex);
#else
- EnterCriticalSection(lock);
+ EnterCriticalSection(&lock->crit);
#endif
return 0;
}
@@ -351,10 +351,10 @@ static int
native_mutex_unlock(rb_thread_lock_t *lock)
{
#if USE_WIN32_MUTEX
- thread_debug("release mutex: %p\n", *lock);
- return ReleaseMutex(*lock);
+ thread_debug("release mutex: %p\n", lock->mutex);
+ return ReleaseMutex(lock->mutex);
#else
- LeaveCriticalSection(lock);
+ LeaveCriticalSection(&lock->crit);
return 0;
#endif
}
@@ -364,8 +364,8 @@ native_mutex_trylock(rb_thread_lock_t *lock)
{
#if USE_WIN32_MUTEX
int result;
- thread_debug("native_mutex_trylock: %p\n", *lock);
- result = w32_wait_events(&*lock, 1, 1, 0);
+ thread_debug("native_mutex_trylock: %p\n", lock->mutex);
+ result = w32_wait_events(&lock->mutex, 1, 1, 0);
thread_debug("native_mutex_trylock result: %d\n", result);
switch (result) {
case WAIT_OBJECT_0:
@@ -375,7 +375,7 @@ native_mutex_trylock(rb_thread_lock_t *lock)
}
return EINVAL;
#else
- return TryEnterCriticalSection(lock) == 0;
+ return TryEnterCriticalSection(&lock->crit) == 0;
#endif
}
@@ -383,10 +383,10 @@ static void
native_mutex_initialize(rb_thread_lock_t *lock)
{
#if USE_WIN32_MUTEX
- *lock = w32_mutex_create();
- /* thread_debug("initialize mutex: %p\n", *lock); */
+ lock->mutex = w32_mutex_create();
+ /* thread_debug("initialize mutex: %p\n", lock->mutex); */
#else
- InitializeCriticalSection(lock);
+ InitializeCriticalSection(&lock->crit);
#endif
}
@@ -394,9 +394,9 @@ static void
native_mutex_destroy(rb_thread_lock_t *lock)
{
#if USE_WIN32_MUTEX
- w32_close_handle(*lock);
+ w32_close_handle(lock->mutex);
#else
- DeleteCriticalSection(lock);
+ DeleteCriticalSection(&lock->crit);
#endif
}
diff --git a/thread_win32.h b/thread_win32.h
index 4098a42..9c1c467 100644
--- a/thread_win32.h
+++ b/thread_win32.h
@@ -22,7 +22,12 @@ WINBASEAPI BOOL WINAPI
TryEnterCriticalSection(IN OUT LPCRITICAL_SECTION lpCriticalSection);
typedef HANDLE rb_thread_id_t;
-typedef CRITICAL_SECTION rb_thread_lock_t;
+
+typedef union rb_thread_lock_union {
+ HANDLE mutex;
+ CRITICAL_SECTION crit;
+} rb_thread_lock_t;
+
typedef struct rb_thread_cond_struct {
struct cond_event_entry *next;
struct cond_event_entry *prev;