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

eval.c backout.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2001-10-09 14:56:15 +00:00
parent 9383505c40
commit 14129c8fa3
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
eval.c
View File

@ -8026,8 +8026,8 @@ rb_thread_run(thread)
} }
static VALUE static VALUE
thread_kill(thread, result) rb_thread_kill(thread)
VALUE thread, result; VALUE thread;
{ {
rb_thread_t th = rb_thread_check(thread); rb_thread_t th = rb_thread_check(thread);
@ -8041,18 +8041,10 @@ thread_kill(thread, result)
rb_thread_ready(th); rb_thread_ready(th);
th->gid = 0; th->gid = 0;
th->status = THREAD_TO_KILL; th->status = THREAD_TO_KILL;
th->result = result;
if (!rb_thread_critical) rb_thread_schedule(); if (!rb_thread_critical) rb_thread_schedule();
return thread; return thread;
} }
static VALUE
rb_thread_kill(th)
VALUE th;
{
return thread_kill(th, Qfalse);
}
static VALUE static VALUE
rb_thread_s_kill(obj, th) rb_thread_s_kill(obj, th)
VALUE obj, th; VALUE obj, th;
@ -8061,23 +8053,9 @@ rb_thread_s_kill(obj, th)
} }
static VALUE static VALUE
rb_thread_exit(argc, argv, th) rb_thread_exit()
int argc;
VALUE *argv;
VALUE th;
{ {
VALUE result = Qfalse; return rb_thread_kill(curr_thread->thread);
rb_scan_args(argc, argv, "01", &result);
return rb_thread_kill(th, result);
}
static VALUE
rb_thread_s_exit(argc, argv)
int argc;
VALUE *argv;
{
return rb_thread_exit(argc, argv, curr_thread->thread);
} }
static VALUE static VALUE
@ -8983,7 +8961,7 @@ Init_Thread()
rb_define_singleton_method(rb_cThread, "stop", rb_thread_stop, 0); rb_define_singleton_method(rb_cThread, "stop", rb_thread_stop, 0);
rb_define_singleton_method(rb_cThread, "kill", rb_thread_s_kill, 1); rb_define_singleton_method(rb_cThread, "kill", rb_thread_s_kill, 1);
rb_define_singleton_method(rb_cThread, "exit", rb_thread_s_exit, -1); rb_define_singleton_method(rb_cThread, "exit", rb_thread_exit, 0);
rb_define_singleton_method(rb_cThread, "pass", rb_thread_pass, 0); rb_define_singleton_method(rb_cThread, "pass", rb_thread_pass, 0);
rb_define_singleton_method(rb_cThread, "current", rb_thread_current, 0); rb_define_singleton_method(rb_cThread, "current", rb_thread_current, 0);
rb_define_singleton_method(rb_cThread, "main", rb_thread_main, 0); rb_define_singleton_method(rb_cThread, "main", rb_thread_main, 0);
@ -8998,7 +8976,7 @@ Init_Thread()
rb_define_method(rb_cThread, "run", rb_thread_run, 0); rb_define_method(rb_cThread, "run", rb_thread_run, 0);
rb_define_method(rb_cThread, "wakeup", rb_thread_wakeup, 0); rb_define_method(rb_cThread, "wakeup", rb_thread_wakeup, 0);
rb_define_method(rb_cThread, "kill", rb_thread_kill, 0); rb_define_method(rb_cThread, "kill", rb_thread_kill, 0);
rb_define_method(rb_cThread, "exit", rb_thread_exit, -1); rb_define_method(rb_cThread, "exit", rb_thread_kill, 0);
rb_define_method(rb_cThread, "value", rb_thread_value, 0); rb_define_method(rb_cThread, "value", rb_thread_value, 0);
rb_define_method(rb_cThread, "status", rb_thread_status, 0); rb_define_method(rb_cThread, "status", rb_thread_status, 0);
rb_define_method(rb_cThread, "join", rb_thread_join, 0); rb_define_method(rb_cThread, "join", rb_thread_join, 0);