summaryrefslogtreecommitdiffstats
path: root/gc.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-26 23:06:39 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-26 23:06:39 +0000
commitcdcb7eaa6d9a159313f17a4ac5210d42c22dbda9 (patch)
treecf0df5f0c5c7e0244d51daae287bffceb063cbf0 /gc.c
parenta4ec0fb4da43c6344bc0389f7c4bf8111441843a (diff)
downloadruby-cdcb7eaa6d9a159313f17a4ac5210d42c22dbda9.tar.gz
ruby-cdcb7eaa6d9a159313f17a4ac5210d42c22dbda9.tar.xz
ruby-cdcb7eaa6d9a159313f17a4ac5210d42c22dbda9.zip
* gc.c (garbage_collect_with_gvl): do not garbage_collect when
dont_gc flag turned on. [ruby-core:26327] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/gc.c b/gc.c
index ddfe39bf3..2568d42b1 100644
--- a/gc.c
+++ b/gc.c
@@ -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);
}