diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-04 08:01:27 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-04 08:01:27 +0000 |
| commit | 75b4c8f490a882619e83a448c0a23fdd64080202 (patch) | |
| tree | 07dcd6a522df7cd5d3191dc4bfdd41142562620a /thread_pthread.c | |
| parent | 360edb1c04dfc7552dc053d837a8320c46910147 (diff) | |
* thread_pthread.c: Fixes wrong scopes of #if USE_SLEEPY_TIMER_THREAD
.. #endif sections. This fixes a build error on NativeClient.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
| -rw-r--r-- | thread_pthread.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index 7937cc9834..8953f5ece8 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1241,7 +1241,6 @@ close_communication_pipe(int pipes[2]) pipes[0] = pipes[1] = -1; } -#if USE_SLEEPY_TIMER_THREAD static void set_nonblock(int fd) { @@ -1256,9 +1255,7 @@ set_nonblock(int fd) if (err == -1) rb_sys_fail(0); } -#endif -#if USE_SLEEPY_TIMER_THREAD static void setup_communication_pipe_internal(int pipes[2]) { @@ -1278,13 +1275,11 @@ setup_communication_pipe_internal(int pipes[2]) set_nonblock(pipes[0]); set_nonblock(pipes[1]); } -#endif /* USE_SLEEPY_TIMER_THREAD */ /* communication pipe with timer thread and signal handler */ static void setup_communication_pipe(void) { -#if USE_SLEEPY_TIMER_THREAD if (timer_thread_pipe_owner_process == getpid()) { /* already set up. */ return; @@ -1294,7 +1289,6 @@ setup_communication_pipe(void) /* validate pipe on this process */ timer_thread_pipe_owner_process = getpid(); -#endif /* USE_SLEEPY_TIMER_THREAD */ } /** @@ -1349,6 +1343,7 @@ timer_thread_sleep(rb_global_vm_lock_t* gvl) #else /* USE_SLEEPY_TIMER_THREAD */ # define PER_NANO 1000000000 void rb_thread_wakeup_timer_thread(void) {} +static void rb_thread_wakeup_timer_thread_low(void) {} static pthread_mutex_t timer_thread_lock; static rb_thread_cond_t timer_thread_cond; @@ -1431,7 +1426,9 @@ rb_thread_create_timer_thread(void) # endif #endif +#if USE_SLEEPY_TIMER_THREAD setup_communication_pipe(); +#endif /* USE_SLEEPY_TIMER_THREAD */ /* create timer thread */ if (timer_thread_id) { |