diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-20 22:11:56 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-20 22:11:56 +0000 |
| commit | fdcac09849a7644618a202215a2615f1f029b48b (patch) | |
| tree | 8f159f32393bbf032ed13c72c857587981e66568 /thread_pthread.c | |
| parent | ea6044ea364bbf5a89ee203182f1b093f20c51b3 (diff) | |
* backport r32579, r32581, r32587 by akr and r32588 by kazu.
r32579:
* io.c (rb_update_max_fd): new function.
* internal.h (rb_update_max_fd): declare rb_update_max_fd.
* thread_pthread.c (rb_thread_create_timer_thread): update max fd when
timer thread pipe is created.
r32581:
* io.c (UPDATE_MAXFD): removed.
r32587:
* include/ruby/intern.h (rb_update_max_fd): declaration moved from
internal.h.
* file.c: ditto.
* io.c: call rb_update_max_fd for each new fds.
* process.c: ditto.
* random.c: ditto.
* ruby.c: ditto.
* ext/io/console/console.c: ditto.
* ext/openssl/ossl_bio.c: ditto.
* ext/pty/pty.c: ditto.
* ext/socket/init.c: ditto.
* ext/socket/socket.c: ditto.
* ext/socket/ancdata.c: ditto.
* ext/socket/unixsocket.c: ditto.
r32588:
* io.c (rb_update_max_fd): remove parentheses. they are not in
macro.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
| -rw-r--r-- | thread_pthread.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index 7c486ab11f..e475859567 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1193,6 +1193,8 @@ rb_thread_create_timer_thread(void) 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]); #if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(F_SETFL) { int oflags; |