ruby-prof 1.4.3 → 1.6.3

data/ext/ruby_prof/rp_allocation.c

@@ -2,32 +2,11 @@
    Please see the LICENSE file for copyright and distribution information */
 
 #include "rp_allocation.h"
+#include "rp_method.h"
 
 VALUE cRpAllocation;
 
-prof_allocation_t* allocations_table_lookup(st_table* table, st_data_t key)
-{
-    prof_allocation_t* result = NULL;
-    st_data_t value;
-    if (rb_st_lookup(table, key, &value))
-    {
-        result = (prof_allocation_t*)value;
-    }
-
-    return result;
-}
-
-void allocations_table_insert(st_table* table, st_data_t key, prof_allocation_t* allocation)
-{
-    rb_st_insert(table, (st_data_t)key, (st_data_t)allocation);
-}
-
-st_data_t allocations_key(VALUE klass, int source_line)
-{
-    return (klass << 4) + source_line;
-}
-
-/* ======   prof_allocation_t  ====== */
+// ------ prof_allocation_t ------
 prof_allocation_t* prof_allocation_create(void)
 {
     prof_allocation_t* result = ALLOC(prof_allocation_t);
@@ -43,48 +22,17 @@ prof_allocation_t* prof_allocation_create(void)
     return result;
 }
 
-prof_allocation_t* prof_get_allocation(VALUE self)
+prof_allocation_t* prof_allocation_get(VALUE self)
 {
     /* Can't use Data_Get_Struct because that triggers the event hook
        ending up in endless recursion. */
     prof_allocation_t* result = RTYPEDDATA_DATA(self);
-
     if (!result)
         rb_raise(rb_eRuntimeError, "This RubyProf::Allocation instance has already been freed, likely because its profile has been freed.");
 
     return result;
 }
 
-prof_allocation_t* prof_allocate_increment(prof_method_t* method, rb_trace_arg_t* trace_arg)
-{
-    VALUE object = rb_tracearg_object(trace_arg);
-    if (BUILTIN_TYPE(object) == T_IMEMO)
-        return NULL;
-
-    VALUE klass = rb_obj_class(object);
-
-    int source_line = FIX2INT(rb_tracearg_lineno(trace_arg));
-    st_data_t key = allocations_key(klass, source_line);
-
-    prof_allocation_t* allocation = allocations_table_lookup(method->allocations_table, key);
-    if (!allocation)
-    {
-        allocation = prof_allocation_create();
-        allocation->source_line = source_line;
-        allocation->source_file = rb_tracearg_path(trace_arg);
-        allocation->klass_flags = 0;
-        allocation->klass = resolve_klass(klass, &allocation->klass_flags);
-
-        allocation->key = key;
-        allocations_table_insert(method->allocations_table, key, allocation);
-    }
-
-    allocation->count++;
-    allocation->memory += rb_obj_memsize_of(object);
-
-    return allocation;
-}
-
 static void prof_allocation_ruby_gc_free(void* data)
 {
     if (data)
@@ -118,30 +66,39 @@ void prof_allocation_mark(void* data)
 
     prof_allocation_t* allocation = (prof_allocation_t*)data;
     if (allocation->object != Qnil)
-        rb_gc_mark(allocation->object);
+        rb_gc_mark_movable(allocation->object);
 
     if (allocation->klass != Qnil)
-        rb_gc_mark(allocation->klass);
+        rb_gc_mark_movable(allocation->klass);
 
     if (allocation->klass_name != Qnil)
-        rb_gc_mark(allocation->klass_name);
+        rb_gc_mark_movable(allocation->klass_name);
 
     if (allocation->source_file != Qnil)
         rb_gc_mark(allocation->source_file);
 }
 
-static const rb_data_type_t allocation_type =
+void prof_allocation_compact(void* data)
 {
-    .wrap_struct_name = "Allocation",
-    .function =
-    {
-        .dmark = prof_allocation_mark,
-        .dfree = prof_allocation_ruby_gc_free,
-        .dsize = prof_allocation_size,
-    },
-    .data = NULL,
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY
-};
+    prof_allocation_t* allocation = (prof_allocation_t*)data;
+    allocation->object = rb_gc_location(allocation->object);
+    allocation->klass = rb_gc_location(allocation->klass);
+    allocation->klass_name = rb_gc_location(allocation->klass_name);
+}
+
+static const rb_data_type_t allocation_type =
+        {
+                .wrap_struct_name = "Allocation",
+                .function =
+                        {
+                                .dmark = prof_allocation_mark,
+                                .dfree = prof_allocation_ruby_gc_free,
+                                .dsize = prof_allocation_size,
+                                .dcompact = prof_allocation_compact
+                        },
+                .data = NULL,
+                .flags = RUBY_TYPED_FREE_IMMEDIATELY
+        };
 
 VALUE prof_allocation_wrap(prof_allocation_t* allocation)
 {
@@ -152,24 +109,122 @@ VALUE prof_allocation_wrap(prof_allocation_t* allocation)
     return allocation->object;
 }
 
-static VALUE prof_allocation_allocate(VALUE klass)
+/* ======   Allocation Table  ====== */
+st_table* prof_allocations_create()
 {
-    prof_allocation_t* allocation = prof_allocation_create();
-    allocation->object = prof_allocation_wrap(allocation);
-    return allocation->object;
+    return rb_st_init_numtable();
 }
 
-prof_allocation_t* prof_allocation_get(VALUE self)
+static int allocations_table_free_iterator(st_data_t key, st_data_t value, st_data_t dummy)
 {
-    /* Can't use Data_Get_Struct because that triggers the event hook
-       ending up in endless recursion. */
-    prof_allocation_t* result = RTYPEDDATA_DATA(self);
-    if (!result)
-        rb_raise(rb_eRuntimeError, "This RubyProf::Allocation instance has already been freed, likely because its profile has been freed.");
+    prof_allocation_free((prof_allocation_t*)value);
+    return ST_CONTINUE;
+}
+
+st_data_t allocations_key(VALUE klass, int source_line)
+{
+    return (klass << 4) + source_line;
+}
+
+static int prof_allocations_collect(st_data_t key, st_data_t value, st_data_t result)
+{
+    prof_allocation_t* allocation = (prof_allocation_t*)value;
+    VALUE arr = (VALUE)result;
+    rb_ary_push(arr, prof_allocation_wrap(allocation));
+    return ST_CONTINUE;
+}
+
+static int prof_allocations_mark_each(st_data_t key, st_data_t value, st_data_t data)
+{
+    prof_allocation_t* allocation = (prof_allocation_t*)value;
+    prof_allocation_mark(allocation);
+    return ST_CONTINUE;
+}
+
+void prof_allocations_mark(st_table* allocations_table)
+{
+    rb_st_foreach(allocations_table, prof_allocations_mark_each, 0);
+}
+
+void prof_allocations_free(st_table* table)
+{
+    rb_st_foreach(table, allocations_table_free_iterator, 0);
+    rb_st_free_table(table);
+}
+
+prof_allocation_t* allocations_table_lookup(st_table* table, st_data_t key)
+{
+    prof_allocation_t* result = NULL;
+    st_data_t value;
+    if (rb_st_lookup(table, key, &value))
+    {
+        result = (prof_allocation_t*)value;
+    }
 
     return result;
 }
 
+void allocations_table_insert(st_table* table, st_data_t key, prof_allocation_t* allocation)
+{
+    rb_st_insert(table, (st_data_t)key, (st_data_t)allocation);
+}
+
+prof_allocation_t* prof_allocate_increment(st_table* allocations_table, rb_trace_arg_t* trace_arg)
+{
+    VALUE object = rb_tracearg_object(trace_arg);
+    if (BUILTIN_TYPE(object) == T_IMEMO)
+        return NULL;
+
+    VALUE klass = rb_obj_class(object);
+
+    int source_line = FIX2INT(rb_tracearg_lineno(trace_arg));
+    st_data_t key = allocations_key(klass, source_line);
+
+    prof_allocation_t* allocation = allocations_table_lookup(allocations_table, key);
+    if (!allocation)
+    {
+        allocation = prof_allocation_create();
+        allocation->source_line = source_line;
+        allocation->source_file = rb_tracearg_path(trace_arg);
+        allocation->klass_flags = 0;
+        allocation->klass = resolve_klass(klass, &allocation->klass_flags);
+
+        allocation->key = key;
+        allocations_table_insert(allocations_table, key, allocation);
+    }
+
+    allocation->count++;
+    allocation->memory += rb_obj_memsize_of(object);
+
+    return allocation;
+}
+
+// Returns an array of allocations
+VALUE prof_allocations_wrap(st_table* allocations_table)
+{
+    VALUE result = rb_ary_new();
+    rb_st_foreach(allocations_table, prof_allocations_collect, result);
+    return result;
+}
+
+void prof_allocations_unwrap(st_table* allocations_table, VALUE allocations)
+{
+    for (int i = 0; i < rb_array_len(allocations); i++)
+    {
+        VALUE allocation = rb_ary_entry(allocations, i);
+        prof_allocation_t* allocation_data = prof_allocation_get(allocation);
+        rb_st_insert(allocations_table, allocation_data->key, (st_data_t)allocation_data);
+    }
+}
+
+/* ======   prof_allocation_t  ====== */
+static VALUE prof_allocation_allocate(VALUE klass)
+{
+    prof_allocation_t* allocation = prof_allocation_create();
+    allocation->object = prof_allocation_wrap(allocation);
+    return allocation->object;
+}
+
 /* call-seq:
    klass -> Class
 
@@ -238,17 +293,17 @@ static VALUE prof_allocation_memory(VALUE self)
 /* :nodoc: */
 static VALUE prof_allocation_dump(VALUE self)
 {
-    prof_allocation_t* allocation = prof_get_allocation(self);
+    prof_allocation_t* allocation = prof_allocation_get(self);
 
     VALUE result = rb_hash_new();
 
-    rb_hash_aset(result, ID2SYM(rb_intern("key")), INT2FIX(allocation->key));
+    rb_hash_aset(result, ID2SYM(rb_intern("key")), ULL2NUM(allocation->key));
     rb_hash_aset(result, ID2SYM(rb_intern("klass_name")), prof_allocation_klass_name(self));
     rb_hash_aset(result, ID2SYM(rb_intern("klass_flags")), INT2FIX(allocation->klass_flags));
     rb_hash_aset(result, ID2SYM(rb_intern("source_file")), allocation->source_file);
     rb_hash_aset(result, ID2SYM(rb_intern("source_line")), INT2FIX(allocation->source_line));
     rb_hash_aset(result, ID2SYM(rb_intern("count")), INT2FIX(allocation->count));
-    rb_hash_aset(result, ID2SYM(rb_intern("memory")), LONG2FIX(allocation->memory));
+    rb_hash_aset(result, ID2SYM(rb_intern("memory")), ULL2NUM(allocation->memory));
 
     return result;
 }
@@ -256,16 +311,16 @@ static VALUE prof_allocation_dump(VALUE self)
 /* :nodoc: */
 static VALUE prof_allocation_load(VALUE self, VALUE data)
 {
-    prof_allocation_t* allocation = prof_get_allocation(self);
+    prof_allocation_t* allocation = prof_allocation_get(self);
     allocation->object = self;
 
-    allocation->key = FIX2LONG(rb_hash_aref(data, ID2SYM(rb_intern("key"))));
+    allocation->key = RB_NUM2ULL(rb_hash_aref(data, ID2SYM(rb_intern("key"))));
     allocation->klass_name = rb_hash_aref(data, ID2SYM(rb_intern("klass_name")));
     allocation->klass_flags = FIX2INT(rb_hash_aref(data, ID2SYM(rb_intern("klass_flags"))));
     allocation->source_file = rb_hash_aref(data, ID2SYM(rb_intern("source_file")));
     allocation->source_line = FIX2INT(rb_hash_aref(data, ID2SYM(rb_intern("source_line"))));
     allocation->count = FIX2INT(rb_hash_aref(data, ID2SYM(rb_intern("count"))));
-    allocation->memory = FIX2LONG(rb_hash_aref(data, ID2SYM(rb_intern("memory"))));
+    allocation->memory = NUM2ULONG(rb_hash_aref(data, ID2SYM(rb_intern("memory"))));
 
     return data;
 }

data/ext/ruby_prof/rp_allocation.h

@@ -5,7 +5,6 @@
 #define _RP_ALLOCATION_
 
 #include "ruby_prof.h"
-#include "rp_method.h"
 
 typedef struct prof_allocation_t
 {
@@ -20,12 +19,15 @@ typedef struct prof_allocation_t
     VALUE object;                     /* Cache to wrapped object */
 } prof_allocation_t;
 
+// Allocation (prof_allocation_t*)
 void rp_init_allocation(void);
-void prof_allocation_free(prof_allocation_t* allocation);
-void prof_allocation_mark(void* data);
-VALUE prof_allocation_wrap(prof_allocation_t* allocation);
-prof_allocation_t* prof_allocation_get(VALUE self);
-prof_allocation_t* prof_allocate_increment(prof_method_t* method, rb_trace_arg_t* trace_arg);
+prof_allocation_t* prof_allocate_increment(st_table* allocations_table, rb_trace_arg_t* trace_arg);
 
+// Allocations (st_table*)
+st_table* prof_allocations_create(void);
+VALUE prof_allocations_wrap(st_table* allocations_table);
+void prof_allocations_unwrap(st_table* allocations_table, VALUE allocations);
+void prof_allocations_mark(st_table* allocations_table);
+void prof_allocations_free(st_table* table);
 
 #endif //_RP_ALLOCATION_