From 8ecd3b7114d6c0b81c0165dd0defa8f3df261d0b Mon Sep 17 00:00:00 2001 From: kosaki Date: Sun, 14 Jun 2015 22:52:01 +0000 Subject: * thread.c (thread_start_func_2): don't interrupt when last thread exit unless main thread is already exited. Otherwise main thread could be wrongly interrupted when it uses rb_thread_call_without_gvl(). Patch by Takehiro Kubo. [Bug #11237][ruby-dev:49044][GH-898] * test/-ext-/gvl/test_last_thread.rb: new test for the above fix. * ext/-test-/gvl/call_without_gvl/call_without_gvl.c: new ext for the above test. * ext/-test-/gvl/call_without_gvl/extconf.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/-test-/gvl/call_without_gvl/call_without_gvl.c | 35 ++++++++++++++++++++++ ext/-test-/gvl/call_without_gvl/extconf.rb | 1 + 2 files changed, 36 insertions(+) create mode 100644 ext/-test-/gvl/call_without_gvl/call_without_gvl.c create mode 100644 ext/-test-/gvl/call_without_gvl/extconf.rb (limited to 'ext/-test-') diff --git a/ext/-test-/gvl/call_without_gvl/call_without_gvl.c b/ext/-test-/gvl/call_without_gvl/call_without_gvl.c new file mode 100644 index 0000000000..0ee64a24ac --- /dev/null +++ b/ext/-test-/gvl/call_without_gvl/call_without_gvl.c @@ -0,0 +1,35 @@ +#include "ruby/ruby.h" +#include "ruby/thread.h" +#include + +static void* +native_sleep_callback(void *data) +{ + struct timeval *timeval = data; + select(0, NULL, NULL, NULL, timeval); + + return NULL; +} + + +static VALUE +thread_runnable_sleep(VALUE thread, VALUE timeout) +{ + struct timeval timeval; + + if (NIL_P(timeout)) { + rb_raise(rb_eArgError, "timeout must be non nil"); + } + + timeval = rb_time_interval(timeout); + + rb_thread_call_without_gvl(native_sleep_callback, &timeval, RUBY_UBF_IO, NULL); + + return thread; +} + +void +Init_call_without_gvl(void) +{ + rb_define_method(rb_cThread, "__runnable_sleep__", thread_runnable_sleep, 1); +} diff --git a/ext/-test-/gvl/call_without_gvl/extconf.rb b/ext/-test-/gvl/call_without_gvl/extconf.rb new file mode 100644 index 0000000000..601944c9e5 --- /dev/null +++ b/ext/-test-/gvl/call_without_gvl/extconf.rb @@ -0,0 +1 @@ +create_makefile("-test-/gvl/call_without_gvl") -- cgit v1.2.3