ruby-prof 0.18.0 → 1.2.0

data/ext/ruby_prof/rp_profile.h

@@ -0,0 +1,36 @@
+/* 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 */
+
+#ifndef __RP_PROFILE_H__
+#define __RP_PROFILE_H__
+
+#include "ruby_prof.h"
+#include "rp_measurement.h"
+#include "rp_thread.h"
+
+extern VALUE cProfile;
+
+typedef struct
+{
+    VALUE running;
+    VALUE paused;
+
+    prof_measurer_t* measurer;
+
+    VALUE tracepoints;
+
+    st_table* threads_tbl;
+    st_table* exclude_threads_tbl;
+    st_table* include_threads_tbl;
+    st_table* exclude_methods_tbl;
+    thread_data_t* last_thread_data;
+    double measurement_at_pause_resume;
+    bool allow_exceptions;
+    bool merge_fibers;
+} prof_profile_t;
+
+void rp_init_profile(void);
+prof_profile_t* prof_get_profile(VALUE self);
+
+
+#endif //__RP_PROFILE_H__

data/ext/ruby_prof/rp_stack.c

@@ -3,171 +3,202 @@
 
 #include "rp_stack.h"
 
-#define INITIAL_STACK_SIZE 8
+#define INITIAL_STACK_SIZE 16
 
-void
-prof_frame_pause(prof_frame_t *frame, double current_measurement)
+// Creates a stack of prof_frame_t to keep track of timings for active methods.
+prof_stack_t* prof_stack_create()
 {
-    if (frame && prof_frame_is_unpaused(frame))
-        frame->pause_time = current_measurement;
+    prof_stack_t* stack = ALLOC(prof_stack_t);
+    stack->start = ZALLOC_N(prof_frame_t, INITIAL_STACK_SIZE);
+    stack->ptr = stack->start;
+    stack->end = stack->start + INITIAL_STACK_SIZE;
+
+    return stack;
 }
 
-void
-prof_frame_unpause(prof_frame_t *frame, double current_measurement)
+void prof_stack_free(prof_stack_t* stack)
 {
-    if (frame && prof_frame_is_paused(frame)) {
-        frame->dead_time += (current_measurement - frame->pause_time);
-        frame->pause_time = -1;
+    xfree(stack->start);
+    xfree(stack);
+}
+
+prof_frame_t* prof_stack_last(prof_stack_t* stack)
+{
+    if (stack->ptr == stack->start)
+        return NULL;
+    else
+        return stack->ptr - 1;
+}
+
+void prof_stack_verify_size(prof_stack_t* stack)
+{
+    // Is there space on the stack?  If not, double its size.
+    if (stack->ptr == stack->end)
+    {
+        size_t len = stack->ptr - stack->start;
+        size_t new_capacity = (stack->end - stack->start) * 2;
+        REALLOC_N(stack->start, prof_frame_t, new_capacity);
+
+        /* Memory just got moved, reset pointers */
+        stack->ptr = stack->start + len;
+        stack->end = stack->start + new_capacity;
     }
 }
 
+prof_frame_t* prof_stack_push(prof_stack_t* stack)
+{
+    prof_stack_verify_size(stack);
+
+    prof_frame_t* result = stack->ptr;
+    stack->ptr++;
+    return result;
+}
 
-/* Creates a stack of prof_frame_t to keep track
-   of timings for active methods. */
-prof_stack_t *
-prof_stack_create()
+prof_frame_t* prof_stack_pop(prof_stack_t* stack)
 {
-    prof_stack_t *stack = ALLOC(prof_stack_t);
-    stack->start = ALLOC_N(prof_frame_t, INITIAL_STACK_SIZE);
-    stack->ptr = stack->start;
-    stack->end = stack->start + INITIAL_STACK_SIZE;
+    prof_frame_t* result = prof_stack_last(stack);
+    if (result)
+        stack->ptr--;
 
-    return stack;
+    return result;
 }
 
-void
-prof_stack_free(prof_stack_t *stack)
+// ----------------  Frame Methods  ----------------------------
+void prof_frame_pause(prof_frame_t* frame, double current_measurement)
 {
-    xfree(stack->start);
-    xfree(stack);
+    if (frame && prof_frame_is_unpaused(frame))
+        frame->pause_time = current_measurement;
 }
 
-prof_frame_t *
-prof_stack_push(prof_stack_t *stack, prof_call_info_t *call_info, double measurement, int paused)
+void prof_frame_unpause(prof_frame_t* frame, double current_measurement)
 {
-  prof_frame_t *result;
-  prof_frame_t* parent_frame;
-  prof_method_t *method;
-
-  /* Is there space on the stack?  If not, double
-     its size. */
-  if (stack->ptr == stack->end)
-  {
-    size_t len = stack->ptr - stack->start;
-    size_t new_capacity = (stack->end - stack->start) * 2;
-    REALLOC_N(stack->start, prof_frame_t, new_capacity);
-    /* Memory just got moved, reset pointers */
-    stack->ptr = stack->start + len;
-    stack->end = stack->start + new_capacity;
-  }
-
-  parent_frame = prof_stack_peek(stack);
-
-  // Reserve the next available frame pointer.
-  result = stack->ptr++;
-
-  result->call_info = call_info;
-  result->call_info->depth = (int)(stack->ptr - stack->start); // shortening of 64 bit into 32;
-  result->passes = 0;
-
-  result->start_time = measurement;
-  result->pause_time = -1; // init as not paused.
-  result->switch_time = 0;
-  result->wait_time = 0;
-  result->child_time = 0;
-  result->dead_time = 0;
-
-  method = call_info->target;
-
-  /* If the method was visited previously, it's recursive. */
-  if (method->visits > 0)
-  {
-    method->recursive = 1;
-    call_info->recursive = 1;
-  }
-  /* Enter the method. */
-  method->visits++;
-
-  // Unpause the parent frame, if it exists.
-  // If currently paused then:
-  //   1) The child frame will begin paused.
-  //   2) The parent will inherit the child's dead time.
-  prof_frame_unpause(parent_frame, measurement);
-
-  if (paused) {
-    prof_frame_pause(result, measurement);
-  }
-
-  // Return the result
-  return result;
+    if (prof_frame_is_paused(frame))
+    {
+        frame->dead_time += (current_measurement - frame->pause_time);
+        frame->pause_time = -1;
+    }
 }
 
-prof_frame_t *
-prof_stack_pop(prof_stack_t *stack, double measurement)
+prof_frame_t* prof_frame_current(prof_stack_t* stack)
 {
-  prof_frame_t *frame;
-  prof_frame_t *parent_frame;
-  prof_call_info_t *call_info;
-  prof_method_t *method;
+    return prof_stack_last(stack);
+}
 
-  double total_time;
-  double self_time;
+prof_frame_t* prof_frame_push(prof_stack_t* stack, prof_call_tree_t* call_tree, double measurement, bool paused)
+{
+    prof_frame_t* parent_frame = prof_stack_last(stack);
+    prof_frame_t* result = prof_stack_push(stack);
+
+    result->call_tree = call_tree;
+
+    result->start_time = measurement;
+    result->pause_time = -1; // init as not paused.
+    result->switch_time = 0;
+    result->wait_time = 0;
+    result->child_time = 0;
+    result->dead_time = 0;
+    result->source_file = Qnil;
+    result->source_line = 0;
+
+    call_tree->measurement->called++;
+    call_tree->visits++;
+
+    if (call_tree->method->visits > 0)
+    {
+        call_tree->method->recursive = true;
+    }
+    call_tree->method->measurement->called++;
+    call_tree->method->visits++;
+
+    // Unpause the parent frame, if it exists.
+    // If currently paused then:
+    //   1) The child frame will begin paused.
+    //   2) The parent will inherit the child's dead time.
+    if (parent_frame)
+        prof_frame_unpause(parent_frame, measurement);
+
+    if (paused)
+    {
+        prof_frame_pause(result, measurement);
+    }
 
-  frame = prof_stack_peek(stack);
+    // Return the result
+    return result;
+}
 
-  /* Frame can be null, which means the stack is empty.  This can happen if
-     RubProf.start is called from a method that exits.  And it can happen if an
-     exception is raised in code that is being profiled and the stack unwinds
-     (RubyProf is not notified of that by the ruby runtime. */
-  if (!frame) {
-    return NULL;
-  }
+prof_frame_t* prof_frame_unshift(prof_stack_t* stack, prof_call_tree_t* parent_call_tree, prof_call_tree_t* call_tree, double measurement)
+{
+    if (prof_stack_last(stack))
+        rb_raise(rb_eRuntimeError, "Stach unshift can only be called with an empty stack");
 
-  /* Match passes until we reach the frame itself. */
-  if (prof_frame_is_pass(frame)) {
-    frame->passes--;
-    /* Additional frames can be consumed. See pop_frames(). */
-    return frame;
-  }
+    parent_call_tree->measurement->total_time = call_tree->measurement->total_time;
+    parent_call_tree->measurement->self_time = 0;
+    parent_call_tree->measurement->wait_time = call_tree->measurement->wait_time;
+
+    parent_call_tree->method->measurement->total_time += call_tree->measurement->total_time;
+    parent_call_tree->method->measurement->wait_time += call_tree->measurement->wait_time;
+
+    return prof_frame_push(stack, parent_call_tree, measurement, false);
+}
+
+prof_frame_t* prof_frame_pop(prof_stack_t* stack, double measurement)
+{
+    prof_frame_t* frame = prof_stack_pop(stack);
 
-  /* Consume this frame. */
-  stack->ptr--;
+    if (!frame)
+        return NULL;
 
-  /* Calculate the total time this method took */
-  prof_frame_unpause(frame, measurement);
-  total_time = measurement - frame->start_time - frame->dead_time;
-  self_time = total_time - frame->child_time - frame->wait_time;
+    /* Calculate the total time this method took */
+    prof_frame_unpause(frame, measurement);
 
-  /* Update information about the current method */
-  call_info = frame->call_info;
-  method = call_info->target;
+    double total_time = measurement - frame->start_time - frame->dead_time;
+    double self_time = total_time - frame->child_time - frame->wait_time;
 
-  call_info->called++;
-  call_info->total_time += total_time;
-  call_info->self_time += self_time;
-  call_info->wait_time += frame->wait_time;
+    /* Update information about the current method */
+    prof_call_tree_t* call_tree = frame->call_tree;
 
-  /* Leave the method. */
-  method->visits--;
+    // Update method measurement
+    call_tree->method->measurement->self_time += self_time;
+    call_tree->method->measurement->wait_time += frame->wait_time;
+    if (call_tree->method->visits == 1)
+        call_tree->method->measurement->total_time += total_time;
 
-  parent_frame = prof_stack_peek(stack);
-  if (parent_frame)
-  {
-      parent_frame->child_time += total_time;
-      parent_frame->dead_time += frame->dead_time;
+    call_tree->method->visits--;
 
-      call_info->line = parent_frame->line;
-  }
+    // Update method measurement
+    call_tree->measurement->self_time += self_time;
+    call_tree->measurement->wait_time += frame->wait_time;
+    if (call_tree->visits == 1)
+        call_tree->measurement->total_time += total_time;
 
-  return frame;
+    call_tree->visits--;
+    
+    prof_frame_t* parent_frame = prof_stack_last(stack);
+    if (parent_frame)
+    {
+        parent_frame->child_time += total_time;
+        parent_frame->dead_time += frame->dead_time;
+    }
+
+    frame->source_file = Qnil;
+
+    return frame;
 }
 
-prof_frame_t *
-prof_stack_pass(prof_stack_t *stack)
+prof_method_t* prof_find_method(prof_stack_t* stack, VALUE source_file, int source_line)
 {
-  prof_frame_t *frame = prof_stack_peek(stack);
-  if (frame) {
-    frame->passes++;
-  }
-  return frame;
+    prof_frame_t* frame = stack->ptr;
+    while (frame >= stack->start)
+    {
+        if (!frame->call_tree)
+            return NULL;
+
+        if (rb_str_equal(source_file, frame->call_tree->method->source_file) &&
+            source_line >= frame->call_tree->method->source_line)
+        {
+            return frame->call_tree->method;
+        }
+        frame--;
+    }
+    return NULL;
 }

data/ext/ruby_prof/rp_stack.h

@@ -4,23 +4,20 @@
 #ifndef __RP_STACK__
 #define __RP_STACK__
 
-#include <ruby.h>
+#include "ruby_prof.h"
+#include "rp_call_tree.h"
 
-#include "rp_measure.h"
-#include "rp_call_info.h"
-
-
-/* Temporary object that maintains profiling information
-   for active methods.  They are created and destroyed
-   as the program moves up and down its stack. */
+   /* Temporary object that maintains profiling information
+      for active methods.  They are created and destroyed
+      as the program moves up and down its stack. */
 typedef struct
 {
     /* Caching prof_method_t values significantly
        increases performance. */
-    prof_call_info_t *call_info;
+    prof_call_tree_t* call_tree;
 
-    unsigned int line;
-    unsigned int passes; /* Count of "pass" frames, _after_ this one. */
+    VALUE source_file;
+    unsigned int source_line;
 
     double start_time;
     double switch_time;  /* Time at switch to different thread */
@@ -30,9 +27,6 @@ typedef struct
     double dead_time; // Time to ignore (i.e. total amount of time between pause/resume blocks)
 } prof_frame_t;
 
-#define prof_frame_is_real(f) ((f)->passes == 0)
-#define prof_frame_is_pass(f) ((f)->passes > 0)
-
 #define prof_frame_is_paused(f) (f->pause_time >= 0)
 #define prof_frame_is_unpaused(f) (f->pause_time < 0)
 
@@ -42,22 +36,18 @@ void prof_frame_unpause(prof_frame_t*, double current_measurement);
 /* Current stack of active methods.*/
 typedef struct
 {
-    prof_frame_t *start;
-    prof_frame_t *end;
-    prof_frame_t *ptr;
+    prof_frame_t* start;
+    prof_frame_t* end;
+    prof_frame_t* ptr;
 } prof_stack_t;
 
-prof_stack_t *prof_stack_create();
-void prof_stack_free(prof_stack_t *stack);
-
-prof_frame_t *prof_stack_push(prof_stack_t *stack, prof_call_info_t *call_info, double measurement, int paused);
-prof_frame_t *prof_stack_pop(prof_stack_t *stack, double measurement);
-prof_frame_t *prof_stack_pass(prof_stack_t *stack);
-
-static inline prof_frame_t *
-prof_stack_peek(prof_stack_t *stack) {
-    return stack->ptr != stack->start ? stack->ptr - 1 : NULL;
-}
+prof_stack_t* prof_stack_create(void);
+void prof_stack_free(prof_stack_t* stack);
 
+prof_frame_t* prof_frame_current(prof_stack_t* stack);
+prof_frame_t* prof_frame_push(prof_stack_t* stack, prof_call_tree_t* call_tree, double measurement, bool paused);
+prof_frame_t* prof_frame_unshift(prof_stack_t* stack, prof_call_tree_t* parent_call_tree, prof_call_tree_t* call_tree, double measurement);
+prof_frame_t* prof_frame_pop(prof_stack_t* stack, double measurement);
+prof_method_t* prof_find_method(prof_stack_t* stack, VALUE source_file, int source_line);
 
 #endif //__RP_STACK__

data/ext/ruby_prof/rp_thread.c

@@ -1,91 +1,123 @@
 /* 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 */
 
-#include "ruby_prof.h"
+/* Document-class: RubyProf::Thread
+
+The Thread class contains profile results for a single fiber (note a Ruby thread can run multiple fibers).
+You cannot create an instance of RubyProf::Thread, instead you access it from a RubyProf::Profile object.
+
+  profile = RubyProf::Profile.profile do
+              ...
+            end
+
+  profile.threads.each do |thread|
+    thread.root_methods.sort.each do |method|
+      puts method.total_time
+    end
+  end */
+
+#include "rp_thread.h"
+#include "rp_profile.h"
 
 VALUE cRpThread;
 
-/* ======   thread_data_t  ====== */
-thread_data_t*
-thread_data_create()
+// ======   thread_data_t  ====== 
+thread_data_t* thread_data_create(void)
 {
     thread_data_t* result = ALLOC(thread_data_t);
     result->stack = prof_stack_create();
     result->method_table = method_table_create();
+    result->call_tree = NULL;
     result->object = Qnil;
     result->methods = Qnil;
+    result->fiber_id = Qnil;
+    result->thread_id = Qnil;
+    result->trace = true;
+    result->fiber = Qnil;
     return result;
 }
 
-/* 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
-thread_data_ruby_gc_free(thread_data_t* thread_data)
+static int mark_methods(st_data_t key, st_data_t value, st_data_t result)
 {
-    /* Has this thread object been accessed by Ruby?  If
-       yes clean it up so to avoid a segmentation fault. */
-    if (thread_data->object != Qnil)
-    {
-        RDATA(thread_data->object)->data = NULL;
-        RDATA(thread_data->object)->dfree = NULL;
-        RDATA(thread_data->object)->dmark = NULL;
-    }
-    thread_data->object = Qnil;
+    prof_method_t* method = (prof_method_t*)value;
+    prof_method_mark(method);
+    return ST_CONTINUE;
 }
 
-static void
-thread_data_free(thread_data_t* thread_data)
+size_t prof_thread_size(const void* data)
 {
-    thread_data_ruby_gc_free(thread_data);
-    method_table_free(thread_data->method_table);
-    prof_stack_free(thread_data->stack);
-
-    thread_data->thread_id = Qnil;
-
-    xfree(thread_data);
+    return sizeof(prof_call_tree_t);
 }
 
-static int
-mark_methods(st_data_t key, st_data_t value, st_data_t result)
+void prof_thread_mark(void* data)
 {
-    prof_method_t *method = (prof_method_t *) value;
-    prof_method_mark(method);
-    return ST_CONTINUE;
-}
+    thread_data_t* thread = (thread_data_t*)data;
 
-void
-prof_thread_mark(thread_data_t *thread)
-{
     if (thread->object != Qnil)
         rb_gc_mark(thread->object);
 
+    rb_gc_mark(thread->fiber);
+
     if (thread->methods != Qnil)
         rb_gc_mark(thread->methods);
 
+    if (thread->fiber_id != Qnil)
+        rb_gc_mark(thread->fiber_id);
+
     if (thread->thread_id != Qnil)
         rb_gc_mark(thread->thread_id);
 
-    if (thread->fiber_id != Qnil)
-        rb_gc_mark(thread->fiber_id);
+    if (thread->call_tree)
+        prof_call_tree_mark(thread->call_tree);
 
-    st_foreach(thread->method_table, mark_methods, 0);
+    rb_st_foreach(thread->method_table, mark_methods, 0);
 }
 
-VALUE
-prof_thread_wrap(thread_data_t *thread)
+void prof_thread_ruby_gc_free(void* data)
 {
-    if (thread->object == Qnil) {
-        thread->object = Data_Wrap_Struct(cRpThread, prof_thread_mark, thread_data_ruby_gc_free, thread);
+    thread_data_t* thread_data = (thread_data_t*)data;
+    thread_data->object = Qnil;
+}
+
+static void prof_thread_free(thread_data_t* thread_data)
+{
+    /* Has this method object been accessed by Ruby?  If
+       yes then set its data to nil to avoid a segmentation fault on the next mark and sweep. */
+    if (thread_data->object != Qnil)
+    {
+        RDATA(thread_data->object)->dmark = NULL;
+        RDATA(thread_data->object)->dfree = NULL;
+        RDATA(thread_data->object)->data = NULL;
+        thread_data->object = Qnil;
+    }
+
+    method_table_free(thread_data->method_table);
+
+    if (thread_data->call_tree)
+        prof_call_tree_free(thread_data->call_tree);
+
+    prof_stack_free(thread_data->stack);
+
+    xfree(thread_data);
+}
+
+VALUE prof_thread_wrap(thread_data_t* thread)
+{
+    if (thread->object == Qnil)
+    {
+        thread->object = Data_Wrap_Struct(cRpThread, prof_thread_mark, prof_thread_ruby_gc_free, thread);
     }
     return thread->object;
 }
 
-static thread_data_t*
-prof_get_thread(VALUE self)
+static VALUE prof_thread_allocate(VALUE klass)
+{
+    thread_data_t* thread_data = thread_data_create();
+    thread_data->object = prof_thread_wrap(thread_data);
+    return thread_data->object;
+}
+
+static thread_data_t* prof_get_thread(VALUE self)
 {
     /* Can't use Data_Get_Struct because that triggers the event hook
        ending up in endless recursion. */
@@ -96,105 +128,99 @@ prof_get_thread(VALUE self)
     return result;
 }
 
-/* ======   Thread Table  ====== */
-/* The thread table is hash keyed on ruby thread_id that stores instances
-   of thread_data_t. */
+// ======   Thread Table  ======
+// The thread table is hash keyed on ruby fiber_id that stores instances of thread_data_t. 
 
-st_table *
-threads_table_create()
+st_table* threads_table_create()
 {
-    return st_init_numtable();
+    return rb_st_init_numtable();
 }
 
-static int
-thread_table_free_iterator(st_data_t key, st_data_t value, st_data_t dummy)
+static int thread_table_free_iterator(st_data_t key, st_data_t value, st_data_t dummy)
 {
-    thread_data_free((thread_data_t*)value);
+    prof_thread_free((thread_data_t*)value);
     return ST_CONTINUE;
 }
 
-void
-threads_table_free(st_table *table)
+void threads_table_free(st_table* table)
 {
-    st_foreach(table, thread_table_free_iterator, 0);
-    st_free_table(table);
+    rb_st_foreach(table, thread_table_free_iterator, 0);
+    rb_st_free_table(table);
 }
 
-size_t
-threads_table_insert(prof_profile_t* profile, VALUE key, thread_data_t *thread_data)
+thread_data_t* threads_table_lookup(void* prof, VALUE fiber)
 {
-	unsigned LONG_LONG key_value = NUM2ULL(key);
-	return st_insert(profile->threads_tbl, key_value, (st_data_t) thread_data);
+    prof_profile_t* profile = prof;
+    thread_data_t* result = NULL;
+    st_data_t val;
+
+    if (rb_st_lookup(profile->threads_tbl, fiber, &val))
+    {
+        result = (thread_data_t*)val;
+    }
+
+    return result;
 }
 
-thread_data_t *
-threads_table_lookup(prof_profile_t* profile, VALUE thread_id, VALUE fiber_id)
+thread_data_t* threads_table_insert(void* prof, VALUE fiber)
 {
-    thread_data_t* result;
-    st_data_t val;
+    prof_profile_t* profile = prof;
+    thread_data_t* result = thread_data_create();
+    VALUE thread = rb_thread_current();
 
-    /* If we should merge fibers, we use the thread_id as key, otherwise the fiber id.
-       None of this is perfect, as garbage collected fiber/thread might be reused again later.
-       A real solution would require integration with the garbage collector.
-     */
-    VALUE key = profile->merge_fibers ? thread_id : fiber_id;
-    unsigned LONG_LONG key_value = NUM2ULL(key);
-    if (st_lookup(profile->threads_tbl, key_value, &val))
+    result->fiber = fiber;
+    result->fiber_id = rb_obj_id(fiber);
+    result->thread_id = rb_obj_id(thread);
+    rb_st_insert(profile->threads_tbl, (st_data_t)fiber, (st_data_t)result);
+
+    // Are we tracing this thread?
+    if (profile->include_threads_tbl && !rb_st_lookup(profile->include_threads_tbl, thread, 0))
+    {
+        result->trace = false;
+    }
+    else if (profile->exclude_threads_tbl && rb_st_lookup(profile->exclude_threads_tbl, thread, 0))
     {
-      result = (thread_data_t *) val;
+        result->trace = false;
     }
     else
     {
-        result = thread_data_create();
-        result->thread_id = thread_id;
-        /* We set fiber id to 0 in the merge fiber case. Real fibers never have id 0,
-           so we can identify them later during printing.
-        */
-        result->fiber_id = profile->merge_fibers ? INT2FIX(0) : fiber_id;
-        /* Insert the table */
-        threads_table_insert(profile, key, result);
+        result->trace = true;
     }
+
     return result;
 }
 
-thread_data_t *
-switch_thread(void* prof, VALUE thread_id, VALUE fiber_id)
+// ======   Profiling Methods  ======
+void switch_thread(void* prof, thread_data_t* thread_data, double measurement)
 {
-    prof_profile_t* profile = (prof_profile_t*)prof;
-    double measurement = profile->measurer->measure();
-
-    /* Get new thread information. */
-    thread_data_t *thread_data = threads_table_lookup(profile, thread_id, fiber_id);
+    prof_profile_t* profile = prof;
 
     /* Get current frame for this thread */
-    prof_frame_t *frame = prof_stack_peek(thread_data->stack);
-
-    /* Update the time this thread waited for another thread */
+    prof_frame_t* frame = prof_frame_current(thread_data->stack);
     if (frame)
     {
         frame->wait_time += measurement - frame->switch_time;
-        frame->switch_time = measurement;
+        frame->switch_time = 0;
     }
 
     /* Save on the last thread the time of the context switch
        and reset this thread's last context switch to 0.*/
     if (profile->last_thread_data)
     {
-       prof_frame_t *last_frame = prof_stack_peek(profile->last_thread_data->stack);
-       if (last_frame)
-         last_frame->switch_time = measurement;
+        prof_frame_t* last_frame = prof_frame_current(profile->last_thread_data->stack);
+        if (last_frame)
+            last_frame->switch_time = measurement;
     }
 
     profile->last_thread_data = thread_data;
-    return thread_data;
 }
 
 int pause_thread(st_data_t key, st_data_t value, st_data_t data)
 {
-    thread_data_t* thread_data = (thread_data_t *) value;
+    thread_data_t* thread_data = (thread_data_t*)value;
     prof_profile_t* profile = (prof_profile_t*)data;
 
-    prof_frame_t* frame = prof_stack_peek(thread_data->stack);
+    prof_frame_t* frame = prof_frame_current(thread_data->stack);
     prof_frame_pause(frame, profile->measurement_at_pause_resume);
 
     return ST_CONTINUE;
@@ -202,37 +228,33 @@ int pause_thread(st_data_t key, st_data_t value, st_data_t data)
 
 int unpause_thread(st_data_t key, st_data_t value, st_data_t data)
 {
-    thread_data_t* thread_data = (thread_data_t *) value;
+    thread_data_t* thread_data = (thread_data_t*)value;
     prof_profile_t* profile = (prof_profile_t*)data;
 
-    prof_frame_t* frame = prof_stack_peek(thread_data->stack);
+    prof_frame_t* frame = prof_frame_current(thread_data->stack);
     prof_frame_unpause(frame, profile->measurement_at_pause_resume);
 
     return ST_CONTINUE;
 }
 
-static int
-collect_methods(st_data_t key, st_data_t value, st_data_t result)
+// ======   Helper Methods  ======
+static int collect_methods(st_data_t key, st_data_t value, st_data_t result)
 {
     /* Called for each method stored in a thread's method table.
        We want to store the method info information into an array.*/
-    VALUE methods = (VALUE) result;
-    prof_method_t *method = (prof_method_t *) value;
-
-    if (!method->excluded) {
-      rb_ary_push(methods, prof_method_wrap(method));
-    }
+    VALUE methods = (VALUE)result;
+    prof_method_t* method = (prof_method_t*)value;
+    rb_ary_push(methods, prof_method_wrap(method));
 
     return ST_CONTINUE;
 }
 
-
+// ======   RubyProf::Thread  ======
 /* call-seq:
    id -> number
 
-Returns the id of this thread. */
-static VALUE
-prof_thread_id(VALUE self)
+Returns the thread id of this thread. */
+static VALUE prof_thread_id(VALUE self)
 {
     thread_data_t* thread = prof_get_thread(self);
     return thread->thread_id;
@@ -242,36 +264,82 @@ prof_thread_id(VALUE self)
    fiber_id -> number
 
 Returns the fiber id of this thread. */
-static VALUE
-prof_fiber_id(VALUE self)
+static VALUE prof_fiber_id(VALUE self)
 {
     thread_data_t* thread = prof_get_thread(self);
     return thread->fiber_id;
 }
 
 /* call-seq:
-   methods -> Array of MethodInfo
+   call_tree -> CallTree
+
+Returns the root of the call tree. */
+static VALUE prof_call_tree(VALUE self)
+{
+    thread_data_t* thread = prof_get_thread(self);
+    return prof_call_tree_wrap(thread->call_tree);
+}
+
+/* call-seq:
+   methods -> [RubyProf::MethodInfo]
 
 Returns an array of methods that were called from this
 thread during program execution. */
-static VALUE
-prof_thread_methods(VALUE self)
+static VALUE prof_thread_methods(VALUE self)
 {
     thread_data_t* thread = prof_get_thread(self);
     if (thread->methods == Qnil)
     {
         thread->methods = rb_ary_new();
-        st_foreach(thread->method_table, collect_methods, thread->methods);
+        rb_st_foreach(thread->method_table, collect_methods, thread->methods);
     }
     return thread->methods;
 }
 
-void rp_init_thread()
+/* :nodoc: */
+static VALUE prof_thread_dump(VALUE self)
+{
+    thread_data_t* thread_data = DATA_PTR(self);
+
+    VALUE result = rb_hash_new();
+    rb_hash_aset(result, ID2SYM(rb_intern("fiber_id")), thread_data->fiber_id);
+    rb_hash_aset(result, ID2SYM(rb_intern("methods")), prof_thread_methods(self));
+    rb_hash_aset(result, ID2SYM(rb_intern("call_tree")), prof_call_tree(self));
+
+    return result;
+}
+
+/* :nodoc: */
+static VALUE prof_thread_load(VALUE self, VALUE data)
+{
+    thread_data_t* thread_data = DATA_PTR(self);
+
+    VALUE call_tree = rb_hash_aref(data, ID2SYM(rb_intern("call_tree")));
+    thread_data->call_tree = prof_get_call_tree(call_tree);
+
+    thread_data->fiber_id = rb_hash_aref(data, ID2SYM(rb_intern("fiber_id")));
+
+    VALUE methods = rb_hash_aref(data, ID2SYM(rb_intern("methods")));
+    for (int i = 0; i < rb_array_len(methods); i++)
+    {
+        VALUE method = rb_ary_entry(methods, i);
+        prof_method_t* method_data = DATA_PTR(method);
+        method_table_insert(thread_data->method_table, method_data->key, method_data);
+    }
+
+    return data;
+}
+
+void rp_init_thread(void)
 {
-    cRpThread = rb_define_class_under(mProf, "Thread", rb_cObject);
+    cRpThread = rb_define_class_under(mProf, "Thread", rb_cData);
     rb_undef_method(CLASS_OF(cRpThread), "new");
+    rb_define_alloc_func(cRpThread, prof_thread_allocate);
 
     rb_define_method(cRpThread, "id", prof_thread_id, 0);
+    rb_define_method(cRpThread, "call_tree", prof_call_tree, 0);
     rb_define_method(cRpThread, "fiber_id", prof_fiber_id, 0);
     rb_define_method(cRpThread, "methods", prof_thread_methods, 0);
+    rb_define_method(cRpThread, "_dump_data", prof_thread_dump, 0);
+    rb_define_method(cRpThread, "_load_data", prof_thread_load, 1);
 }