merges r25498 from trunk into ruby_1_9_1.

yugui · yugui · commit 8c1c1500234d · 2010-01-30T12:53:35.000Z
--
* 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/branches/ruby_1_9_1@26507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git 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 05:56:39 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* vm.c (invoke_block_from_c): return Qnil when its iseq is
diff --git a/gc.c b/gc.c
@@ -589,6 +589,7 @@ gc_with_gvl(void *ptr)
 static int
 garbage_collect_with_gvl(rb_objspace_t *objspace)
 {
+    if (dont_gc) return Qtrue;
     if (ruby_thread_has_gvl_p()) {
 	return garbage_collect(objspace);
     }
diff --git a/version.h b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 412
+#define RUBY_PATCHLEVEL 413
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

Original file line number	Diff line number	Diff line change
`@@ -589,6 +589,7 @@ gc_with_gvl(void *ptr)`
`589`	`589`	`static int`
`590`	`590`	`garbage_collect_with_gvl(rb_objspace_t *objspace)`
`591`	`591`	`{`
	`592`	`+ if (dont_gc) return Qtrue;`
`592`	`593`	`if (ruby_thread_has_gvl_p()) {`
`593`	`594`	`return garbage_collect(objspace);`
`594`	`595`	`}`