ruby-prof 1.1.0-x64-mingw32 → 1.3.0-x64-mingw32

data/ext/ruby_prof/rp_call_trees.h

@@ -0,0 +1,28 @@
+/* Copyright (C) 2005-2013 Shugo Maeda <shugo@ruby-lang.org> and Charlie Savage <cfis@savagexi.com>
+   Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RP_CALL_TREES_H__
+#define __RP_CALL_TREES_H__
+
+#include "ruby_prof.h"
+#include "rp_call_tree.h"
+
+   /* Array of call_tree objects */
+typedef struct prof_call_trees_t
+{
+    prof_call_tree_t** start;
+    prof_call_tree_t** end;
+    prof_call_tree_t** ptr;
+
+    VALUE object;
+} prof_call_trees_t;
+
+
+void rp_init_call_trees();
+prof_call_trees_t* prof_call_trees_create();
+void prof_call_trees_free(prof_call_trees_t* call_trees);
+prof_call_trees_t* prof_get_call_trees(VALUE self);
+void prof_add_call_tree(prof_call_trees_t* call_trees, prof_call_tree_t* call_tree);
+VALUE prof_call_trees_wrap(prof_call_trees_t* call_trees);
+
+#endif //__RP_CALL_TREES_H__

data/ext/ruby_prof/rp_measure_allocations.c

@@ -8,14 +8,12 @@
 static VALUE cMeasureAllocations;
 VALUE total_allocated_objects_key;
 
-static double
-measure_allocations_via_gc_stats(rb_trace_arg_t* trace_arg)
+static double measure_allocations_via_gc_stats(rb_trace_arg_t* trace_arg)
 {
     return rb_gc_stat(total_allocated_objects_key);
 }
 
-static double
-measure_allocations_via_tracing(rb_trace_arg_t* trace_arg)
+static double measure_allocations_via_tracing(rb_trace_arg_t* trace_arg)
 {
     static double result = 0;
 
@@ -30,17 +28,17 @@ measure_allocations_via_tracing(rb_trace_arg_t* trace_arg)
 
 prof_measurer_t* prof_measurer_allocations(bool track_allocations)
 {
-  prof_measurer_t* measure = ALLOC(prof_measurer_t);
-  measure->mode = MEASURE_ALLOCATIONS;
-  measure->multiplier = 1;
-  measure->track_allocations = track_allocations;
+    prof_measurer_t* measure = ALLOC(prof_measurer_t);
+    measure->mode = MEASURE_ALLOCATIONS;
+    measure->multiplier = 1;
+    measure->track_allocations = track_allocations;
 
-  if (track_allocations)
-      measure->measure = measure_allocations_via_tracing;
-  else
-      measure->measure = measure_allocations_via_gc_stats;
+    if (track_allocations)
+        measure->measure = measure_allocations_via_tracing;
+    else
+        measure->measure = measure_allocations_via_gc_stats;
 
-  return measure;
+    return measure;
 }
 
 void rp_init_measure_allocations()

data/ext/ruby_prof/rp_measure_process_time.c

@@ -6,8 +6,7 @@
 
 static VALUE cMeasureProcessTime;
 
-static double
-measure_process_time(rb_trace_arg_t* trace_arg)
+static double measure_process_time(rb_trace_arg_t* trace_arg)
 {
 #if defined(_WIN32)
     FILETIME  createTime;
@@ -29,16 +28,15 @@ measure_process_time(rb_trace_arg_t* trace_arg)
 #elif !defined(CLOCK_PROCESS_CPUTIME_ID)
     struct rusage usage;
     getrusage(RUSAGE_SELF, &usage);
-    return usage.ru_stime.tv_sec + usage.ru_utime.tv_sec + ((usage.ru_stime.tv_usec + usage.ru_utime.tv_usec)/1000000.0);
+    return usage.ru_stime.tv_sec + usage.ru_utime.tv_sec + ((usage.ru_stime.tv_usec + usage.ru_utime.tv_usec) / 1000000.0);
 #else
     struct timespec clock;
-    clock_gettime(CLOCK_PROCESS_CPUTIME_ID , &clock);
-    return clock.tv_sec + (clock.tv_nsec/1000000000.0);
+    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &clock);
+    return clock.tv_sec + (clock.tv_nsec / 1000000000.0);
 #endif
 }
 
-static double
-multiplier_process_time(void)
+static double multiplier_process_time(void)
 {
 #if defined(_WIN32)
     // Times are in 100-nanosecond time units.  So instead of 10-9 use 10-7
@@ -50,12 +48,12 @@ multiplier_process_time(void)
 
 prof_measurer_t* prof_measurer_process_time(bool track_allocations)
 {
-  prof_measurer_t* measure = ALLOC(prof_measurer_t);
-  measure->mode = MEASURE_PROCESS_TIME;
-  measure->measure = measure_process_time;
-  measure->multiplier = multiplier_process_time();
-  measure->track_allocations = track_allocations;
-  return measure;
+    prof_measurer_t* measure = ALLOC(prof_measurer_t);
+    measure->mode = MEASURE_PROCESS_TIME;
+    measure->measure = measure_process_time;
+    measure->multiplier = multiplier_process_time();
+    measure->track_allocations = track_allocations;
+    return measure;
 }
 
 void rp_init_measure_process_time()

data/ext/ruby_prof/rp_measure_wall_time.c

@@ -1,7 +1,7 @@
 /* Copyright (C) 2005-2019 Shugo Maeda <shugo@ruby-lang.org> and Charlie Savage <cfis@savagexi.com>
    Please see the LICENSE file for copyright and distribution information */
 
-/* :nodoc: */
+   /* :nodoc: */
 #include "rp_measurement.h"
 
 #if defined(__APPLE__)
@@ -12,11 +12,12 @@
 
 static VALUE cMeasureWallTime;
 
-static double
-measure_wall_time(rb_trace_arg_t* trace_arg)
+static double measure_wall_time(rb_trace_arg_t* trace_arg)
 {
 #if defined(_WIN32)
-    return GetTickCount();
+    LARGE_INTEGER time;
+    QueryPerformanceCounter(&time);
+    return time.QuadPart;
 #elif defined(__APPLE__)
     return mach_absolute_time();// * (uint64_t)mach_timebase.numer / (uint64_t)mach_timebase.denom;
 #elif defined(__linux__)
@@ -26,18 +27,19 @@ measure_wall_time(rb_trace_arg_t* trace_arg)
 #else
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    return tv.tv_sec + (tv.tv_usec / 1000000.0); 
+    return tv.tv_sec + (tv.tv_usec / 1000000.0);
 #endif
 }
 
-static double
-multiplier_wall_time(void)
+static double multiplier_wall_time(void)
 {
 #if defined(_WIN32)
-    return 1.0/1000.0;
+    LARGE_INTEGER frequency;
+    QueryPerformanceFrequency(&frequency);
+    return 1.0 / frequency.QuadPart;
 #elif defined(__APPLE__)
     mach_timebase_info_data_t mach_timebase;
-    mach_timebase_info (&mach_timebase);
+    mach_timebase_info(&mach_timebase);
     return (uint64_t)mach_timebase.numer / (uint64_t)mach_timebase.denom / 1000000000.0;
 #else
     return 1.0;
@@ -46,12 +48,12 @@ multiplier_wall_time(void)
 
 prof_measurer_t* prof_measurer_wall_time(bool track_allocations)
 {
-  prof_measurer_t* measure = ALLOC(prof_measurer_t);
-  measure->mode = MEASURE_WALL_TIME;
-  measure->measure = measure_wall_time;
-  measure->multiplier = multiplier_wall_time();
-  measure->track_allocations = track_allocations;
-  return measure;
+    prof_measurer_t* measure = ALLOC(prof_measurer_t);
+    measure->mode = MEASURE_WALL_TIME;
+    measure->measure = measure_wall_time;
+    measure->multiplier = multiplier_wall_time();
+    measure->track_allocations = track_allocations;
+    return measure;
 }
 
 void rp_init_measure_wall_time()

data/ext/ruby_prof/rp_measurement.c

@@ -40,7 +40,7 @@ double prof_measure(prof_measurer_t* measurer, rb_trace_arg_t* trace_arg)
 }
 
 /* =======  prof_measurement_t   ========*/
-prof_measurement_t *prof_measurement_create(void)
+prof_measurement_t* prof_measurement_create(void)
 {
     prof_measurement_t* result = ALLOC(prof_measurement_t);
     result->total_time = 0;
@@ -51,67 +51,78 @@ prof_measurement_t *prof_measurement_create(void)
     return result;
 }
 
-static void
-prof_measurement_ruby_gc_free(void *data)
+void prof_measurement_mark(void* data)
 {
-    prof_measurement_t* measurement = (prof_measurement_t*)data;
+    if (!data) return;
 
+    prof_measurement_t* measurement_data = (prof_measurement_t*)data;
+
+    if (measurement_data->object != Qnil)
+        rb_gc_mark(measurement_data->object);
+}
+
+static void prof_measurement_ruby_gc_free(void* data)
+{
+    if (data)
+    {
+        // Measurements are freed by their owning object (call info or method)
+        prof_measurement_t* measurement = (prof_measurement_t*)data;
+        measurement->object = Qnil;
+    }
+}
+
+void prof_measurement_free(prof_measurement_t* measurement)
+{
     /* Has this measurement object been accessed by Ruby?  If
        yes clean it up so to avoid a segmentation fault. */
     if (measurement->object != Qnil)
     {
-        RDATA(measurement->object)->dmark = NULL;
-        RDATA(measurement->object)->dfree = NULL;
-        RDATA(measurement->object)->data = NULL;
+        RTYPEDDATA(measurement->object)->data = NULL;
         measurement->object = Qnil;
     }
-}
 
-void
-prof_measurement_free(prof_measurement_t* measurement)
-{
-    prof_measurement_ruby_gc_free(measurement);
     xfree(measurement);
 }
 
-size_t
-prof_measurement_size(const void *data)
+size_t prof_measurement_size(const void* data)
 {
     return sizeof(prof_measurement_t);
 }
 
-void
-prof_measurement_mark(void *data)
+static const rb_data_type_t measurement_type =
 {
-    prof_measurement_t* measurement = (prof_measurement_t*)data;
-    if (measurement->object != Qnil)
-        rb_gc_mark(measurement->object);
-}
+    .wrap_struct_name = "Measurement",
+    .function =
+    {
+        .dmark = prof_measurement_mark,
+        .dfree = prof_measurement_ruby_gc_free,
+        .dsize = prof_measurement_size,
+    },
+    .data = NULL,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+}; 
 
-VALUE
-prof_measurement_wrap(prof_measurement_t* measurement)
+VALUE prof_measurement_wrap(prof_measurement_t* measurement)
 {
     if (measurement->object == Qnil)
     {
-        measurement->object = Data_Wrap_Struct(cRpMeasurement, prof_measurement_mark, prof_measurement_ruby_gc_free, measurement);
+        measurement->object = TypedData_Wrap_Struct(cRpMeasurement, &measurement_type, measurement);
     }
     return measurement->object;
 }
 
-static VALUE
-prof_measurement_allocate(VALUE klass)
+static VALUE prof_measurement_allocate(VALUE klass)
 {
-    prof_measurement_t *measurement = prof_measurement_create();
+    prof_measurement_t* measurement = prof_measurement_create();
     measurement->object = prof_measurement_wrap(measurement);
     return measurement->object;
 }
 
-prof_measurement_t*
-prof_get_measurement(VALUE self)
+prof_measurement_t* prof_get_measurement(VALUE self)
 {
     /* Can't use Data_Get_Struct because that triggers the event hook
        ending up in endless recursion. */
-    prof_measurement_t* result = DATA_PTR(self);
+    prof_measurement_t* result = RTYPEDDATA_DATA(self);
 
     if (!result)
         rb_raise(rb_eRuntimeError, "This RubyProf::Measurement instance has already been freed, likely because its profile has been freed.");
@@ -123,8 +134,7 @@ prof_get_measurement(VALUE self)
    total_time -> float
 
 Returns the total amount of time spent in this method and its children. */
-static VALUE
-prof_measurement_total_time(VALUE self)
+static VALUE prof_measurement_total_time(VALUE self)
 {
     prof_measurement_t* result = prof_get_measurement(self);
     return rb_float_new(result->total_time);
@@ -146,8 +156,7 @@ prof_measurement_self_time(VALUE self)
    wait_time -> float
 
 Returns the total amount of time this method waited for other threads. */
-static VALUE
-prof_measurement_wait_time(VALUE self)
+static VALUE prof_measurement_wait_time(VALUE self)
 {
     prof_measurement_t* result = prof_get_measurement(self);
 
@@ -158,10 +167,9 @@ prof_measurement_wait_time(VALUE self)
    called -> int
 
 Returns the total amount of times this method was called. */
-static VALUE
-prof_measurement_called(VALUE self)
+static VALUE prof_measurement_called(VALUE self)
 {
-    prof_measurement_t *result = prof_get_measurement(self);
+    prof_measurement_t* result = prof_get_measurement(self);
     return INT2NUM(result->called);
 }
 
@@ -169,10 +177,9 @@ prof_measurement_called(VALUE self)
    called=n -> n
 
 Sets the call count to n. */
-static VALUE
-prof_measurement_set_called(VALUE self, VALUE called)
+static VALUE prof_measurement_set_called(VALUE self, VALUE called)
 {
-    prof_measurement_t *result = prof_get_measurement(self);
+    prof_measurement_t* result = prof_get_measurement(self);
     result->called = NUM2INT(called);
     return called;
 }
@@ -215,7 +222,7 @@ void rp_init_measure()
     rp_init_measure_allocations();
     rp_init_measure_memory();
 
-    cRpMeasurement = rb_define_class_under(mProf, "Measurement", rb_cData);
+    cRpMeasurement = rb_define_class_under(mProf, "Measurement", rb_cObject);
     rb_undef_method(CLASS_OF(cRpMeasurement), "new");
     rb_define_alloc_func(cRpMeasurement, prof_measurement_allocate);
 

data/ext/ruby_prof/rp_measurement.h

@@ -8,7 +8,7 @@
 
 extern VALUE mMeasure;
 
-typedef double (*get_measurement)(rb_trace_arg_t *trace_arg);
+typedef double (*get_measurement)(rb_trace_arg_t* trace_arg);
 
 typedef enum
 {
@@ -18,7 +18,7 @@ typedef enum
     MEASURE_MEMORY
 } prof_measure_mode_t;
 
-typedef struct
+typedef struct prof_measurer_t
 {
     get_measurement measure;
     prof_measure_mode_t mode;
@@ -36,14 +36,14 @@ typedef struct prof_measurement_t
     VALUE object;
 } prof_measurement_t;
 
-prof_measurer_t *prof_get_measurer(prof_measure_mode_t measure, bool track_allocations);
-double prof_measure(prof_measurer_t *measurer, rb_trace_arg_t* trace_arg);
+prof_measurer_t* prof_get_measurer(prof_measure_mode_t measure, bool track_allocations);
+double prof_measure(prof_measurer_t* measurer, rb_trace_arg_t* trace_arg);
 
-prof_measurement_t *prof_measurement_create(void);
+prof_measurement_t* prof_measurement_create(void);
 void prof_measurement_free(prof_measurement_t* measurement);
-VALUE prof_measurement_wrap(prof_measurement_t *measurement);
+VALUE prof_measurement_wrap(prof_measurement_t* measurement);
 prof_measurement_t* prof_get_measurement(VALUE self);
-void prof_measurement_mark(void *data);
+void prof_measurement_mark(void* data);
 
 void rp_init_measure(void);
 

data/ext/ruby_prof/rp_method.c

@@ -2,14 +2,13 @@
    Please see the LICENSE file for copyright and distribution information */
 
 #include "rp_allocation.h"
-#include "rp_call_info.h"
+#include "rp_call_trees.h"
 #include "rp_method.h"
 
 VALUE cRpMethodInfo;
 
 /* ================  Helper Functions  =================*/
-VALUE
-resolve_klass(VALUE klass, unsigned int *klass_flags)
+VALUE resolve_klass(VALUE klass, unsigned int* klass_flags)
 {
     VALUE result = klass;
 
@@ -62,8 +61,7 @@ resolve_klass(VALUE klass, unsigned int *klass_flags)
     return result;
 }
 
-VALUE
-resolve_klass_name(VALUE klass, unsigned int* klass_flags)
+VALUE resolve_klass_name(VALUE klass, unsigned int* klass_flags)
 {
     VALUE result = Qnil;
 
@@ -83,8 +81,7 @@ resolve_klass_name(VALUE klass, unsigned int* klass_flags)
     return result;
 }
 
-st_data_t
-method_key(VALUE klass, VALUE msym)
+st_data_t method_key(VALUE klass, VALUE msym)
 {
     VALUE resolved_klass = klass;
 
@@ -104,21 +101,18 @@ method_key(VALUE klass, VALUE msym)
 }
 
 /* ======   Allocation Table  ====== */
-st_table*
-allocations_table_create()
+st_table* allocations_table_create()
 {
-    return st_init_numtable();
+    return rb_st_init_numtable();
 }
 
-static int
-allocations_table_free_iterator(st_data_t key, st_data_t value, st_data_t dummy)
-{ 
+static int allocations_table_free_iterator(st_data_t key, st_data_t value, st_data_t dummy)
+{
     prof_allocation_free((prof_allocation_t*)value);
     return ST_CONTINUE;
 }
 
-static int
-prof_method_collect_allocations(st_data_t key, st_data_t value, st_data_t result)
+static int prof_method_collect_allocations(st_data_t key, st_data_t value, st_data_t result)
 {
     prof_allocation_t* allocation = (prof_allocation_t*)value;
     VALUE arr = (VALUE)result;
@@ -126,28 +120,25 @@ prof_method_collect_allocations(st_data_t key, st_data_t value, st_data_t result
     return ST_CONTINUE;
 }
 
-static int
-prof_method_mark_allocations(st_data_t key, st_data_t value, st_data_t data)
+static int prof_method_mark_allocations(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
-allocations_table_free(st_table* table)
+void allocations_table_free(st_table* table)
 {
-    st_foreach(table, allocations_table_free_iterator, 0);
-    st_free_table(table);
+    rb_st_foreach(table, allocations_table_free_iterator, 0);
+    rb_st_free_table(table);
 }
 
 /* ================  prof_method_t   =================*/
-static prof_method_t*
-prof_get_method(VALUE self)
+prof_method_t* prof_get_method(VALUE self)
 {
     /* Can't use Data_Get_Struct because that triggers the event hook
        ending up in endless recursion. */
-    prof_method_t* result = DATA_PTR(self);
+    prof_method_t* result = RTYPEDDATA_DATA(self);
 
     if (!result)
         rb_raise(rb_eRuntimeError, "This RubyProf::MethodInfo instance has already been freed, likely because its profile has been freed.");
@@ -155,27 +146,24 @@ prof_get_method(VALUE self)
     return result;
 }
 
-prof_method_t*
-prof_method_create(VALUE klass, VALUE msym, VALUE source_file, int source_line)
+prof_method_t* prof_method_create(VALUE profile, VALUE klass, VALUE msym, VALUE source_file, int source_line)
 {
-    prof_method_t *result = ALLOC(prof_method_t);
+    prof_method_t* result = ALLOC(prof_method_t);
+    result->profile = profile;
+
     result->key = method_key(klass, msym);
     result->klass_flags = 0;
 
-    /* Note we do not call resolve_klass_name now because that causes an object allocation that shows up 
+    /* Note we do not call resolve_klass_name now because that causes an object allocation that shows up
        in the allocation results so we want to avoid it until after the profile run is complete. */
     result->klass = resolve_klass(klass, &result->klass_flags);
     result->klass_name = Qnil;
     result->method_name = msym;
     result->measurement = prof_measurement_create();
 
-    result->root = false;
-    result->excluded = false;
-
-    result->parent_call_infos = method_table_create();
-    result->child_call_infos = method_table_create();
+    result->call_trees = prof_call_trees_create();
     result->allocations_table = allocations_table_create();
-    
+
     result->visits = 0;
     result->recursive = false;
 
@@ -187,180 +175,127 @@ prof_method_create(VALUE klass, VALUE msym, VALUE source_file, int source_line)
     return result;
 }
 
-prof_method_t*
-prof_method_create_excluded(VALUE klass, VALUE msym)
-{
-    prof_method_t* result = prof_method_create(klass, msym, Qnil, 0);
-    result->excluded = 1;
-    return result;
-}
-
-static int
-prof_method_collect_call_infos(st_data_t key, st_data_t value, st_data_t result)
-{
-    prof_call_info_t* call_info = (prof_call_info_t*)value;
-    VALUE arr = (VALUE)result;
-    rb_ary_push(arr, prof_call_info_wrap(call_info));
-    return ST_CONTINUE;
-}
-
-static int
-prof_method_mark_call_infos(st_data_t key, st_data_t value, st_data_t data)
-{
-    prof_call_info_t* call_info = (prof_call_info_t*)value;
-    prof_call_info_mark(call_info);
-    return ST_CONTINUE;
-}
-
-static int
-call_infos_free_iterator(st_data_t key, st_data_t value, st_data_t dummy)
-{
-    prof_call_info_free((prof_call_info_t*)value);
-    return ST_CONTINUE;
-}
-
-void
-call_info_table_free(st_table* table)
-{
-    st_foreach(table, call_infos_free_iterator, 0);
-    st_free_table(table);
-}
-
 /* The underlying c structures are freed when the parent profile is freed.
    However, on shutdown the Ruby GC frees objects in any will-nilly order.
    That means the ruby thread object wrapping the c thread struct may
    be freed before the parent profile.  Thus we add in a free function
    for the garbage collector so that if it does get called will nil
    out our Ruby object reference.*/
-static void
-prof_method_ruby_gc_free(void *data)
+static void prof_method_ruby_gc_free(void* data)
 {
-    prof_method_t* method = (prof_method_t*)data;
-
-    /* Has this method object been accessed by Ruby?  If
-	   yes clean it up so to avoid a segmentation fault. */
-	if (method->object != Qnil)
-	{
-        RDATA(method->object)->dmark = NULL;
-        RDATA(method->object)->dfree = NULL;
-        RDATA(method->object)->data = NULL;
+    if (data)
+    {
+        prof_method_t* method = (prof_method_t*)data;
         method->object = Qnil;
     }
-    method->klass_name = Qnil;
-    method->method_name = Qnil;
 }
 
-static void
-prof_method_free(prof_method_t* method)
+static void prof_method_free(prof_method_t* method)
 {
-	prof_method_ruby_gc_free(method);
-    allocations_table_free(method->allocations_table);
-
-    /* Remember call infos are referenced by their parent method and child method, so we only want
-       to iterate over one of them to avoid a double freeing */
-    call_info_table_free(method->parent_call_infos);
-    xfree(method->child_call_infos);
+    /* Has this method object been accessed by Ruby?  If
+       yes clean it up so to avoid a segmentation fault. */
+    if (method->object != Qnil)
+    {
+        RTYPEDDATA(method->object)->data = NULL;
+        method->object = Qnil;
+    }
 
+    allocations_table_free(method->allocations_table);
+    prof_call_trees_free(method->call_trees);
     prof_measurement_free(method->measurement);
     xfree(method);
 }
 
-size_t
-prof_method_size(const void *data)
+size_t prof_method_size(const void* data)
 {
     return sizeof(prof_method_t);
 }
 
-void
-prof_method_mark(void *data)
+void prof_method_mark(void* data)
 {
+    if (!data) return;
+
     prof_method_t* method = (prof_method_t*)data;
+
+    if (method->profile != Qnil)
+        rb_gc_mark(method->profile);
+
+    if (method->object != Qnil)
+        rb_gc_mark(method->object);
+
     rb_gc_mark(method->klass_name);
     rb_gc_mark(method->method_name);
-    
+    rb_gc_mark(method->source_file);
+
     if (method->klass != Qnil)
         rb_gc_mark(method->klass);
 
-    if (method->object != Qnil)
-		rb_gc_mark(method->object);
-
     prof_measurement_mark(method->measurement);
-    
-    st_foreach(method->parent_call_infos, prof_method_mark_call_infos, 0);
-    st_foreach(method->child_call_infos, prof_method_mark_call_infos, 0);
-    st_foreach(method->allocations_table, prof_method_mark_allocations, 0);
+
+    rb_st_foreach(method->allocations_table, prof_method_mark_allocations, 0);
 }
 
-static VALUE
-prof_method_allocate(VALUE klass)
+static VALUE prof_method_allocate(VALUE klass)
 {
-    prof_method_t* method_data = prof_method_create(Qnil, Qnil, Qnil, 0);
+    prof_method_t* method_data = prof_method_create(Qnil, Qnil, Qnil, Qnil, 0);
     method_data->object = prof_method_wrap(method_data);
     return method_data->object;
 }
 
-VALUE
-prof_method_wrap(prof_method_t *method)
+static const rb_data_type_t method_info_type =
 {
-  if (method->object == Qnil)
-  {
-      method->object = Data_Wrap_Struct(cRpMethodInfo, prof_method_mark, prof_method_ruby_gc_free, method);
-  }
-  return method->object;
-}
+    .wrap_struct_name = "MethodInfo",
+    .function =
+    {
+        .dmark = prof_method_mark,
+        .dfree = prof_method_ruby_gc_free,
+        .dsize = prof_method_size,
+    },
+    .data = NULL,
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+}; 
 
-prof_method_t *
-prof_method_get(VALUE self)
+VALUE prof_method_wrap(prof_method_t* method)
 {
-    /* Can't use Data_Get_Struct because that triggers the event hook
-       ending up in endless recursion. */
-	prof_method_t* result = DATA_PTR(self);
-
-	if (!result)
+    if (method->object == Qnil)
     {
-	    rb_raise(rb_eRuntimeError, "This RubyProf::MethodInfo instance has already been freed, likely because its profile has been freed.");
-	}
-
-   return result;
+        method->object = TypedData_Wrap_Struct(cRpMethodInfo, &method_info_type, method);
+    }
+    return method->object;
 }
 
-st_table *
-method_table_create()
+st_table* method_table_create()
 {
-    return st_init_numtable();
+    return rb_st_init_numtable();
 }
 
-static int
-method_table_free_iterator(st_data_t key, st_data_t value, st_data_t dummy)
+static int method_table_free_iterator(st_data_t key, st_data_t value, st_data_t dummy)
 {
-    prof_method_free((prof_method_t *)value);
+    prof_method_free((prof_method_t*)value);
     return ST_CONTINUE;
 }
 
-void
-method_table_free(st_table *table)
+void method_table_free(st_table* table)
 {
-    st_foreach(table, method_table_free_iterator, 0);
-    st_free_table(table);
+    rb_st_foreach(table, method_table_free_iterator, 0);
+    rb_st_free_table(table);
 }
 
-size_t
-method_table_insert(st_table *table, st_data_t key, prof_method_t *val)
+size_t method_table_insert(st_table* table, st_data_t key, prof_method_t* val)
 {
-    return st_insert(table, (st_data_t) key, (st_data_t) val);
+    return rb_st_insert(table, (st_data_t)key, (st_data_t)val);
 }
 
-prof_method_t *
-method_table_lookup(st_table *table, st_data_t key)
+prof_method_t* method_table_lookup(st_table* table, st_data_t key)
 {
     st_data_t val;
-    if (st_lookup(table, (st_data_t)key, &val))
+    if (rb_st_lookup(table, (st_data_t)key, &val))
     {
-      return (prof_method_t *) val;
+        return (prof_method_t*)val;
     }
     else
     {
-      return NULL;
+        return NULL;
     }
 }
 
@@ -374,42 +309,15 @@ created.  RubyProf::MethodInfo objects can be accessed via
 the RubyProf::Profile object.
 */
 
-/* call-seq:
-   callers -> array
-
-Returns an array of call info objects that called this method  (ie, parents).*/
-static VALUE
-prof_method_callers(VALUE self)
-{
-    prof_method_t* method = prof_get_method(self);
-    VALUE result = rb_ary_new();
-    st_foreach(method->parent_call_infos, prof_method_collect_call_infos, result);
-    return result;
-}
-
-/* call-seq:
-   callees -> array
-
-Returns an array of call info objects that this method called (ie, children).*/
-static VALUE
-prof_method_callees(VALUE self)
-{
-    prof_method_t* method = prof_get_method(self);
-    VALUE result = rb_ary_new();
-    st_foreach(method->child_call_infos, prof_method_collect_call_infos, result);
-    return result;
-}
-
 /* call-seq:
    allocations -> array
 
 Returns an array of allocation information.*/
-static VALUE
-prof_method_allocations(VALUE self)
+static VALUE prof_method_allocations(VALUE self)
 {
     prof_method_t* method = prof_get_method(self);
     VALUE result = rb_ary_new();
-    st_foreach(method->allocations_table, prof_method_collect_allocations, result);
+    rb_st_foreach(method->allocations_table, prof_method_collect_allocations, result);
     return result;
 }
 
@@ -417,8 +325,7 @@ prof_method_allocations(VALUE self)
    called -> Measurement
 
 Returns the measurement associated with this method. */
-static VALUE
-prof_method_measurement(VALUE self)
+static VALUE prof_method_measurement(VALUE self)
 {
     prof_method_t* method = prof_get_method(self);
     return prof_measurement_wrap(method->measurement);
@@ -431,7 +338,7 @@ return the source file of the method
 */
 static VALUE prof_method_source_file(VALUE self)
 {
-    prof_method_t* method = prof_method_get(self);
+    prof_method_t* method = prof_get_method(self);
     return method->source_file;
 }
 
@@ -439,10 +346,9 @@ static VALUE prof_method_source_file(VALUE self)
    line_no -> int
 
    returns the line number of the method */
-static VALUE
-prof_method_line(VALUE self)
+static VALUE prof_method_line(VALUE self)
 {
-    prof_method_t* method = prof_method_get(self);
+    prof_method_t* method = prof_get_method(self);
     return INT2FIX(method->source_line);
 }
 
@@ -452,10 +358,9 @@ prof_method_line(VALUE self)
 Returns the name of this method's class.  Singleton classes
 will have the form <Object::Object>. */
 
-static VALUE
-prof_method_klass_name(VALUE self)
+static VALUE prof_method_klass_name(VALUE self)
 {
-    prof_method_t *method = prof_method_get(self);
+    prof_method_t* method = prof_get_method(self);
     if (method->klass_name == Qnil)
         method->klass_name = resolve_klass_name(method->klass, &method->klass_flags);
 
@@ -467,10 +372,9 @@ prof_method_klass_name(VALUE self)
 
 Returns the klass flags */
 
-static VALUE
-prof_method_klass_flags(VALUE self)
+static VALUE prof_method_klass_flags(VALUE self)
 {
-    prof_method_t* method = prof_method_get(self);
+    prof_method_t* method = prof_get_method(self);
     return INT2FIX(method->klass_flags);
 }
 
@@ -480,51 +384,36 @@ prof_method_klass_flags(VALUE self)
 Returns the name of this method in the format Object#method.  Singletons
 methods will be returned in the format <Object::Object>#method.*/
 
-static VALUE
-prof_method_name(VALUE self)
+static VALUE prof_method_name(VALUE self)
 {
-    prof_method_t *method = prof_method_get(self);
+    prof_method_t* method = prof_get_method(self);
     return method->method_name;
 }
 
-/* call-seq:
-   root? -> boolean
-
-   Returns the true if this method is at the top of the call stack */
-static VALUE
-prof_method_root(VALUE self)
-{
-    prof_method_t *method = prof_method_get(self);
-    return method->root ? Qtrue : Qfalse;
-}
-
 /* call-seq:
    recursive? -> boolean
 
    Returns the true if this method is recursively invoked */
-static VALUE
-prof_method_recursive(VALUE self)
+static VALUE prof_method_recursive(VALUE self)
 {
-    prof_method_t* method = prof_method_get(self);
+    prof_method_t* method = prof_get_method(self);
     return method->recursive ? Qtrue : Qfalse;
 }
 
 /* call-seq:
-   excluded? -> boolean
+   call_trees -> CallTrees
 
-   Returns the true if this method was excluded */
-static VALUE
-prof_method_excluded(VALUE self)
+Returns the CallTrees associated with this method. */
+static VALUE prof_method_call_trees(VALUE self)
 {
-    prof_method_t* method = prof_method_get(self);
-    return method->excluded ? Qtrue : Qfalse;
+    prof_method_t* method = prof_get_method(self);
+    return prof_call_trees_wrap(method->call_trees);
 }
 
 /* :nodoc: */
-static VALUE
-prof_method_dump(VALUE self)
+static VALUE prof_method_dump(VALUE self)
 {
-    prof_method_t* method_data = DATA_PTR(self);
+    prof_method_t* method_data = prof_get_method(self);
     VALUE result = rb_hash_new();
 
     rb_hash_aset(result, ID2SYM(rb_intern("klass_name")), prof_method_klass_name(self));
@@ -532,27 +421,21 @@ prof_method_dump(VALUE self)
     rb_hash_aset(result, ID2SYM(rb_intern("method_name")), method_data->method_name);
 
     rb_hash_aset(result, ID2SYM(rb_intern("key")), INT2FIX(method_data->key));
-    rb_hash_aset(result, ID2SYM(rb_intern("root")), prof_method_root(self));
     rb_hash_aset(result, ID2SYM(rb_intern("recursive")), prof_method_recursive(self));
-    rb_hash_aset(result, ID2SYM(rb_intern("excluded")), prof_method_excluded(self));
     rb_hash_aset(result, ID2SYM(rb_intern("source_file")), method_data->source_file);
     rb_hash_aset(result, ID2SYM(rb_intern("source_line")), INT2FIX(method_data->source_line));
 
+    rb_hash_aset(result, ID2SYM(rb_intern("call_trees")), prof_call_trees_wrap(method_data->call_trees));
     rb_hash_aset(result, ID2SYM(rb_intern("measurement")), prof_measurement_wrap(method_data->measurement));
-
-    rb_hash_aset(result, ID2SYM(rb_intern("callers")), prof_method_callers(self));
-    rb_hash_aset(result, ID2SYM(rb_intern("callees")), prof_method_callees(self));
-
     rb_hash_aset(result, ID2SYM(rb_intern("allocations")), prof_method_allocations(self));
 
     return result;
 }
 
 /* :nodoc: */
-static VALUE
-prof_method_load(VALUE self, VALUE data)
+static VALUE prof_method_load(VALUE self, VALUE data)
 {
-    prof_method_t* method_data = RDATA(self)->data;
+    prof_method_t* method_data = prof_get_method(self);
     method_data->object = self;
 
     method_data->klass_name = rb_hash_aref(data, ID2SYM(rb_intern("klass_name")));
@@ -560,42 +443,24 @@ prof_method_load(VALUE self, VALUE data)
     method_data->method_name = rb_hash_aref(data, ID2SYM(rb_intern("method_name")));
     method_data->key = FIX2LONG(rb_hash_aref(data, ID2SYM(rb_intern("key"))));
 
-    method_data->root = rb_hash_aref(data, ID2SYM(rb_intern("root"))) == Qtrue ? true : false;
     method_data->recursive = rb_hash_aref(data, ID2SYM(rb_intern("recursive"))) == Qtrue ? true : false;
-    method_data->excluded = rb_hash_aref(data, ID2SYM(rb_intern("excluded"))) == Qtrue ? true : false;
 
     method_data->source_file = rb_hash_aref(data, ID2SYM(rb_intern("source_file")));
     method_data->source_line = FIX2INT(rb_hash_aref(data, ID2SYM(rb_intern("source_line"))));
 
+    VALUE call_trees = rb_hash_aref(data, ID2SYM(rb_intern("call_trees")));
+    method_data->call_trees = prof_get_call_trees(call_trees);
+
     VALUE measurement = rb_hash_aref(data, ID2SYM(rb_intern("measurement")));
     method_data->measurement = prof_get_measurement(measurement);
 
-    VALUE callers = rb_hash_aref(data, ID2SYM(rb_intern("callers")));
-    for (int i = 0; i < rb_array_len(callers); i++)
-    {
-        VALUE call_info = rb_ary_entry(callers, i);
-        prof_call_info_t *call_info_data = prof_get_call_info(call_info);
-        st_data_t key = call_info_data->parent ? call_info_data->parent->key : method_key(Qnil, 0);
-        call_info_table_insert(method_data->parent_call_infos, key, call_info_data);
-    }
-
-    VALUE callees = rb_hash_aref(data, ID2SYM(rb_intern("callees")));
-    for (int i = 0; i < rb_array_len(callees); i++)
-    {
-        VALUE call_info = rb_ary_entry(callees, i);
-        prof_call_info_t *call_info_data = prof_get_call_info(call_info);
-
-        st_data_t key = call_info_data->method ? call_info_data->method->key : method_key(Qnil, 0);
-        call_info_table_insert(method_data->child_call_infos, key, call_info_data);
-    }
-
     VALUE allocations = rb_hash_aref(data, ID2SYM(rb_intern("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);
 
-        st_insert(method_data->allocations_table, allocation_data->key, (st_data_t)allocation_data);
+        rb_st_insert(method_data->allocations_table, allocation_data->key, (st_data_t)allocation_data);
     }
     return data;
 }
@@ -603,28 +468,24 @@ prof_method_load(VALUE self, VALUE data)
 void rp_init_method_info()
 {
     /* MethodInfo */
-    cRpMethodInfo = rb_define_class_under(mProf, "MethodInfo", rb_cData);
+    cRpMethodInfo = rb_define_class_under(mProf, "MethodInfo", rb_cObject);
     rb_undef_method(CLASS_OF(cRpMethodInfo), "new");
     rb_define_alloc_func(cRpMethodInfo, prof_method_allocate);
 
     rb_define_method(cRpMethodInfo, "klass_name", prof_method_klass_name, 0);
     rb_define_method(cRpMethodInfo, "klass_flags", prof_method_klass_flags, 0);
-
     rb_define_method(cRpMethodInfo, "method_name", prof_method_name, 0);
- 
-    rb_define_method(cRpMethodInfo, "callers", prof_method_callers, 0);
-    rb_define_method(cRpMethodInfo, "callees", prof_method_callees, 0);
-    rb_define_method(cRpMethodInfo, "allocations", prof_method_allocations, 0);
 
+    rb_define_method(cRpMethodInfo, "call_trees", prof_method_call_trees, 0);
+
+    rb_define_method(cRpMethodInfo, "allocations", prof_method_allocations, 0);
     rb_define_method(cRpMethodInfo, "measurement", prof_method_measurement, 0);
-        
+
     rb_define_method(cRpMethodInfo, "source_file", prof_method_source_file, 0);
     rb_define_method(cRpMethodInfo, "line", prof_method_line, 0);
 
-    rb_define_method(cRpMethodInfo, "root?", prof_method_root, 0);
     rb_define_method(cRpMethodInfo, "recursive?", prof_method_recursive, 0);
-    rb_define_method(cRpMethodInfo, "excluded?", prof_method_excluded, 0);
 
     rb_define_method(cRpMethodInfo, "_dump_data", prof_method_dump, 0);
     rb_define_method(cRpMethodInfo, "_load_data", prof_method_load, 1);
-}
+}