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

* thread.c (rb_threadptr_interrupt_mask, async_interrupt_timing_func):

Browse Source 
merge into them into rb_thread_s_async_interrupt_timing.
* thread.c (rb_thread_s_async_interrupt_timing): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2012-11-30 17:39:59 +00:00
parent 279cd29b1b
commit a113ab64b2
2 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Dec 1 02:33:20 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread.c (rb_threadptr_interrupt_mask, async_interrupt_timing_func):
merge into them into rb_thread_s_async_interrupt_timing.
* thread.c (rb_thread_s_async_interrupt_timing): ditto.
Sat Dec 1 02:11:47 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Sat Dec 1 02:11:47 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread.c (rb_threadptr_interrupt_mask): add argument check. * thread.c (rb_threadptr_interrupt_mask): add argument check.

76
thread.c
View File

@ -1559,40 +1559,6 @@ async_interrupt_timing_arg_check_i(VALUE key, VALUE val)
return ST_CONTINUE; return ST_CONTINUE;
} }
static VALUE
rb_threadptr_interrupt_mask(rb_thread_t *th, VALUE mask, VALUE (*func)(rb_thread_t *th))
{
VALUE r = Qnil;
int state;
rb_hash_foreach(mask, async_interrupt_timing_arg_check_i, 0);
rb_ary_push(th->async_errinfo_mask_stack, mask);
if (!rb_threadptr_async_errinfo_empty_p(th)) {
th->async_errinfo_queue_checked = 0;
RUBY_VM_SET_INTERRUPT(th);
}
TH_PUSH_TAG(th);
if ((state = EXEC_TAG()) == 0) {
r = func(th);
}
TH_POP_TAG();
rb_ary_pop(th->async_errinfo_mask_stack);
if (!rb_threadptr_async_errinfo_empty_p(th)) {
th->async_errinfo_queue_checked = 0;
RUBY_VM_SET_INTERRUPT(th);
}
if (state) {
JUMP_TAG(state);
}
RUBY_VM_CHECK_INTS(th);
return r;
}
/* /*
* call-seq: * call-seq:
* Thread.async_interrupt_timing(hash) { ... } -> result of the block * Thread.async_interrupt_timing(hash) { ... } -> result of the block
@ -1673,23 +1639,45 @@ rb_threadptr_interrupt_mask(rb_thread_t *th, VALUE mask, VALUE (*func)(rb_thread
* } * }
* *
*/ */
static VALUE
async_interrupt_timing_func(rb_thread_t *th)
{
return rb_yield(Qnil);
}
static VALUE static VALUE
rb_thread_s_async_interrupt_timing(VALUE self, VALUE mask_arg) rb_thread_s_async_interrupt_timing(VALUE self, VALUE mask_arg)
{ {
VALUE mask;
rb_thread_t *th = GET_THREAD();
VALUE r = Qnil;
int state;
if (!rb_block_given_p()) { if (!rb_block_given_p()) {
rb_raise(rb_eArgError, "block is needed."); rb_raise(rb_eArgError, "block is needed.");
} }
return rb_threadptr_interrupt_mask(GET_THREAD(), mask = rb_convert_type(mask_arg, T_HASH, "Hash", "to_hash");
rb_convert_type(mask_arg, T_HASH, "Hash", "to_hash"), rb_hash_foreach(mask, async_interrupt_timing_arg_check_i, 0);
async_interrupt_timing_func); rb_ary_push(th->async_errinfo_mask_stack, mask);
if (!rb_threadptr_async_errinfo_empty_p(th)) {
th->async_errinfo_queue_checked = 0;
RUBY_VM_SET_INTERRUPT(th);
}
TH_PUSH_TAG(th);
if ((state = EXEC_TAG()) == 0) {
r = rb_yield(Qnil);
}
TH_POP_TAG();
rb_ary_pop(th->async_errinfo_mask_stack);
if (!rb_threadptr_async_errinfo_empty_p(th)) {
th->async_errinfo_queue_checked = 0;
RUBY_VM_SET_INTERRUPT(th);
}
if (state) {
JUMP_TAG(state);
}
RUBY_VM_CHECK_INTS(th);
return r;
} }
/* /*