Merge pull request #1 from tmm1/v2

v2
krunal · Jan 20, 2013 · a5149cb · a5149cb
2 parents 0610a78 + ee7766d
commit a5149cb
Show file tree

Hide file tree

Showing 3 changed files with 226 additions and 110 deletions.
diff --git a/ext/rblineprof.c b/ext/rblineprof.c
@@ -5,25 +5,69 @@
 
 #include <ruby.h>
 #include <node.h>
+#include <env.h>
 #include <intern.h>
 #include <st.h>
 #include <re.h>
 
+typedef uint64_t prof_time_t;
+
 static VALUE gc_hook;
 
-typedef struct {
+/*
+ * Struct representing an individual line of
+ * Ruby source code
+ */
+typedef struct sourceline {
+  uint64_t calls; // total number of calls
+  prof_time_t total_time;
+  prof_time_t max_time;
+} sourceline_t;
+
+/*
+ * Struct representing a single Ruby file.
+ */
+typedef struct sourcefile {
   char *filename;
-  uint64_t *lines;
   long nlines;
+  sourceline_t *lines;
 
-  uint64_t last_time;
-  long last_line;
+  prof_time_t exclusive_start;
+  prof_time_t exclusive_time;
 } sourcefile_t;
 
+/*
+ * An individual stack frame used to track
+ * calls and returns from Ruby methods
+ */
+typedef struct stackframe {
+  // data emitted from Ruby to our profiler hook
+  rb_event_t event;
+  NODE *node;
+  VALUE self;
+  ID mid;
+  VALUE klass;
+
+  char *filename;
+  long line;
+
+  prof_time_t start;
+  sourcefile_t *srcfile;
+} stackframe_t;
+
+/*
+ * Static properties and rbineprof configuration
+ */
 static struct {
   bool enabled;
-  char *last_file;
-  long last_line;
+
+  // stack
+  #define MAX_STACK_DEPTH 32768
+  stackframe_t stack[MAX_STACK_DEPTH];
+  uint64_t stack_depth;
+
+  // current file
+  sourcefile_t *curr_srcfile;
 
   // single file mode, store filename and line data directly
   char *source_filename;
@@ -32,118 +76,168 @@ static struct {
   // regex mode, store file data in hash table
   VALUE source_regex;
   st_table *files;
-  sourcefile_t *last_sourcefile;
 }
 rblineprof = {
   .enabled = false,
-  .last_file = NULL,
-  .last_line = 0,
-  .source_filename = NULL,
-  .source_regex = Qfalse,
-  .files = NULL,
-  .last_sourcefile = NULL
+  .source_regex = Qfalse
 };
 
-static uint64_t
+static prof_time_t
 timeofday_usec()
 {
   struct timeval tv;
   gettimeofday(&tv, NULL);
-  return (uint64_t)tv.tv_sec*1e6 +
-         (uint64_t)tv.tv_usec;
+  return (prof_time_t)tv.tv_sec*1e6 +
+         (prof_time_t)tv.tv_usec;
 }
 
 static inline void
-sourcefile_record(sourcefile_t *sourcefile, uint64_t now)
+stackframe_record(stackframe_t *frame, prof_time_t now)
 {
-  if (sourcefile->last_time && sourcefile->last_line) {
-    /* allocate space for per-line data the first time */
-    if (sourcefile->lines == NULL) {
-      sourcefile->nlines = sourcefile->last_line + 100;
-      sourcefile->lines = ALLOC_N(uint64_t, sourcefile->nlines);
-      MEMZERO(sourcefile->lines, uint64_t, sourcefile->nlines);
-    }
-
-    /* grow the per-line array if necessary */
-    if (sourcefile->last_line >= sourcefile->nlines) {
-      long prev_nlines = sourcefile->nlines;
-      sourcefile->nlines = sourcefile->last_line + 100;
+  sourcefile_t *srcfile = frame->srcfile;
+  long line = frame->line;
+
+  /* allocate space for per-line data the first time */
+  if (srcfile->lines == NULL) {
+    srcfile->nlines = line + 100;
+    srcfile->lines = ALLOC_N(sourceline_t, srcfile->nlines);
+    MEMZERO(srcfile->lines, sourceline_t, srcfile->nlines);
+  }
 
-      REALLOC_N(sourcefile->lines, uint64_t, sourcefile->nlines);
-      MEMZERO(sourcefile->lines + prev_nlines, uint64_t, sourcefile->nlines - prev_nlines);
-    }
+  /* grow the per-line array if necessary */
+  if (line >= srcfile->nlines) {
+    long prev_nlines = srcfile->nlines;
+    srcfile->nlines = line + 100;
 
-    /* record the sample */
-    sourcefile->lines[sourcefile->last_line] += (now - sourcefile->last_time);
-    sourcefile->last_time = now;
+    REALLOC_N(srcfile->lines, sourceline_t, srcfile->nlines);
+    MEMZERO(srcfile->lines + prev_nlines, sourceline_t, srcfile->nlines - prev_nlines);
   }
+
+  /* record the sample */
+  prof_time_t diff = now - frame->start;
+  sourceline_t *srcline = &(srcfile->lines[line]);
+  srcline->calls++;
+  srcline->total_time += diff;
+  if (diff > srcline->max_time)
+    srcline->max_time = diff;
 }
 
-static void
-profiler_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
+static inline sourcefile_t*
+sourcefile_lookup(char *filename)
 {
-  sourcefile_t *sourcefile = NULL;
-
-  if (!node) return;
-
-  char *file = node->nd_file;
-  long line  = nd_line(node);
-
-  if (!file) return;
-  if (line <= 0) return;
-
-  // skip duplicate events fast
-  if (file == rblineprof.last_file && line == rblineprof.last_line)
-    return;
-  rblineprof.last_file = file;
-  rblineprof.last_line = line;
+  sourcefile_t *srcfile = NULL;
 
   if (rblineprof.source_filename) { // single file mode
-    if (rblineprof.source_filename == file) {
-      sourcefile = &rblineprof.file;
-      sourcefile->filename = file;
+    if (rblineprof.source_filename == filename) { // compare char*, not contents
+      srcfile = &rblineprof.file;
+      srcfile->filename = filename;
     } else {
-      return;
+      return NULL;
     }
 
   } else { // regex mode
-    st_lookup(rblineprof.files, (st_data_t)file, (st_data_t *)&sourcefile);
+    st_lookup(rblineprof.files, (st_data_t)filename, (st_data_t *)&srcfile);
 
-    if ((VALUE)sourcefile == Qnil) // known negative match, skip
-      return;
+    if ((VALUE)srcfile == Qnil) // known negative match, skip
+      return NULL;
 
-    if (!sourcefile) { // unknown file, check against regex
-      if (rb_reg_search(rblineprof.source_regex, rb_str_new2(file), 0, 0) >= 0) {
-        sourcefile = ALLOC_N(sourcefile_t, 1);
-        MEMZERO(sourcefile, sourcefile_t, 1);
-        sourcefile->filename = strdup(file);
-        st_insert(rblineprof.files, (st_data_t)sourcefile->filename, (st_data_t)sourcefile);
+    if (!srcfile) { // unknown file, check against regex
+      if (rb_reg_search(rblineprof.source_regex, rb_str_new2(filename), 0, 0) >= 0) {
+        srcfile = ALLOC_N(sourcefile_t, 1);
+        MEMZERO(srcfile, sourcefile_t, 1);
+        srcfile->filename = strdup(filename);
+        st_insert(rblineprof.files, (st_data_t)srcfile->filename, (st_data_t)srcfile);
       } else { // no match, insert Qnil to prevent regex next time
-        st_insert(rblineprof.files, (st_data_t)strdup(file), (st_data_t)Qnil);
-        return;
+        st_insert(rblineprof.files, (st_data_t)strdup(filename), (st_data_t)Qnil);
+        return NULL;
       }
     }
   }
 
-  if (sourcefile) {
-    uint64_t now = timeofday_usec();
+  return srcfile;
+}
 
-    /* increment if the line in the current file changed */
-    if (sourcefile->last_line != line) {
-      sourcefile_record(sourcefile, now);
-    }
-    sourcefile->last_line = line;
+static void
+profiler_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
+{
+  char *file;
+  long line;
+  stackframe_t *frame = NULL;
+  sourcefile_t *srcfile, *curr_srcfile;
+  prof_time_t now = timeofday_usec();
+
+  /* file profiler: when invoking a method in a new file, account elapsed
+   * time to the current file and start a new timer.
+   */
+  if (!node) return;
 
-    if (!sourcefile->last_time)
-      sourcefile->last_time = now;
+  file = node->nd_file;
+  line = nd_line(node);
+  if (!file) return;
+  if (line <= 0) return;
 
-    /* if we came from another file, increment there and reset */
-    if (rblineprof.last_sourcefile && rblineprof.last_sourcefile != sourcefile) {
-      sourcefile_record(rblineprof.last_sourcefile, now);
-      rblineprof.last_sourcefile->last_line = 0;
-    }
+  srcfile = sourcefile_lookup(file);
+  curr_srcfile = rblineprof.curr_srcfile;
+
+  if (curr_srcfile != srcfile) {
+    if (curr_srcfile)
+      curr_srcfile->exclusive_time += now - curr_srcfile->exclusive_start;
 
-    rblineprof.last_sourcefile = sourcefile;
+    if (srcfile)
+      srcfile->exclusive_start = now;
+
+    rblineprof.curr_srcfile = srcfile;
+  }
+
+  /* line profiler: maintain a stack of CALL events with timestamps. for
+   * each corresponding RETURN, account elapsed time to the calling line.
+   *
+   * we use ruby_current_node here to get the caller's file/line info,
+   * (as opposed to node, which points to the callee method being invoked)
+   */
+  NODE *caller_node = ruby_frame->node;
+  if (!caller_node) return;
+
+  file = caller_node->nd_file;
+  line = nd_line(caller_node);
+  if (!file) return;
+  if (line <= 0) return;
+
+  if (caller_node->nd_file != node->nd_file)
+    srcfile = sourcefile_lookup(file);
+  if (!srcfile) return; /* skip line profiling for this file */
+
+  switch (event) {
+    case RUBY_EVENT_CALL:
+    case RUBY_EVENT_C_CALL:
+      rblineprof.stack_depth++;
+      if (rblineprof.stack_depth > 0 && rblineprof.stack_depth < MAX_STACK_DEPTH) {
+        frame = &rblineprof.stack[rblineprof.stack_depth-1];
+        frame->event = event;
+        frame->node = node;
+        frame->self = self;
+        frame->mid = mid;
+        frame->klass = klass;
+        frame->line = line;
+        frame->start = now;
+        frame->srcfile = srcfile;
+      }
+      break;
+
+    case RUBY_EVENT_RETURN:
+    case RUBY_EVENT_C_RETURN:
+      do {
+        if (rblineprof.stack_depth > 0 && rblineprof.stack_depth < MAX_STACK_DEPTH)
+          frame = &rblineprof.stack[rblineprof.stack_depth-1];
+        else
+          frame = NULL;
+        rblineprof.stack_depth--;
+      } while (frame && frame->self != self && frame->mid != mid && frame->klass != klass);
+
+      if (frame)
+        stackframe_record(frame, now);
+
+      break;
   }
 }
 
@@ -165,17 +259,18 @@ cleanup_files(st_data_t key, st_data_t record, st_data_t arg)
 static int
 summarize_files(st_data_t key, st_data_t record, st_data_t arg)
 {
-  sourcefile_t *sourcefile = (sourcefile_t*)record;
-  if (!sourcefile || (VALUE)sourcefile == Qnil) return ST_CONTINUE;
+  sourcefile_t *srcfile = (sourcefile_t*)record;
+  if (!srcfile || (VALUE)srcfile == Qnil) return ST_CONTINUE;
 
   VALUE ret = (VALUE)arg;
   VALUE ary = rb_ary_new();
   long i;
 
-  for (i=0; i<sourcefile->nlines; i++)
-    rb_ary_store(ary, i, ULL2NUM(sourcefile->lines[i]));
+  rb_ary_store(ary, 0, ULL2NUM(srcfile->exclusive_time));
+  for (i=1; i<srcfile->nlines; i++)
+    rb_ary_store(ary, i, rb_ary_new3(2, ULL2NUM(srcfile->lines[i].total_time), ULL2NUM(srcfile->lines[i].calls)));
 
-  rb_hash_aset(ret, rb_str_new2(sourcefile->filename), ary);
+  rb_hash_aset(ret, rb_str_new2(srcfile->filename), ary);
 
   return ST_CONTINUE;
 }
@@ -208,9 +303,7 @@ lineprof(VALUE self, VALUE filename)
   }
 
   // reset state
-  rblineprof.last_file = NULL;
-  rblineprof.last_line = 0;
-  rblineprof.last_sourcefile = NULL;
+  rblineprof.curr_srcfile = NULL;
   st_foreach(rblineprof.files, cleanup_files, 0);
   if (rblineprof.file.lines) {
     xfree(rblineprof.file.lines);
@@ -219,18 +312,18 @@ lineprof(VALUE self, VALUE filename)
   }
 
   rblineprof.enabled = true;
-  rb_add_event_hook(profiler_hook, RUBY_EVENT_ALL);
+  rb_add_event_hook(profiler_hook, RUBY_EVENT_CALL|RUBY_EVENT_RETURN|RUBY_EVENT_C_CALL|RUBY_EVENT_C_RETURN);
   rb_ensure(rb_yield, Qnil, lineprof_ensure, self);
 
+  sourcefile_t *curr_srcfile = rblineprof.curr_srcfile;
+  if (curr_srcfile)
+    curr_srcfile->exclusive_time += timeofday_usec() - curr_srcfile->exclusive_start;
+
   VALUE ret = rb_hash_new();
   VALUE ary = Qnil;
 
   if (rblineprof.source_filename) {
-    long i;
-    ary = rb_ary_new();
-    for (i=0; i<rblineprof.file.nlines; i++)
-      rb_ary_store(ary, i, ULL2NUM(rblineprof.file.lines[i]));
-    rb_hash_aset(ret, rb_str_new2(rblineprof.source_filename), ary);
+    summarize_files(Qnil, (st_data_t)&rblineprof.file, ret);
   } else {
     st_foreach(rblineprof.files, summarize_files, ret);
   }
@@ -254,3 +347,5 @@ Init_rblineprof()
   rblineprof.files = st_init_strtable();
   rb_define_global_function("lineprof", lineprof, 1);
 }
+
+/* vim: ts=2,sw=2,expandtab */
diff --git a/rblineprof.gemspec b/rblineprof.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rblineprof'
-  s.version = '0.2.1'
+  s.version = '0.2.5'
   s.homepage = 'http://github.com/tmm1/rblineprof'
 
   s.authors = 'Aman Gupta'