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

* process.c (rb_detach_process): store detached process ID in the

Browse Source 
thread local storage.  moved from lib/open3.rb.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-06-20 03:40:02 +00:00
parent 79bb49b61b
commit a54cbe65a9
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jun 20 12:39:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (rb_detach_process): store detached process ID in the
thread local storage. moved from lib/open3.rb.
Fri Jun 20 11:57:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Fri Jun 20 11:57:46 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_sub_bang): should preserve replacement points * string.c (rb_str_sub_bang): should preserve replacement points

1
lib/open3.rb
View File

@ -66,7 +66,6 @@ module Open3
pid = spawn(*cmd, STDIN=>pw[0], STDOUT=>pr[1], STDERR=>pe[1]) pid = spawn(*cmd, STDIN=>pw[0], STDOUT=>pr[1], STDERR=>pe[1])
wait_thr = Process.detach(pid) wait_thr = Process.detach(pid)
wait_thr[:pid] = pid
pw[0].close pw[0].close
pr[1].close pr[1].close
pe[1].close pe[1].close

19
process.c
View File

@ -885,6 +885,20 @@ proc_waitall(void)
return result; return result;
} }
static inline ID
id_pid(void)
{
ID pid;
CONST_ID(pid, "pid");
return pid;
}
static VALUE
detach_process_pid(VALUE thread)
{
return rb_thread_local_aref(thread, id_pid());
}
static VALUE static VALUE
detach_process_watcher(void *arg) detach_process_watcher(void *arg)
{ {
@ -900,7 +914,10 @@ detach_process_watcher(void *arg)
VALUE VALUE
rb_detach_process(rb_pid_t pid) rb_detach_process(rb_pid_t pid)
{ {
return rb_thread_create(detach_process_watcher, (void*)(VALUE)pid); VALUE watcher = rb_thread_create(detach_process_watcher, (void*)(VALUE)pid);
rb_thread_local_aset(watcher, id_pid(), PIDT2NUM(pid));
rb_define_singleton_method(watcher, "pid", detach_process_pid, 0);
return watcher;
} }