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

* thread.c (thread_raise_m): check interrupts after Thread#raise

Browse Source 
if a target thread is the current thread because the behavior
  of Thread.current.raise is expected to perform same as
  Kernel.raise (by rubyspec).



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2012-10-23 13:37:45 +00:00
parent 357a5f5ab5
commit 479d8ce5b5
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Oct 23 22:34:49 2012 Koichi Sasada <ko1@atdot.net>
* thread.c (thread_raise_m): check interrupts after Thread#raise
if a target thread is the current thread because the behavior
of Thread.current.raise is expected to perform same as
Kernel.raise (by rubyspec).
Tue Oct 23 17:08:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Oct 23 17:08:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (usage, process_options): show more info in --help. * ruby.c (usage, process_options): show more info in --help.

12
thread.c
View File

@ -1894,9 +1894,15 @@ rb_thread_fd_close(int fd)
static VALUE static VALUE
thread_raise_m(int argc, VALUE *argv, VALUE self) thread_raise_m(int argc, VALUE *argv, VALUE self)
{ {
rb_thread_t *th; rb_thread_t *target_th;
GetThreadPtr(self, th); rb_thread_t *th = GET_THREAD();
rb_threadptr_raise(th, argc, argv); GetThreadPtr(self, target_th);
rb_threadptr_raise(target_th, argc, argv);
/* To perform Thread.current.raise as Kernel.raise */
if (th == target_th) {
RUBY_VM_CHECK_INTS(th);
}
return Qnil; return Qnil;
} }