nobu	2009-03-15 11:00:15 +0900 (Sun, 15 Mar 2009)

  New Revision: 22965

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22965

  Log:
    * ruby.c (load_file_internal): stop the timer thread before exec.

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22964)
+++ ChangeLog	(revision 22965)
@@ -1,3 +1,7 @@
+Sun Mar 15 11:00:14 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ruby.c (load_file_internal): stop the timer thread before exec.
+
 Sun Mar 15 09:17:26 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (.y.c): use SRC_FILE which contains slashes instead of
Index: ruby.c
===================================================================
--- ruby.c	(revision 22964)
+++ ruby.c	(revision 22965)
@@ -1499,6 +1499,7 @@
 		    return 0;
 
 		if ((p = strstr(RSTRING_PTR(line), "ruby")) == 0) {
+		    void rb_thread_stop_timer_thread(void);
 		    /* not ruby script, kick the program */
 		    char **argv;
 		    char *path;
@@ -1525,6 +1526,7 @@
 			argv = origarg.argv;
 		    }
 		    argv[0] = path;
+		    rb_thread_stop_timer_thread();
 		    execv(path, argv);
 
 		    rb_fatal("Can't exec %s", path);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/