aboutsummaryrefslogtreecommitdiffstats
path: root/thread_win32.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-05 13:22:29 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-05 13:22:29 +0000
commit6bbbf9889d8638b6b11e199b1cb0ec15a7170a13 (patch)
tree2563d20c5166b07c3bbf58d7e2e4f57668877618 /thread_win32.c
parent2ca7298386fe83c2477870b7020dca593b865733 (diff)
downloadruby-6bbbf9889d8638b6b11e199b1cb0ec15a7170a13.tar.gz
* thread.c (thread_initialize): NUM2INT() returns int.
* thread.c (timer_thread_function), thread_pthread.c (thread_timer), thread_win32.c (timer_thread_func), thread_{pthread,win32}.c (rb_thread_create_timer_thread): passing VM. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_win32.c')
-rw-r--r--thread_win32.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/thread_win32.c b/thread_win32.c
index 8365ff2569..98fcb8d375 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -537,8 +537,6 @@ ubf_handle(void *ptr)
w32_set_event(th->native_thread_data.interrupt_event);
}
-static void timer_thread_function(void);
-
static HANDLE timer_thread_id = 0;
static unsigned long _stdcall
@@ -547,7 +545,7 @@ timer_thread_func(void *dummy)
thread_debug("timer_thread\n");
while (system_working) {
Sleep(WIN32_WAIT_TIMEOUT);
- timer_thread_function();
+ timer_thread_function(dummy);
}
thread_debug("timer killed\n");
return 0;
@@ -557,7 +555,7 @@ void
rb_thread_create_timer_thread(void)
{
if (timer_thread_id == 0) {
- timer_thread_id = w32_create_thread(1024, timer_thread_func, 0);
+ timer_thread_id = w32_create_thread(1024, timer_thread_func, GET_VM());
w32_resume_thread(timer_thread_id);
}
}