Add gcdata patch for 1.9.3-p125.

rvm · Mar 9, 2012 · 64a6ca6 · 64a6ca6
1 parent 54dc6c1
commit 64a6ca6
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/patches/ruby/1.9.3/p125/gcdata.patch b/patches/ruby/1.9.3/p125/gcdata.patch
@@ -1,6 +1,6 @@
---- a/gc.c	(revision 33566)
+--- a/gc.c	(revision 34957)
 +++ b/gc.c	(working copy)
-@@ -309,16 +309,12 @@
+@@ -319,16 +319,12 @@
      struct gc_list *next;
  };
 
@@ -17,7 +17,7 @@
      } malloc_params;
      struct {
  	size_t increment;
-@@ -715,10 +711,6 @@
+@@ -730,10 +726,6 @@
      }
      if (size == 0) size = 1;
 
@@ -28,7 +28,7 @@
      if ((ruby_gc_stress && !ruby_disable_gc_stress) ||
  	(malloc_increase+size) > malloc_limit) {
  	garbage_collect_with_gvl(objspace);
-@@ -732,12 +724,8 @@
+@@ -747,12 +739,8 @@
  {
      malloc_increase += size;
 
@@ -41,7 +41,7 @@
 
      return mem;
  }
-@@ -776,11 +764,7 @@
+@@ -791,11 +779,7 @@
      if (ruby_gc_stress && !ruby_disable_gc_stress)
  	garbage_collect_with_gvl(objspace);
 
@@ -53,7 +53,7 @@
 
      mem = realloc(ptr, size);
      if (!mem) {
-@@ -793,11 +777,7 @@
+@@ -808,11 +792,7 @@
      }
      malloc_increase += size;
 
@@ -65,7 +65,7 @@
 
      return mem;
  }
-@@ -805,14 +785,6 @@
+@@ -820,14 +800,6 @@
  static void
  vm_xfree(rb_objspace_t *objspace, void *ptr)
  {
@@ -80,15 +80,15 @@
      free(ptr);
  }
 
-@@ -3384,7 +3356,6 @@
+@@ -3401,7 +3373,6 @@
  }
 
 
 -#if CALC_EXACT_MALLOC_SIZE
  /*
   *  call-seq:
   *     GC.malloc_allocated_size -> Integer
-@@ -3394,8 +3365,8 @@
+@@ -3411,8 +3382,8 @@
   *  It returns the allocated size by malloc().
   */
 
@@ -99,7 +99,7 @@
  {
      return UINT2NUM((&rb_objspace)->malloc_params.allocated_size);
  }
-@@ -3409,12 +3380,11 @@
+@@ -3426,12 +3397,11 @@
   *  It returns the number of allocated memory object by malloc().
   */
 
@@ -114,7 +114,7 @@
 
  static VALUE
  gc_profile_record_get(void)
-@@ -3599,6 +3569,8 @@
+@@ -3616,6 +3586,8 @@
      rb_define_singleton_method(rb_mGC, "start", rb_gc_start, 0);
      rb_define_singleton_method(rb_mGC, "enable", rb_gc_enable, 0);
      rb_define_singleton_method(rb_mGC, "disable", rb_gc_disable, 0);
@@ -123,15 +123,15 @@
      rb_define_singleton_method(rb_mGC, "stress", gc_stress_get, 0);
      rb_define_singleton_method(rb_mGC, "stress=", gc_stress_set, 1);
      rb_define_singleton_method(rb_mGC, "count", gc_count, 0);
-@@ -3613,6 +3585,7 @@
+@@ -3630,6 +3602,7 @@
      rb_define_singleton_method(rb_mProfiler, "result", gc_profile_result, 0);
      rb_define_singleton_method(rb_mProfiler, "report", gc_profile_report, -1);
      rb_define_singleton_method(rb_mProfiler, "total_time", gc_profile_total_time, 0);
 +    rb_define_singleton_method(rb_mProfiler, "data", gc_profile_record_get, 0);
 
      rb_mObSpace = rb_define_module("ObjectSpace");
      rb_define_module_function(rb_mObSpace, "each_object", os_each_obj, -1);
-@@ -3632,9 +3605,4 @@
+@@ -3649,9 +3622,4 @@
      rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
 
      rb_define_module_function(rb_mObSpace, "count_objects", count_objects, -1);