зеркало из https://github.com/github/ruby.git
gc.c: set finalizing
* gc.c (gc_start_internal, rb_gc_start): set finalizing flag whenever calling deferred finalizers not to recurse. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
0b8590724d
Коммит
2a32bd36ea
|
@ -1,3 +1,8 @@
|
||||||
|
Fri Jul 22 06:12:51 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* gc.c (gc_start_internal, rb_gc_start): set finalizing flag
|
||||||
|
whenever calling deferred finalizers not to recurse.
|
||||||
|
|
||||||
Thu Jul 21 22:26:40 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
Thu Jul 21 22:26:40 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
||||||
|
|
||||||
* missing/strl{cat,cpy}.c: Update latest upstream files.
|
* missing/strl{cat,cpy}.c: Update latest upstream files.
|
||||||
|
|
4
gc.c
4
gc.c
|
@ -6580,7 +6580,7 @@ gc_start_internal(int argc, VALUE *argv, VALUE self)
|
||||||
}
|
}
|
||||||
|
|
||||||
garbage_collect(objspace, full_mark, immediate_mark, immediate_sweep, GPR_FLAG_METHOD);
|
garbage_collect(objspace, full_mark, immediate_mark, immediate_sweep, GPR_FLAG_METHOD);
|
||||||
if (!finalizing) finalize_deferred(objspace);
|
gc_finalize_deferred(objspace);
|
||||||
|
|
||||||
return Qnil;
|
return Qnil;
|
||||||
}
|
}
|
||||||
|
@ -6597,7 +6597,7 @@ rb_gc(void)
|
||||||
{
|
{
|
||||||
rb_objspace_t *objspace = &rb_objspace;
|
rb_objspace_t *objspace = &rb_objspace;
|
||||||
garbage_collect(objspace, TRUE, TRUE, TRUE, GPR_FLAG_CAPI);
|
garbage_collect(objspace, TRUE, TRUE, TRUE, GPR_FLAG_CAPI);
|
||||||
if (!finalizing) finalize_deferred(objspace);
|
gc_finalize_deferred(objspace);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
Загрузка…
Ссылка в новой задаче