Permalink
Browse files

* 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
  • Loading branch information...
1 parent 690e065 commit bd21118627cbf27f678fc6386e8c7effe67f4cdd @wanabe wanabe committed May 5, 2010
Showing with 18 additions and 9 deletions.
  1. +5 −0 ChangeLog
  2. +13 −9 thread_win32.c
View
@@ -1,3 +1,8 @@
+Wed May 5 20:37:54 2010 wanabe <s.wanabe@gmail.com>
+
+ * thread_win32.c (w32_wait_events): get GVL before handle interrupt
+ event. [ruby-core:27199], [ruby-core:29698]
+
Wed May 5 19:00:01 2010 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/extconf.rb: revert. enbugged by last commit.
View
@@ -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);

0 comments on commit bd21118

Please sign in to comment.