kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Native MonitorMixin::ConditionVariable#wait

Browse source 
MonitorMixin::ConditionVariable#wait can be interrupted just after
Monitor#exit_for_cond. So implementation in C.
This commit is contained in:
Koichi Sasada 2019-10-20 15:45:30 +09:00
parent a0a3c70181
commit a236eaa762
2 changed files with 43 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/monitor/lib/monitor.rb
View file

@ -105,13 +105,7 @@ module MonitorMixin
# #
def wait(timeout = nil) def wait(timeout = nil)
@monitor.mon_check_owner @monitor.mon_check_owner
count = @monitor.__send__(:exit_for_cond) @monitor.wait_for_cond(@cond, timeout)
begin
@cond.wait(@monitor.__send__(:mutex_for_cond), timeout)
return true
ensure
@monitor.__send__(:enter_for_cond, count)
end
end end
# #

57
ext/monitor/monitor.c
View file

@ -121,15 +121,6 @@ monitor_check_owner(VALUE monitor)
return Qnil; return Qnil;
} }
static VALUE
monitor_enter_for_cond(VALUE monitor, VALUE count)
{
struct rb_monitor *mc = monitor_ptr(monitor);
RB_OBJ_WRITE(monitor, &mc->owner, rb_thread_current());
mc->count = NUM2LONG(count);
return Qnil;
}
static VALUE static VALUE
monitor_exit_for_cond(VALUE monitor) monitor_exit_for_cond(VALUE monitor)
{ {
@ -140,11 +131,49 @@ monitor_exit_for_cond(VALUE monitor)
return LONG2NUM(cnt); return LONG2NUM(cnt);
} }
struct wait_for_cond_data {
VALUE monitor;
VALUE cond;
VALUE timeout;
VALUE count;
};
static VALUE static VALUE
monitor_mutex_for_cond(VALUE monitor) monitor_wait_for_cond_body(VALUE v)
{ {
struct rb_monitor *mc = monitor_ptr(monitor); struct wait_for_cond_data *data = (struct wait_for_cond_data *)v;
return mc->mutex; struct rb_monitor *mc = monitor_ptr(data->monitor);
// cond.wait(monitor.mutex, timeout)
rb_funcall(data->cond, rb_intern("wait"), 2, mc->mutex, data->timeout);
return Qtrue;
}
static VALUE
monitor_enter_for_cond(VALUE v)
{
// assert(rb_mutex_owned_p(mc->mutex) == Qtrue)
// but rb_mutex_owned_p is not exported...
struct wait_for_cond_data *data = (struct wait_for_cond_data *)v;
struct rb_monitor *mc = monitor_ptr(data->monitor);
RB_OBJ_WRITE(data->monitor, &mc->owner, rb_thread_current());
mc->count = NUM2LONG(data->count);
return Qnil;
}
static VALUE
monitor_wait_for_cond(VALUE monitor, VALUE cond, VALUE timeout)
{
VALUE count = monitor_exit_for_cond(monitor);
struct wait_for_cond_data data = {
monitor,
cond,
timeout,
count,
};
return rb_ensure(monitor_wait_for_cond_body, (VALUE)&data,
monitor_enter_for_cond, (VALUE)&data);
} }
static VALUE static VALUE
@ -183,7 +212,5 @@ Init_monitor(void)
rb_define_method(rb_cMonitor, "mon_owned?", monitor_owned_p, 0); rb_define_method(rb_cMonitor, "mon_owned?", monitor_owned_p, 0);
/* internal methods for MonitorMixin::ConditionalVariable */ /* internal methods for MonitorMixin::ConditionalVariable */
rb_define_private_method(rb_cMonitor, "enter_for_cond", monitor_enter_for_cond, 1); rb_define_method(rb_cMonitor, "wait_for_cond", monitor_wait_for_cond, 2);
rb_define_private_method(rb_cMonitor, "exit_for_cond", monitor_exit_for_cond, 0);
rb_define_private_method(rb_cMonitor, "mutex_for_cond", monitor_mutex_for_cond, 0);
} }