kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* thread_pthread.c (set_nonblock): new helper function for set O_NONBLOCK.

Browse source 
* thread_pthread.c (rb_thread_create_timer_thread): set O_NONBLOCK
  to timer_thread_pipe[0] too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2013-03-10 03:59:07 +00:00
parent e2e374e45a
commit 5cebbe8f9b
2 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sun Mar 3 02:30:36 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread_pthread.c (set_nonblock): new helper function for set
O_NONBLOCK.
* thread_pthread.c (rb_thread_create_timer_thread): set O_NONBLOCK
to timer_thread_pipe[0] too.
Sun Mar 10 09:12:51 2013 Tadayoshi Funaba <tadf@dotrb.org> Sun Mar 10 09:12:51 2013 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c: described syntax of string form. * complex.c: described syntax of string form.

33
thread_pthread.c
View file

@ -1312,6 +1312,23 @@ thread_timer(void *p)
return NULL; 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 static void
rb_thread_create_timer_thread(void) rb_thread_create_timer_thread(void)
{ {
@ -1355,20 +1372,8 @@ rb_thread_create_timer_thread(void)
} }
rb_update_max_fd(timer_thread_pipe[0]); rb_update_max_fd(timer_thread_pipe[0]);
rb_update_max_fd(timer_thread_pipe[1]); rb_update_max_fd(timer_thread_pipe[1]);
# if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(F_SETFL) && defined(O_NONBLOCK) set_nonblock(timer_thread_pipe[0]);
{ set_nonblock(timer_thread_pipe[1]);
int oflags;
int err;
oflags = fcntl(timer_thread_pipe[1], F_GETFL);
if (oflags == -1)
rb_sys_fail(0);
oflags |= O_NONBLOCK;
err = fcntl(timer_thread_pipe[1], F_SETFL, oflags);
if (err == -1)
rb_sys_fail(0);
}
# endif /* defined(HAVE_FCNTL) && defined(F_GETFL) && defined(F_SETFL) */
/* validate pipe on this process */ /* validate pipe on this process */
timer_thread_pipe_owner_process = getpid(); timer_thread_pipe_owner_process = getpid();