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

* thread_pthread.c (rb_thread_create_timer_thread): factor out

Browse Source 
creating communication pipe logic into separate function.
* thread_pthread.c (setup_communication_pipe): new helper function.
* thread_pthread.c (set_nonblock): moves a definition before
  setup_communication_pipe.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39683 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2013-03-10 03:59:49 +00:00
parent 368fdf9cc1
commit 383a2579c3
3 changed files with 81 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Wed Mar 6 21:42:24 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread_pthread.c (rb_thread_create_timer_thread): factor out
creating communication pipe logic into separate function.
* thread_pthread.c (setup_communication_pipe): new helper function.
* thread_pthread.c (set_nonblock): moves a definition before
setup_communication_pipe.
Sun Mar 3 02:42:29 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread_pthread.c (consume_communication_pipe): retry when

26
process.c
View File

@ -1079,6 +1079,32 @@ before_exec_non_async_signal_safe(void)
}
}
static void
setup_communication_pipe(void)
{
#if USE_SLEEPY_TIMER_THREAD
/* communication pipe with timer thread and signal handler */
if (timer_thread_pipe_owner_process != getpid()) {
if (timer_thread_pipe[0] != -1) {
/* close pipe of parent process */
close_communication_pipe();
}
err = rb_cloexec_pipe(timer_thread_pipe);
if (err != 0) {
rb_bug_errno("thread_timer: Failed to create communication pipe for timer thread", errno);
}
rb_update_max_fd(timer_thread_pipe[0]);
rb_update_max_fd(timer_thread_pipe[1]);
set_nonblock(timer_thread_pipe[0]);
set_nonblock(timer_thread_pipe[1]);
/* validate pipe on this process */
timer_thread_pipe_owner_process = getpid();
}
#endif /* USE_SLEEPY_TIMER_THREAD */
}
static void
before_exec(void)
{

85
thread_pthread.c
View File

@ -1216,6 +1216,52 @@ close_communication_pipe(void)
timer_thread_pipe[0] = timer_thread_pipe[1] = -1;
}
#if USE_SLEEPY_TIMER_THREAD
static void
set_nonblock(int fd)
{
int oflags;
int err;
oflags = fcntl(fd, F_GETFL);
if (oflags == -1)
rb_sys_fail(0);
oflags |= O_NONBLOCK;
err = fcntl(fd, F_SETFL, oflags);
if (err == -1)
rb_sys_fail(0);
}
#endif
static void
setup_communication_pipe(void)
{
#if USE_SLEEPY_TIMER_THREAD
int err;
/* communication pipe with timer thread and signal handler */
if (timer_thread_pipe_owner_process != getpid()) {
if (timer_thread_pipe[0] != -1) {
/* close pipe of parent process */
close_communication_pipe();
}
err = rb_cloexec_pipe(timer_thread_pipe);
if (err != 0) {
rb_bug_errno("setup_communication_pipe: Failed to create communication pipe for timer thread", errno);
}
rb_update_max_fd(timer_thread_pipe[0]);
rb_update_max_fd(timer_thread_pipe[1]);
set_nonblock(timer_thread_pipe[0]);
set_nonblock(timer_thread_pipe[1]);
/* validate pipe on this process */
timer_thread_pipe_owner_process = getpid();
}
#endif /* USE_SLEEPY_TIMER_THREAD */
}
/**
* Let the timer thread sleep a while.
*
@ -1318,23 +1364,6 @@ thread_timer(void *p)
return NULL;
}
static void
set_nonblock(int fd)
{
#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(F_SETFL) && defined(O_NONBLOCK)
int oflags;
int err;
oflags = fcntl(fd, F_GETFL);
if (oflags == -1)
rb_sys_fail(0);
oflags |= O_NONBLOCK;
err = fcntl(fd, F_SETFL, oflags);
if (err == -1)
rb_sys_fail(0);
#endif
}
static void
rb_thread_create_timer_thread(void)
{
@ -1364,27 +1393,7 @@ rb_thread_create_timer_thread(void)
# endif
#endif
#if USE_SLEEPY_TIMER_THREAD
/* communication pipe with timer thread and signal handler */
if (timer_thread_pipe_owner_process != getpid()) {
if (timer_thread_pipe[0] != -1) {
/* close pipe of parent process */
close_communication_pipe();
}
err = rb_cloexec_pipe(timer_thread_pipe);
if (err != 0) {
rb_bug_errno("thread_timer: Failed to create communication pipe for timer thread", errno);
}
rb_update_max_fd(timer_thread_pipe[0]);
rb_update_max_fd(timer_thread_pipe[1]);
set_nonblock(timer_thread_pipe[0]);
set_nonblock(timer_thread_pipe[1]);
/* validate pipe on this process */
timer_thread_pipe_owner_process = getpid();
}
#endif /* USE_SLEEPY_TIMER_THREAD */
setup_communication_pipe();
/* create timer thread */
if (timer_thread_id) {