diff options
| author | wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-05 11:53:03 +0000 |
|---|---|---|
| committer | wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-05 11:53:03 +0000 |
| commit | bd21118627cbf27f678fc6386e8c7effe67f4cdd (patch) | |
| tree | 5d736815260f04b0891d5f79e711403e029898b3 /thread_win32.c | |
| parent | 690e065bf899fa18e7d4c7fa6a645236fb328e23 (diff) | |
* thread_win32.c (w32_wait_events): get GVL before handle interrupt
event. [ruby-core:27199], [ruby-core:29698]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_win32.c')
| -rw-r--r-- | thread_win32.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/thread_win32.c b/thread_win32.c index ab641b89b0..ec5a4e8769 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -103,16 +103,20 @@ w32_wait_events(HANDLE *events, int count, DWORD timeout, rb_thread_t *th) thread_debug(" w32_wait_events events:%p, count:%d, timeout:%ld, th:%p\n", events, count, timeout, th); if (th && (intr = th->native_thread_data.interrupt_event)) { - w32_reset_event(intr); - if (RUBY_VM_INTERRUPTED(th)) { - w32_set_event(intr); + native_mutex_lock(&th->vm->global_vm_lock); + if (intr == th->native_thread_data.interrupt_event) { + w32_reset_event(intr); + if (RUBY_VM_INTERRUPTED(th)) { + w32_set_event(intr); + } + + targets = ALLOCA_N(HANDLE, count + 1); + memcpy(targets, events, sizeof(HANDLE) * count); + + targets[count++] = intr; + thread_debug(" * handle: %p (count: %d, intr)\n", intr, count); } - - targets = ALLOCA_N(HANDLE, count + 1); - memcpy(targets, events, sizeof(HANDLE) * count); - - targets[count++] = intr; - thread_debug(" * handle: %p (count: %d, intr)\n", intr, count); + native_mutex_unlock(&th->vm->global_vm_lock); } thread_debug(" WaitForMultipleObjects start (count: %d)\n", count); |