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

  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

3 files changed, 23 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 501d439e29..48e976557a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* string.c (rb_str_sub_bang): should preserve replacement points
diff --git a/lib/open3.rb b/lib/open3.rb
index f707f55409..d776de7445 100644
--- a/lib/open3.rb
+++ b/lib/open3.rb
@@ -66,7 +66,6 @@ module Open3
 
     pid = spawn(*cmd, STDIN=>pw[0], STDOUT=>pr[1], STDERR=>pe[1])
     wait_thr = Process.detach(pid)
-    wait_thr[:pid] = pid
     pw[0].close
     pr[1].close
     pe[1].close
diff --git a/process.c b/process.c
index ee0bbaf4d5..94dc712c8f 100644
--- a/process.c
+++ b/process.c
@@ -885,6 +885,20 @@ proc_waitall(void)
     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
 detach_process_watcher(void *arg)
 {
@@ -900,7 +914,10 @@ detach_process_watcher(void *arg)
 VALUE
 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;
 }