Skip to content
Permalink
Branch: master
Find file Copy path
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
144 lines (127 sloc) 3.85 KB
--- a/gc.c (revision 34957)
+++ b/gc.c (working copy)
@@ -319,16 +319,12 @@
struct gc_list *next;
};
-#define CALC_EXACT_MALLOC_SIZE 0
-
typedef struct rb_objspace {
struct {
size_t limit;
size_t increase;
-#if CALC_EXACT_MALLOC_SIZE
size_t allocated_size;
size_t allocations;
-#endif
} malloc_params;
struct {
size_t increment;
@@ -730,10 +726,6 @@
}
if (size == 0) size = 1;
-#if CALC_EXACT_MALLOC_SIZE
- size += sizeof(size_t);
-#endif
-
if ((ruby_gc_stress && !ruby_disable_gc_stress) ||
(malloc_increase+size) > malloc_limit) {
garbage_collect_with_gvl(objspace);
@@ -747,12 +739,8 @@
{
malloc_increase += size;
-#if CALC_EXACT_MALLOC_SIZE
objspace->malloc_params.allocated_size += size;
objspace->malloc_params.allocations++;
- ((size_t *)mem)[0] = size;
- mem = (size_t *)mem + 1;
-#endif
return mem;
}
@@ -791,11 +779,7 @@
if (ruby_gc_stress && !ruby_disable_gc_stress)
garbage_collect_with_gvl(objspace);
-#if CALC_EXACT_MALLOC_SIZE
- size += sizeof(size_t);
objspace->malloc_params.allocated_size -= size;
- ptr = (size_t *)ptr - 1;
-#endif
mem = realloc(ptr, size);
if (!mem) {
@@ -808,11 +792,7 @@
}
malloc_increase += size;
-#if CALC_EXACT_MALLOC_SIZE
objspace->malloc_params.allocated_size += size;
- ((size_t *)mem)[0] = size;
- mem = (size_t *)mem + 1;
-#endif
return mem;
}
@@ -820,14 +800,6 @@
static void
vm_xfree(rb_objspace_t *objspace, void *ptr)
{
-#if CALC_EXACT_MALLOC_SIZE
- size_t size;
- ptr = ((size_t *)ptr) - 1;
- size = ((size_t*)ptr)[0];
- objspace->malloc_params.allocated_size -= size;
- objspace->malloc_params.allocations--;
-#endif
-
free(ptr);
}
@@ -3401,7 +3373,6 @@
}
-#if CALC_EXACT_MALLOC_SIZE
/*
* call-seq:
* GC.malloc_allocated_size -> Integer
@@ -3411,8 +3382,8 @@
* It returns the allocated size by malloc().
*/
-static VALUE
-gc_malloc_allocated_size(VALUE self)
+VALUE
+rb_gc_malloc_allocated_size(VALUE self)
{
return UINT2NUM((&rb_objspace)->malloc_params.allocated_size);
}
@@ -3426,12 +3397,11 @@
* It returns the number of allocated memory object by malloc().
*/
-static VALUE
-gc_malloc_allocations(VALUE self)
+VALUE
+rb_gc_malloc_allocations(VALUE self)
{
return UINT2NUM((&rb_objspace)->malloc_params.allocations);
}
-#endif
static VALUE
gc_profile_record_get(void)
@@ -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);
+ rb_define_singleton_method(rb_mGC, "malloc_allocated_size", rb_gc_malloc_allocated_size, 0);
+ rb_define_singleton_method(rb_mGC, "malloc_allocations", rb_gc_malloc_allocations, 0);
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);
@@ -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);
@@ -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);
-
-#if CALC_EXACT_MALLOC_SIZE
- rb_define_singleton_method(rb_mGC, "malloc_allocated_size", gc_malloc_allocated_size, 0);
- rb_define_singleton_method(rb_mGC, "malloc_allocations", gc_malloc_allocations, 0);
-#endif
}
You can’t perform that action at this time.