From cdcb7eaa6d9a159313f17a4ac5210d42c22dbda9 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 26 Oct 2009 23:06:39 +0000
Subject: * 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
---
 ChangeLog | 5 +++++
 gc.c      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1fa3f9671..97ae9e9b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
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);
     }
-- 
cgit