diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 10:52:04 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-30 10:52:04 +0000 |
| commit | 8f01d618e8e4960265696f0ea11cbcbb941fc2ce (patch) | |
| tree | 8b1f4accc01c263fcbde98f1faf73ad8e2cceca7 /variable.c | |
| parent | d25b9efdaa40041a894206e54a3e3ee83b2f106b (diff) | |
merge revision(s) 58587,58588: [Backport #13526]
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]
* properties.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
| -rw-r--r-- | variable.c | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/variable.c b/variable.c index 2b8ee6672b..738494110c 100644 --- a/variable.c +++ b/variable.c @@ -2127,7 +2127,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, @@ -2140,6 +2140,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) { @@ -2177,13 +2205,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 */ |