From 7f1529e9808189ad074f8748cd7f3e7272cfe13b Mon Sep 17 00:00:00 2001 From: normal Date: Sun, 7 May 2017 04:26:37 +0000 Subject: variable.c: cleanup waitq upon thread death * variable.c (autoload_reset): use idempotent list_del_init (autoload_sleep): moved code from rb_autoload_load (autoload_sleep_done): cleanup for use with rb_ensure (rb_autoload_load): ensure list delete happens in case the thread dies during sleep * test/ruby/bug-13526.rb: new script for separate execution * test/ruby/test_autoload.rb (test_bug_13526): new test [ruby-core:81016] [Bug #13526] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- variable.c | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) (limited to 'variable.c') diff --git a/variable.c b/variable.c index cfc987eb9e..6e883c7041 100644 --- a/variable.c +++ b/variable.c @@ -2095,7 +2095,7 @@ autoload_reset(VALUE arg) VALUE th = cur->thread; cur->thread = Qfalse; - list_del(&cur->waitq.node); + list_del_init(&cur->waitq.node); /* idempotent */ /* * cur is stored on the stack of cur->waiting_th, @@ -2108,6 +2108,34 @@ autoload_reset(VALUE arg) return 0; /* ignored */ } +static VALUE +autoload_sleep(VALUE arg) +{ + struct autoload_state *state = (struct autoload_state *)arg; + + /* + * autoload_reset in other thread will resume us and remove us + * from the waitq list + */ + do { + rb_thread_sleep_deadly(); + } while (state->thread != Qfalse); + + return Qfalse; +} + +static VALUE +autoload_sleep_done(VALUE arg) +{ + struct autoload_state *state = (struct autoload_state *)arg; + + if (state->thread != Qfalse && rb_thread_to_be_killed(state->thread)) { + list_del_init(&state->waitq.node); /* idempotent */ + } + + return Qfalse; +} + VALUE rb_autoload_load(VALUE mod, ID id) { @@ -2145,13 +2173,9 @@ rb_autoload_load(VALUE mod, ID id) } else { list_add_tail(&ele->state->waitq.head, &state.waitq.node); - /* - * autoload_reset in other thread will resume us and remove us - * from the waitq list - */ - do { - rb_thread_sleep_deadly(); - } while (state.thread != Qfalse); + + rb_ensure(autoload_sleep, (VALUE)&state, + autoload_sleep_done, (VALUE)&state); } /* autoload_data_i can be deleted by another thread while require */ -- cgit v1.2.3