diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-07 06:42:50 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-07 06:42:50 +0000 |
commit | 0c56b5e4a8a99b15239ed98ef5c606aa7efdd95b (patch) | |
tree | 7eff1bcd72013a933552f6224798728a25984949 | |
parent | b65958153c553fa23420fc7262589e18baef2e52 (diff) |
* process.c (detach_process_watcher): should not pass the pointer
to an auto variable to the thread to be created. pointed and
fix by KUBO Takehiro <kubo at jiubao.org> [ruby-dev:30618]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@13383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | process.c | 13 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,9 @@ +Fri Sep 7 15:42:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * process.c (detach_process_watcher): should not pass the pointer + to an auto variable to the thread to be created. pointed and + fix by KUBO Takehiro <kubo at jiubao.org> [ruby-dev:30618] + Fri Sep 7 15:40:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep @@ -848,23 +848,22 @@ proc_waitall() } static VALUE -detach_process_watcher(pid_p) - int *pid_p; +detach_process_watcher(arg) + void *arg; { - int cpid, status; + int pid = (int)arg, status; - for (;;) { - cpid = rb_waitpid(*pid_p, &status, WNOHANG); - if (cpid != 0) return Qnil; + while (rb_waitpid(pid, &status, WNOHANG) == 0) { rb_thread_sleep(1); } + return Qnil; } VALUE rb_detach_process(pid) int pid; { - return rb_thread_create(detach_process_watcher, (void*)&pid); + return rb_thread_create(detach_process_watcher, (void*)pid); } @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-09-07" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070907 -#define RUBY_PATCHLEVEL 91 +#define RUBY_PATCHLEVEL 92 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |