* thread.c (rb_thread_stop_timer_thread(), rb_thread_reset_timer_thread(),

  rb_thread_start_timer_thread()): added.
* thread_pthread.ci: add a native_thread_join() and move
  rb_thread_reset_timer_thread() definition to thread.c.
* thread_win32.ci: ditto
* process.c: fix before_exec(), after_exec() to stop timer thread
  (and restart timer thread if exec failed).  and fix to reset
  timer thread information when forked child process starts
  (to fix [ruby-core:09822]).



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 3 deletions

diff --git a/process.c b/process.c
index 69002fabd..25f62a632 100644
--- a/process.c
+++ b/process.c
@@ -891,8 +891,10 @@ proc_detach(VALUE obj, VALUE pid)
 char *strtok();
 #endif
 
-#define before_exec() rb_enable_interrupt()
-#define after_exec() rb_disable_interrupt()
+#define before_exec() \
+  (rb_enable_interrupt(), rb_thread_stop_timer_thread())
+#define after_exec() \
+  (rb_thread_start_timer_thread(), rb_disable_interrupt())
 
 extern char *dln_find_exe(const char *fname, const char *path);
 
@@ -1332,6 +1334,7 @@ rb_fork(int *status, int (*chfunc)(void*), void *charg)
 	}
     }
     if (!pid) {
+	rb_thread_reset_timer_thread();
 	if (chfunc) {
 #ifdef FD_CLOEXEC
 	    close(ep[0]);
@@ -1347,7 +1350,7 @@ rb_fork(int *status, int (*chfunc)(void*), void *charg)
 	    _exit(127);
 #endif
 	}
-	rb_thread_reset_timer_thread();
+	rb_thread_start_timer_thread();
     }
 #ifdef FD_CLOEXEC
     else if (chfunc) {