diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-05 13:22:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-05 13:22:29 +0000 |
| commit | 6bbbf9889d8638b6b11e199b1cb0ec15a7170a13 (patch) | |
| tree | 2563d20c5166b07c3bbf58d7e2e4f57668877618 /thread_pthread.c | |
| parent | 2ca7298386fe83c2477870b7020dca593b865733 (diff) | |
| download | ruby-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_pthread.c')
| -rw-r--r-- | thread_pthread.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index bcab6acddb..55e7238d2d 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -641,7 +641,6 @@ remove_signal_thread_list(rb_thread_t *th) } static pthread_t timer_thread_id; -static void timer_thread_function(void); static void * thread_timer(void *dummy) @@ -670,7 +669,7 @@ thread_timer(void *dummy) }); } #endif - timer_thread_function(); + timer_thread_function(dummy); } return NULL; } @@ -688,7 +687,7 @@ rb_thread_create_timer_thread(void) #ifdef PTHREAD_STACK_MIN pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN); #endif - err = pthread_create(&timer_thread_id, &attr, thread_timer, 0); + err = pthread_create(&timer_thread_id, &attr, thread_timer, GET_VM()); if (err != 0) { rb_bug("rb_thread_create_timer_thread: return non-zero (%d)", err); } |