mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* load.c (load_lock): revert r38744. it should acquire new thread
shield. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
4e323c0a9d
commit
94b4e7c783
2 changed files with 8 additions and 0 deletions
|
@ -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>
|
||||
|
||||
* vm.c (th_init, ruby_thread_init): initialize root_svar with Qnil,
|
||||
|
|
3
load.c
3
load.c
|
@ -668,6 +668,9 @@ load_lock(const char *ftptr)
|
|||
}
|
||||
switch (rb_thread_shield_wait((VALUE)data)) {
|
||||
case Qfalse:
|
||||
data = (st_data_t)ftptr;
|
||||
st_delete(loading_tbl, &data, 0);
|
||||
return 0;
|
||||
case Qnil:
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue