1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

thread_pthread.c: fix non-sleepy timer-thread with fork

Browse Source 
This fixes bootstraptest/test_fork.rb for systems with
sleepy timer thread disabled.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-06-20 23:38:21 +00:00
parent 6c83a3ab60
commit 48efa44719
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
thread_pthread.c
View File

@ -975,7 +975,6 @@ native_thread_create(rb_thread_t *th)
return err; return err;
} }
#if USE_SLEEPY_TIMER_THREAD
static void static void
native_thread_join(pthread_t th) native_thread_join(pthread_t th)
{ {
@ -984,8 +983,6 @@ native_thread_join(pthread_t th)
rb_raise(rb_eThreadError, "native_thread_join() failed (%d)", err); rb_raise(rb_eThreadError, "native_thread_join() failed (%d)", err);
} }
} }
#endif
#if USE_NATIVE_THREAD_PRIORITY #if USE_NATIVE_THREAD_PRIORITY
@ -1622,8 +1619,8 @@ native_stop_timer_thread(void)
stopped = --system_working <= 0; stopped = --system_working <= 0;
if (TT_DEBUG) fprintf(stderr, "stop timer thread\n"); if (TT_DEBUG) fprintf(stderr, "stop timer thread\n");
#if USE_SLEEPY_TIMER_THREAD
if (stopped) { if (stopped) {
#if USE_SLEEPY_TIMER_THREAD
/* prevent wakeups from signal handler ASAP */ /* prevent wakeups from signal handler ASAP */
timer_thread_pipe.owner_process = 0; timer_thread_pipe.owner_process = 0;
@ -1639,18 +1636,20 @@ native_stop_timer_thread(void)
/* stop writing ends of pipes so timer thread notices EOF */ /* stop writing ends of pipes so timer thread notices EOF */
CLOSE_INVALIDATE(normal[1]); CLOSE_INVALIDATE(normal[1]);
CLOSE_INVALIDATE(low[1]); CLOSE_INVALIDATE(low[1]);
#endif
/* timer thread will stop looping when system_working <= 0: */ /* timer thread will stop looping when system_working <= 0: */
native_thread_join(timer_thread.id); native_thread_join(timer_thread.id);
#if USE_SLEEPY_TIMER_THREAD
/* timer thread will close the read end on exit: */ /* timer thread will close the read end on exit: */
VM_ASSERT(timer_thread_pipe.normal[0] == -1); VM_ASSERT(timer_thread_pipe.normal[0] == -1);
VM_ASSERT(timer_thread_pipe.low[0] == -1); VM_ASSERT(timer_thread_pipe.low[0] == -1);
#endif
if (TT_DEBUG) fprintf(stderr, "joined timer thread\n"); if (TT_DEBUG) fprintf(stderr, "joined timer thread\n");
timer_thread.created = 0; timer_thread.created = 0;
} }
#endif
return stopped; return stopped;
} }