[ruby-cvs:66399] usa:r59221 (ruby_2_3): merge revision(s) 58696: [Backport #11384]
usa at ruby-lang.org
usa at ruby-lang.org
Fri Jun 30 19:56:33 JST 2017
usa 2017-06-30 19:56:33 +0900 (Fri, 30 Jun 2017)
New Revision: 59221
https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59221
Log:
merge revision(s) 58696: [Backport #11384]
autoload: always wait on loading thread
We cannot assume autoload_provided/rb_feature_provided returning
TRUE means it is safe to proceed without waiting. Another
thread may call rb_provide_feature before setting the constant
(via autoload_const_set). So we must wait until autoload is
completed by another thread.
Note: this patch was tested with an explicit rb_thread_schedule
in rb_provide_feature to make the race condition more apparent
as suggested by <s.wanabe at gmail.com>:
> --- a/load.c
> +++ b/load.c
> @@ -563,6 +563,7 @@ rb_provide_feature(VALUE feature)
> rb_str_freeze(feature);
>
> rb_ary_push(features, rb_fstring(feature));
> +rb_thread_schedule();
> features_index_add(feature, INT2FIX(RARRAY_LEN(features)-1));
> reset_loaded_features_snapshot();
> }
* variable.c (check_autoload_required): do not assume a provided
feature means autoload is complete, always wait if autoload is
being performed by another thread.
[ruby-core:81105] [Bug #11384] Thanks to <s.wanabe at gmail.com>
Modified directories:
branches/ruby_2_3/
Modified files:
branches/ruby_2_3/ChangeLog
branches/ruby_2_3/variable.c
branches/ruby_2_3/version.h
More information about the ruby-cvs
mailing list