ruby-prof 0.10.8 → 0.11.0.rc1

data/ext/ruby_prof/extconf.rb

@@ -1,17 +1,12 @@
 require "mkmf"
 
-if RUBY_VERSION >= "1.9"
-  if RUBY_RELEASE_DATE < "2005-03-17"
-    STDERR.print("Ruby version is too old\n")
-    exit(1)
-  end
-elsif RUBY_VERSION >= "1.8"
-  if RUBY_RELEASE_DATE < "2005-03-22"
-    STDERR.print("Ruby version is too old\n")
-    exit(1)
-  end
-else
-  STDERR.print("Ruby version is too old\n")
+if RUBY_VERSION == "1.8.6"
+  STDERR.print("Ruby #{RUBY_VERSION} is no longer supported.  Please upgrade to 1.8.7 or 1.9.2 or higher\n")
+  exit(1)
+end
+
+if RUBY_VERSION == "1.9.0" or RUBY_VERSION == "1.9.1"
+  STDERR.print("Ruby #{RUBY_VERSION} is no longer supported.  Please upgrade to 1.9.2 or higher\n")
   exit(1)
 end
 
@@ -30,9 +25,6 @@ have_func("rb_class_superclass")
 have_func("rb_heap_total_mem")
 have_func("rb_gc_heap_info")
 
-# Ruby 1.9 unexposed methods
-have_func("rb_gc_malloc_allocations")
-have_func("rb_gc_malloc_allocated_size")
 
 def add_define(name, value = nil)
   if value
@@ -41,6 +33,7 @@ def add_define(name, value = nil)
     $defs.push("-D#{name}")
   end
 end
+
 require 'rubygems'
 unless Gem.win_platform? || RUBY_PLATFORM =~ /darwin/
   $LDFLAGS += " -lrt" # for clock_gettime
@@ -57,4 +50,4 @@ if RUBY_VERSION > "1.9"
   add_define("THREADS_INHERIT_EVENT_FLAGS", (threads.size == 2) ? "1" : "0")
 end
 
-create_makefile("ruby_prof_ext")
+create_makefile("ruby_prof")

data/ext/ruby_prof/rp_call_info.c

@@ -0,0 +1,369 @@
+/* Copyright (C) 2005-2011 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"
+
+#define INITIAL_CALL_INFOS_SIZE 2
+
+VALUE cCallInfo;
+
+/* =======  Call Info   ========*/
+st_table *
+call_info_table_create()
+{
+  return st_init_table(&type_method_hash);
+}
+
+size_t
+call_info_table_insert(st_table *table, const prof_method_key_t *key, prof_call_info_t *val)
+{
+  return st_insert(table, (st_data_t) key, (st_data_t) val);
+}
+
+prof_call_info_t *
+call_info_table_lookup(st_table *table, const prof_method_key_t *key)
+{
+    st_data_t val;
+    if (st_lookup(table, (st_data_t) key, &val))
+    {
+      return (prof_call_info_t *) val;
+    }
+    else
+    {
+      return NULL;
+    }
+}
+
+static void
+call_info_table_free(st_table *table)
+{
+    st_free_table(table);
+}
+
+/* Document-class: RubyProf::CallInfo
+RubyProf::CallInfo is a helper class used by RubyProf::MethodInfo
+to keep track of which child methods were called and how long
+they took to execute. */
+
+/* :nodoc: */
+prof_call_info_t *
+prof_call_info_create(prof_method_t* method, prof_call_info_t* parent)
+{
+    prof_call_info_t *result = ALLOC(prof_call_info_t);
+    result->object = Qnil;
+    result->target = method;
+    result->parent = parent;
+    result->call_infos = call_info_table_create();
+    result->children = Qnil;
+
+    result->called = 0;
+    result->total_time = 0;
+    result->self_time = 0;
+    result->wait_time = 0;
+    result->line = 0;
+    return result;
+}
+
+static void
+prof_call_info_mark(prof_call_info_t *call_info)
+{
+  {
+    VALUE target = call_info->target->object;
+    if (NIL_P(target))
+      prof_method_mark(call_info->target);
+    else
+      rb_gc_mark(target);
+  }
+  rb_gc_mark(call_info->children);
+  if (call_info->parent) {
+    VALUE parent = call_info->parent->object;
+    if (NIL_P(parent)) {
+      prof_call_info_mark(call_info->parent);
+    }
+    else {
+      rb_gc_mark(parent);
+    }
+  }
+}
+
+static void
+prof_call_info_free(prof_call_info_t *call_info)
+{
+  call_info_table_free(call_info->call_infos);
+  xfree(call_info);
+}
+
+static VALUE
+prof_call_info_wrap(prof_call_info_t *call_info)
+{
+  if (call_info->object == Qnil)
+  {
+    call_info->object = Data_Wrap_Struct(cCallInfo, prof_call_info_mark, prof_call_info_free, call_info);
+  }
+  return call_info->object;
+}
+
+static prof_call_info_t *
+prof_get_call_info_result(VALUE obj)
+{
+    if (BUILTIN_TYPE(obj) != T_DATA)
+    {
+        /* Should never happen */
+      rb_raise(rb_eTypeError, "Not a call info object");
+    }
+    return (prof_call_info_t *) DATA_PTR(obj);
+}
+
+
+/* call-seq:
+   called -> MethodInfo
+
+Returns the target method. */
+static VALUE
+prof_call_info_target(VALUE self)
+{
+    /* Target is a pointer to a method_info - so we have to be careful
+       about the GC.  We will wrap the method_info but provide no
+       free method so the underlying object is not freed twice! */
+
+    prof_call_info_t *result = prof_get_call_info_result(self);
+    return prof_method_wrap(result->target);
+}
+
+/* call-seq:
+   called -> int
+
+Returns the total amount of times this method was called. */
+static VALUE
+prof_call_info_called(VALUE self)
+{
+    prof_call_info_t *result = prof_get_call_info_result(self);
+    return INT2NUM(result->called);
+}
+
+/* call-seq:
+   called=n -> n
+
+Sets the call count to n. */
+static VALUE
+prof_call_info_set_called(VALUE self, VALUE called)
+{
+    prof_call_info_t *result = prof_get_call_info_result(self);
+    result->called = NUM2INT(called);
+    return called;
+}
+
+/* call-seq:
+   line_no -> int
+
+   returns the line number of the method */
+static VALUE
+prof_call_info_line(VALUE self)
+{
+  prof_call_info_t *result = prof_get_call_info_result(self);
+  return rb_int_new(result->line);
+}
+
+/* call-seq:
+   total_time -> float
+
+Returns the total amount of time spent in this method and its children. */
+static VALUE
+prof_call_info_total_time(VALUE self)
+{
+    prof_call_info_t *result = prof_get_call_info_result(self);
+    return rb_float_new(result->total_time);
+}
+
+/* call-seq:
+   add_total_time(call_info) -> nil
+
+adds total time time from call_info to self. */
+static VALUE
+prof_call_info_add_total_time(VALUE self, VALUE other)
+{
+    prof_call_info_t *result = prof_get_call_info_result(self);
+    prof_call_info_t *other_info = prof_get_call_info_result(other);
+
+    result->total_time += other_info->total_time;
+    return Qnil;
+}
+
+/* call-seq:
+   self_time -> float
+
+Returns the total amount of time spent in this method. */
+static VALUE
+prof_call_info_self_time(VALUE self)
+{
+    prof_call_info_t *result = prof_get_call_info_result(self);
+
+    return rb_float_new(result->self_time);
+}
+
+/* call-seq:
+   add_self_time(call_info) -> nil
+
+adds self time from call_info to self. */
+static VALUE
+prof_call_info_add_self_time(VALUE self, VALUE other)
+{
+    prof_call_info_t *result = prof_get_call_info_result(self);
+    prof_call_info_t *other_info = prof_get_call_info_result(other);
+
+    result->self_time += other_info->self_time;
+    return Qnil;
+}
+
+/* call-seq:
+   wait_time -> float
+
+Returns the total amount of time this method waited for other threads. */
+static VALUE
+prof_call_info_wait_time(VALUE self)
+{
+    prof_call_info_t *result = prof_get_call_info_result(self);
+
+    return rb_float_new(result->wait_time);
+}
+
+/* call-seq:
+   add_wait_time(call_info) -> nil
+
+adds wait time from call_info to self. */
+
+static VALUE
+prof_call_info_add_wait_time(VALUE self, VALUE other)
+{
+    prof_call_info_t *result = prof_get_call_info_result(self);
+    prof_call_info_t *other_info = prof_get_call_info_result(other);
+
+    result->wait_time += other_info->wait_time;
+    return Qnil;
+}
+
+/* call-seq:
+   parent -> call_info
+
+Returns the call_infos parent call_info object (the method that called this method).*/
+static VALUE
+prof_call_info_parent(VALUE self)
+{
+    prof_call_info_t *result = prof_get_call_info_result(self);
+    if (result->parent)
+      return prof_call_info_wrap(result->parent);
+    else
+      return Qnil;
+}
+
+/* call-seq:
+   parent=new_parent -> new_parent
+
+Changes the parent of self to new_parent and returns it.*/
+static VALUE
+prof_call_info_set_parent(VALUE self, VALUE new_parent)
+{
+    prof_call_info_t *result = prof_get_call_info_result(self);
+    if (new_parent == Qnil)
+      result->parent = NULL;
+    else
+      result->parent = prof_get_call_info_result(new_parent);
+    return prof_call_info_parent(self);
+}
+
+static int
+prof_call_info_collect_children(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;
+}
+
+/* call-seq:
+   children -> hash
+
+Returns an array of call info objects of methods that this method
+called (ie, children).*/
+static VALUE
+prof_call_info_children(VALUE self)
+{
+    prof_call_info_t *call_info = prof_get_call_info_result(self);
+    if (call_info->children == Qnil)
+    {
+      call_info->children = rb_ary_new();
+      st_foreach(call_info->call_infos, prof_call_info_collect_children, call_info->children);
+    }
+    return call_info->children;
+}
+
+/* =======  Call Infos   ========*/
+prof_call_infos_t*
+prof_call_infos_create()
+{
+   prof_call_infos_t *result = ALLOC(prof_call_infos_t);
+   result->start = ALLOC_N(prof_call_info_t*, INITIAL_CALL_INFOS_SIZE);
+   result->end = result->start + INITIAL_CALL_INFOS_SIZE;
+   result->ptr = result->start;
+   result->object = Qnil;
+   return result;
+}
+
+void
+prof_call_infos_free(prof_call_infos_t *call_infos)
+{
+  xfree(call_infos->start);
+  xfree(call_infos);
+}
+
+void
+prof_add_call_info(prof_call_infos_t *call_infos, prof_call_info_t *call_info)
+{
+  if (call_infos->ptr == call_infos->end)
+  {
+    size_t len = call_infos->ptr - call_infos->start;
+    size_t new_capacity = (call_infos->end - call_infos->start) * 2;
+    REALLOC_N(call_infos->start, prof_call_info_t*, new_capacity);
+    call_infos->ptr = call_infos->start + len;
+    call_infos->end = call_infos->start + new_capacity;
+  }
+  *call_infos->ptr = call_info;
+  call_infos->ptr++;
+}
+
+VALUE
+prof_call_infos_wrap(prof_call_infos_t *call_infos)
+{
+  if (call_infos->object == Qnil)
+  {
+    prof_call_info_t **i;
+    call_infos->object = rb_ary_new();
+    for(i=call_infos->start; i<call_infos->ptr; i++)
+    {
+      VALUE call_info = prof_call_info_wrap(*i);
+      rb_ary_push(call_infos->object, call_info);
+    }
+  }
+  return call_infos->object;
+}
+
+
+void rp_init_call_info()
+{
+    /* CallInfo */
+    cCallInfo = rb_define_class_under(mProf, "CallInfo", rb_cObject);
+    rb_undef_method(CLASS_OF(cCallInfo), "new");
+    rb_define_method(cCallInfo, "parent", prof_call_info_parent, 0);
+    rb_define_method(cCallInfo, "parent=", prof_call_info_set_parent, 1);
+    rb_define_method(cCallInfo, "children", prof_call_info_children, 0);
+    rb_define_method(cCallInfo, "target", prof_call_info_target, 0);
+    rb_define_method(cCallInfo, "called", prof_call_info_called, 0);
+    rb_define_method(cCallInfo, "called=", prof_call_info_set_called, 1);
+    rb_define_method(cCallInfo, "total_time", prof_call_info_total_time, 0);
+    rb_define_method(cCallInfo, "add_total_time", prof_call_info_add_total_time, 1);
+    rb_define_method(cCallInfo, "self_time", prof_call_info_self_time, 0);
+    rb_define_method(cCallInfo, "add_self_time", prof_call_info_add_self_time, 1);
+    rb_define_method(cCallInfo, "wait_time", prof_call_info_wait_time, 0);
+    rb_define_method(cCallInfo, "add_wait_time", prof_call_info_add_wait_time, 1);
+    rb_define_method(cCallInfo, "line", prof_call_info_line, 0);
+}

data/ext/ruby_prof/rp_call_info.h

@@ -0,0 +1,46 @@
+/* Copyright (C) 2005-2011 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_INFO_H__
+#define __RP_CALL_INFO_H__
+
+#include "rp_measure.h"
+#include "rp_method.h"
+
+extern VALUE cCallInfo;
+
+/* Callers and callee information for a method. */
+typedef struct prof_call_info_t
+{
+    prof_method_t *target; /* Use target instead of method to avoid conflict with Ruby method */
+    struct prof_call_info_t *parent;
+    st_table *call_infos;
+    int called;
+    double total_time;
+    double self_time;
+    double wait_time;
+    int line;
+    VALUE object;
+    VALUE children;
+} prof_call_info_t;
+
+/* Array of call_info objects */
+typedef struct prof_call_infos_t 
+{
+    prof_call_info_t **start;
+    prof_call_info_t **end;
+    prof_call_info_t **ptr;
+    VALUE object;
+} prof_call_infos_t;
+
+
+void rp_init_call_info(void);
+prof_call_infos_t* prof_call_infos_create();
+void prof_call_infos_free(prof_call_infos_t *call_infos);
+void prof_add_call_info(prof_call_infos_t *call_infos, prof_call_info_t *call_info);
+VALUE prof_call_infos_wrap(prof_call_infos_t *call_infos);
+prof_call_info_t * prof_call_info_create(prof_method_t* method, prof_call_info_t* parent);
+prof_call_info_t * call_info_table_lookup(st_table *table, const prof_method_key_t *key);
+size_t call_info_table_insert(st_table *table, const prof_method_key_t *key, prof_call_info_t *val);
+
+#endif //__RP_CALL_INFO_H__