1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* load.c (load_lock): revert r38744. it should acquire new thread

Browse Source 
shield.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
glass 2013-01-09 13:14:05 +00:00
parent 4e323c0a9d
commit 94b4e7c783
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jan 9 21:43:32 2013 Masaki Matsushita <glass.saga@gmail.com>
* load.c (load_lock): revert r38744. it should acquire new thread
shield.
Wed Jan 9 15:40:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jan 9 15:40:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (th_init, ruby_thread_init): initialize root_svar with Qnil, * vm.c (th_init, ruby_thread_init): initialize root_svar with Qnil,

3
load.c
View File

@ -668,6 +668,9 @@ load_lock(const char *ftptr)
} }
switch (rb_thread_shield_wait((VALUE)data)) { switch (rb_thread_shield_wait((VALUE)data)) {
case Qfalse: case Qfalse:
data = (st_data_t)ftptr;
st_delete(loading_tbl, &data, 0);
return 0;
case Qnil: case Qnil:
return 0; return 0;
} }