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

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

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-03-15 02:00:15 +00:00
parent 28398e91f1
commit 731504b4d3
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sun Mar 15 11:00:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (load_file_internal): stop the timer thread before exec.
Sun Mar 15 09:17:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Mar 15 09:17:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (.y.c): use SRC_FILE which contains slashes instead of * common.mk (.y.c): use SRC_FILE which contains slashes instead of

2
ruby.c
View File

@ -1499,6 +1499,7 @@ load_file_internal(VALUE arg)
return 0; return 0;
if ((p = strstr(RSTRING_PTR(line), "ruby")) == 0) { if ((p = strstr(RSTRING_PTR(line), "ruby")) == 0) {
void rb_thread_stop_timer_thread(void);
/* not ruby script, kick the program */ /* not ruby script, kick the program */
char **argv; char **argv;
char *path; char *path;
@ -1525,6 +1526,7 @@ load_file_internal(VALUE arg)
argv = origarg.argv; argv = origarg.argv;
} }
argv[0] = path; argv[0] = path;
rb_thread_stop_timer_thread();
execv(path, argv); execv(path, argv);
rb_fatal("Can't exec %s", path); rb_fatal("Can't exec %s", path);