nagachika	2013-04-08 00:11:15 +0900 (Mon, 08 Apr 2013)

  New Revision: 40177

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40177

  Log:
    merge revision(s) 39810: [Backport #8145]
    
    * gc.c: Fix unlimited memory growth with large values of
      RUBY_FREE_MIN. patched by tmm1(Aman Gupta).
      [Bug #8095] [ruby-core:53405]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/gc.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40176)
+++ ruby_2_0_0/ChangeLog	(revision 40177)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Apr  8 00:10:59 2013  Narihiro Nakamura  <authornari@g...>
+
+	* gc.c: Fix unlimited memory growth with large values of
+	  RUBY_FREE_MIN. patched by tmm1(Aman Gupta).
+	  [Bug #8095] [ruby-core:53405]
+
 Sun Apr  7 22:27:12 2013  Narihiro Nakamura  <authornari@g...>
 
 	* gc.c: Avoid unnecessary heap growth. patched by tmm1(Aman Gupta).
Index: ruby_2_0_0/gc.c
===================================================================
--- ruby_2_0_0/gc.c	(revision 40176)
+++ ruby_2_0_0/gc.c	(revision 40177)
@@ -1968,8 +1968,9 @@ before_gc_sweep(rb_objspace_t *objspace) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/gc.c#L1968
     objspace->heap.do_heap_free = (size_t)((heaps_used * HEAP_OBJ_LIMIT) * 0.65);
     objspace->heap.free_min = (size_t)((heaps_used * HEAP_OBJ_LIMIT)  * 0.2);
     if (objspace->heap.free_min < initial_free_min) {
-	objspace->heap.do_heap_free = heaps_used * HEAP_OBJ_LIMIT;
         objspace->heap.free_min = initial_free_min;
+	if (objspace->heap.do_heap_free < initial_free_min)
+	    objspace->heap.do_heap_free = initial_free_min;
     }
     objspace->heap.sweep_slots = heaps;
     objspace->heap.free_num = 0;
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40176)
+++ ruby_2_0_0/version.h	(revision 40177)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-04-07"
-#define RUBY_PATCHLEVEL 110
+#define RUBY_RELEASE_DATE "2013-04-08"
+#define RUBY_PATCHLEVEL 111
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 8
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39810


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/