diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-26 23:06:39 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-26 23:06:39 +0000 |
commit | 33c5abbefae97178001f1ba8c95205b99209a313 (patch) | |
tree | cf0df5f0c5c7e0244d51daae287bffceb063cbf0 | |
parent | 435f18f513fdaa77c9922f564df577110641a0a2 (diff) | |
download | ruby-33c5abbefae97178001f1ba8c95205b99209a313.tar.gz |
* gc.c (garbage_collect_with_gvl): do not garbage_collect when
dont_gc flag turned on. [ruby-core:26327]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gc.c | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Oct 27 07:53:25 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * gc.c (garbage_collect_with_gvl): do not garbage_collect when + dont_gc flag turned on. [ruby-core:26327] + Tue Oct 27 07:38:39 2009 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * ext/tk/tcltklib.c,stubs.c: remove errors or warnings when compiled @@ -618,6 +618,7 @@ gc_with_gvl(void *ptr) static int garbage_collect_with_gvl(rb_objspace_t *objspace) { + if (dont_gc) return TRUE; if (ruby_thread_has_gvl_p()) { return garbage_collect(objspace); } |