ruby-prof 0.12.2 → 0.13.0

data/doc/RubyProf/GraphPrinter.html

@@ -203,7 +203,7 @@ href="../README_rdoc.html">README</a></p>
 
 <footer id="validator-badges">
   <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
-  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.
+  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.1.
   <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> 3.
 </footer>
 

data/doc/RubyProf/MethodInfo.html

@@ -707,7 +707,7 @@
 
 <footer id="validator-badges">
   <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
-  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.
+  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.1.
   <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> 3.
 </footer>
 

data/doc/RubyProf/MultiPrinter.html

@@ -401,7 +401,7 @@ base name for the pofile file, defaults to “profile”.</p>
 
 <footer id="validator-badges">
   <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
-  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.
+  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.1.
   <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> 3.
 </footer>
 

data/doc/RubyProf/Profile.html

@@ -815,7 +815,7 @@ prof_threads(VALUE self)
 
 <footer id="validator-badges">
   <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
-  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.
+  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.1.
   <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> 3.
 </footer>
 

data/doc/RubyProf/ProfileTask.html

@@ -526,7 +526,7 @@ rake profile TESTOPTS=&quot;--runner=fox&quot;   # use the fox test runner</pre>
 
 <footer id="validator-badges">
   <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
-  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.
+  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.1.
   <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> 3.
 </footer>
 

data/doc/RubyProf/Test.html

@@ -572,7 +572,7 @@
 
 <footer id="validator-badges">
   <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
-  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.
+  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.1.
   <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> 3.
 </footer>
 

data/doc/RubyProf/Thread.html

@@ -256,7 +256,7 @@
 
 <footer id="validator-badges">
   <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
-  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.
+  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.1.
   <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> 3.
 </footer>
 

data/doc/created.rid

@@ -1,5 +1,6 @@
-Wed, 13 Feb 2013 12:28:24 +0100
+Sun, 10 Mar 2013 11:08:41 +0100
 bin/ruby-prof	Sat, 02 Feb 2013 10:23:19 +0100
+bin/ruby-prof-check-trace	Sun, 10 Mar 2013 10:57:14 +0100
 examples/flat.txt	Tue, 29 Jan 2013 16:43:39 +0100
 examples/graph.txt	Tue, 29 Jan 2013 16:43:39 +0100
 examples/graph.html	Tue, 29 Jan 2013 16:43:39 +0100
@@ -10,22 +11,22 @@ lib/ruby-prof/call_info_visitor.rb	Tue, 29 Jan 2013 16:44:27 +0100
 lib/ruby-prof/compatibility.rb	Sun, 03 Feb 2013 12:16:49 +0100
 lib/ruby-prof/method_info.rb	Tue, 29 Jan 2013 16:44:27 +0100
 lib/ruby-prof/printers/abstract_printer.rb	Tue, 29 Jan 2013 16:43:39 +0100
-lib/ruby-prof/printers/call_info_printer.rb	Tue, 29 Jan 2013 16:44:27 +0100
-lib/ruby-prof/printers/call_stack_printer.rb	Tue, 29 Jan 2013 16:44:27 +0100
+lib/ruby-prof/printers/call_info_printer.rb	Sun, 10 Mar 2013 10:57:14 +0100
+lib/ruby-prof/printers/call_stack_printer.rb	Sun, 10 Mar 2013 10:57:14 +0100
 lib/ruby-prof/printers/call_tree_printer.rb	Tue, 29 Jan 2013 16:43:39 +0100
 lib/ruby-prof/printers/dot_printer.rb	Tue, 29 Jan 2013 16:44:27 +0100
-lib/ruby-prof/printers/flat_printer.rb	Tue, 29 Jan 2013 16:44:27 +0100
+lib/ruby-prof/printers/flat_printer.rb	Sun, 10 Mar 2013 10:57:14 +0100
 lib/ruby-prof/printers/flat_printer_with_line_numbers.rb	Tue, 29 Jan 2013 16:44:27 +0100
-lib/ruby-prof/printers/graph_html_printer.rb	Tue, 29 Jan 2013 16:44:27 +0100
-lib/ruby-prof/printers/graph_printer.rb	Tue, 29 Jan 2013 16:44:27 +0100
+lib/ruby-prof/printers/graph_html_printer.rb	Sun, 10 Mar 2013 10:57:14 +0100
+lib/ruby-prof/printers/graph_printer.rb	Sun, 10 Mar 2013 10:57:14 +0100
 lib/ruby-prof/printers/multi_printer.rb	Tue, 29 Jan 2013 16:43:39 +0100
 lib/ruby-prof/profile.rb	Tue, 29 Jan 2013 16:44:27 +0100
-lib/ruby-prof/rack.rb	Tue, 29 Jan 2013 16:44:27 +0100
+lib/ruby-prof/rack.rb	Sun, 10 Mar 2013 10:56:55 +0100
 lib/ruby-prof/task.rb	Tue, 29 Jan 2013 16:43:39 +0100
 lib/ruby-prof/test.rb	Tue, 29 Jan 2013 16:43:39 +0100
 lib/ruby-prof/thread.rb	Tue, 29 Jan 2013 16:44:27 +0100
 lib/unprof.rb	Tue, 29 Jan 2013 16:43:39 +0100
-ext/ruby_prof/ruby_prof.c	Sun, 03 Feb 2013 12:16:38 +0100
-ext/ruby_prof/version.h	Wed, 13 Feb 2013 10:39:51 +0100
-README.rdoc	Tue, 29 Jan 2013 16:44:27 +0100
+ext/ruby_prof/ruby_prof.c	Sun, 10 Mar 2013 10:57:14 +0100
+ext/ruby_prof/version.h	Sun, 10 Mar 2013 11:07:12 +0100
+README.rdoc	Sun, 10 Mar 2013 10:56:55 +0100
 LICENSE	Tue, 29 Jan 2013 16:43:39 +0100

data/doc/examples/flat_txt.html

@@ -185,7 +185,7 @@ total time of 8.72 seconds.</p>
 
 <footer id="validator-badges">
   <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
-  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.
+  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.1.
   <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> 3.
 </footer>
 

data/doc/examples/graph_txt.html

@@ -299,7 +299,7 @@ in the graph table.</p>
 
 <footer id="validator-badges">
   <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
-  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.
+  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.1.
   <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> 3.
 </footer>
 

data/doc/index.html

@@ -445,7 +445,7 @@ other printers to create several reports in one profiling run</p>
 <p>To use a printer:</p>
 
 <pre class="ruby"><span class="ruby-operator">...</span>
-<span class="ruby-identifier">result</span> = <span class="ruby-constant">RubyProf</span>.<span class="ruby-identifier">end</span>
+<span class="ruby-identifier">result</span> = <span class="ruby-constant">RubyProf</span>.<span class="ruby-identifier">stop</span>
 <span class="ruby-identifier">printer</span> = <span class="ruby-constant">RubyProf</span><span class="ruby-operator">::</span><span class="ruby-constant">GraphPrinter</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">result</span>)
 <span class="ruby-identifier">printer</span>.<span class="ruby-identifier">print</span>(<span class="ruby-constant">STDOUT</span>, :<span class="ruby-identifier">min_percent</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">2</span>)
 </pre>
@@ -633,7 +633,7 @@ href="http://groups.google.com/group/ruby-optimization">groups.google.com/group/
 
 <footer id="validator-badges">
   <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
-  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.
+  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.1.
   <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> 3.
 </footer>
 

data/doc/js/darkfish.js

@@ -109,13 +109,15 @@ function hookSearch() {
 function highlightTarget( anchor ) {
   console.debug( "Highlighting target '%s'.", anchor );
 
-  $("a[name=" + anchor + "]").each( function() {
-    if ( !$(this).parent().parent().hasClass('target-section') ) {
-      console.debug( "Wrapping the target-section" );
-      $('div.method-detail').unwrap( 'div.target-section' );
-      $(this).parent().wrap( '<div class="target-section"></div>' );
-    } else {
-      console.debug( "Already wrapped." );
+  $("a[name]").each( function() {
+    if ( $(this).attr("name") == anchor ) {
+      if ( !$(this).parent().parent().hasClass('target-section') ) {
+        console.debug( "Wrapping the target-section" );
+        $('div.method-detail').unwrap( 'div.target-section' );
+        $(this).parent().wrap( '<div class="target-section"></div>' );
+      } else {
+        console.debug( "Already wrapped." );
+      }
     }
   });
 };

data/doc/table_of_contents.html

@@ -456,7 +456,7 @@
 
 <footer id="validator-badges">
   <p><a href="http://validator.w3.org/check/referer">[Validate]</a>
-  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.
+  <p>Generated by <a href="https://github.com/rdoc/rdoc">RDoc</a> 3.12.1.
   <p>Generated with the <a href="http://deveiate.org/projects/Darkfish-Rdoc/">Darkfish Rdoc Generator</a> 3.
 </footer>
 

data/ext/ruby_prof/extconf.rb

@@ -25,6 +25,8 @@ have_func("rb_class_superclass")
 have_func("rb_heap_total_mem")
 have_func("rb_gc_heap_info")
 
+# whether our ruby has fibers
+have_func("rb_fiber_current")
 
 def add_define(name, value = nil)
   if value

data/ext/ruby_prof/rp_thread.c

@@ -65,10 +65,13 @@ prof_thread_mark(thread_data_t *thread)
 	
 	if (thread->methods != Qnil)
 		rb_gc_mark(thread->methods);
-	
+
 	if (thread->thread_id != Qnil)
 		rb_gc_mark(thread->thread_id);
 
+	if (thread->fiber_id != Qnil)
+		rb_gc_mark(thread->fiber_id);
+
 	st_foreach(thread->method_table, mark_methods, 0);
 }
 
@@ -119,20 +122,20 @@ threads_table_free(st_table *table)
 }
 
 size_t
-threads_table_insert(prof_profile_t* profile, VALUE thread, thread_data_t *thread_data)
+threads_table_insert(prof_profile_t* profile, VALUE fiber, thread_data_t *thread_data)
 {
     /* Its too slow to key on the real thread id so just typecast thread instead. */
-    return st_insert(profile->threads_tbl, (st_data_t) thread, (st_data_t) thread_data);
+    return st_insert(profile->threads_tbl, (st_data_t) fiber, (st_data_t) thread_data);
 }
 
 thread_data_t *
-threads_table_lookup(prof_profile_t* profile, VALUE thread_id)
+threads_table_lookup(prof_profile_t* profile, VALUE thread_id, VALUE fiber_id)
 {
     thread_data_t* result;
     st_data_t val;
 
     /* Its too slow to key on the real thread id so just typecast thread instead. */
-    if (st_lookup(profile->threads_tbl, (st_data_t) thread_id, &val))
+    if (st_lookup(profile->threads_tbl, (st_data_t) fiber_id, &val))
     {
       result = (thread_data_t *) val;
     }
@@ -140,21 +143,22 @@ threads_table_lookup(prof_profile_t* profile, VALUE thread_id)
     {
         result = thread_data_create();
         result->thread_id = thread_id;
+        result->fiber_id = fiber_id;
 
         /* Insert the table */
-        threads_table_insert(profile, thread_id, result);
+        threads_table_insert(profile, fiber_id, result);
     }
     return result;
 }
 
 thread_data_t *
-switch_thread(void* prof, VALUE thread_id)
+switch_thread(void* prof, VALUE thread_id, VALUE fiber_id)
 {
     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);
+    thread_data_t *thread_data = threads_table_lookup(profile, thread_id, fiber_id);
 
     /* Get current frame for this thread */
     prof_frame_t *frame = prof_stack_peek(thread_data->stack);
@@ -225,6 +229,17 @@ prof_thread_id(VALUE self)
 	return thread->thread_id;
 }
 
+/* call-seq:
+   fiber_id -> number
+
+Returns the fiber id of this thread. */
+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
 
@@ -248,5 +263,6 @@ void rp_init_thread()
     rb_undef_method(CLASS_OF(cRpThread), "new");
 
     rb_define_method(cRpThread, "id", prof_thread_id, 0);
+    rb_define_method(cRpThread, "fiber_id", prof_fiber_id, 0);
     rb_define_method(cRpThread, "methods", prof_thread_methods, 0);
 }

data/ext/ruby_prof/rp_thread.h

@@ -5,18 +5,19 @@
 #define __RP_THREAD__
 
 /* Profiling information for a thread. */
-typedef struct 
+typedef struct
 {
-	VALUE object;                     /* Cache to wrapped object */
-	VALUE methods;                    /* Array of RubyProf::MethodInfo */
+    VALUE object;                     /* Cache to wrapped object */
+    VALUE methods;                    /* Array of RubyProf::MethodInfo */
     VALUE thread_id;                  /* Thread id */
+    VALUE fiber_id;                   /* Fiber id */
     st_table* method_table;           /* Methods called in the thread */
     prof_stack_t* stack;              /* Stack of frames */
 } thread_data_t;
 
 void rp_init_thread();
 st_table * threads_table_create();
-thread_data_t* switch_thread(void* prof, VALUE thread_id);
+thread_data_t* switch_thread(void* prof, VALUE thread_id, VALUE fiber_id);
 void threads_table_free(st_table *table);
 VALUE prof_thread_wrap(thread_data_t *thread);
 void prof_thread_mark(thread_data_t *thread);

data/ext/ruby_prof/ruby_prof.c

@@ -123,13 +123,13 @@ static prof_method_t*
 static int
 pop_frames(st_data_t key, st_data_t value, st_data_t data)
 {
-    VALUE thread_id = (VALUE)key;
+    VALUE fiber_id = (VALUE)key;
     thread_data_t* thread_data = (thread_data_t *) value;
     prof_profile_t* profile = (prof_profile_t*) data;
 	double measurement = profile->measurer->measure();
 
-    if (!profile->last_thread_data || profile->last_thread_data->thread_id != thread_id)
-      thread_data = switch_thread(profile, thread_id);
+    if (!profile->last_thread_data || profile->last_thread_data->fiber_id != fiber_id)
+      thread_data = switch_thread(profile, Qnil, fiber_id);
     else
       thread_data = profile->last_thread_data;
 
@@ -155,10 +155,16 @@ static void
 prof_trace(prof_profile_t* profile, rb_event_flag_t event, NODE *node, ID mid, VALUE klass, double measurement)
 #endif
 {
-    static VALUE last_thread_id = Qnil;
+    static VALUE last_fiber_id = Qnil;
 
     VALUE thread = rb_thread_current();
     VALUE thread_id = rb_obj_id(thread);
+#if defined(HAVE_RB_FIBER_CURRENT)
+    VALUE fiber = rb_fiber_current();
+    VALUE fiber_id = rb_obj_id(fiber);
+#else
+    VALUE fiber_id = thread_id;
+#endif
     const char* class_name = NULL;
     const char* method_name = rb_id2name(mid);
     const char* source_file = rb_sourcefile();
@@ -171,15 +177,16 @@ prof_trace(prof_profile_t* profile, rb_event_flag_t event, NODE *node, ID mid, V
 
     class_name = rb_class2name(klass);
 
-    if (last_thread_id != thread_id)
+    if (last_fiber_id != fiber_id)
     {
         fprintf(trace_file, "\n");
     }
 
-    fprintf(trace_file, "%2u:%2ums %-8s %s:%2d  %s#%s\n",
-            (unsigned int) thread_id, (unsigned int) measurement, event_name, source_file, source_line, class_name, method_name);
+    fprintf(trace_file, "%2lu:%2lu:%2ums %-8s %s:%2d  %s#%s\n",
+            (unsigned long) thread_id, (unsigned long) fiber_id, (unsigned int) measurement*1000,
+            event_name, source_file, source_line, class_name, method_name);
     fflush(trace_file);
-    last_thread_id = thread_id;
+    last_fiber_id = fiber_id;
 }
 
 #ifdef RUBY_VM
@@ -198,6 +205,8 @@ prof_event_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE kla
     
     VALUE thread = Qnil;
     VALUE thread_id = Qnil;
+    VALUE fiber = Qnil;
+    VALUE fiber_id = Qnil;
     thread_data_t* thread_data = NULL;
     prof_frame_t *frame = NULL;
     double measurement;
@@ -230,6 +239,13 @@ prof_event_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE kla
     /* Get the current thread information. */
     thread = rb_thread_current();
     thread_id = rb_obj_id(thread);
+#if defined(HAVE_RB_FIBER_CURRENT)
+    fiber = rb_fiber_current();
+    fiber_id = rb_obj_id(fiber);
+#else
+    fiber = thread;
+    fiber_id = thread_id;
+#endif
 
     if (st_lookup(profile->exclude_threads_tbl, (st_data_t) thread_id, 0))
     {
@@ -237,8 +253,8 @@ prof_event_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE kla
     }
 
     /* Was there a context switch? */
-    if (!profile->last_thread_data || profile->last_thread_data->thread_id != thread_id)
-      thread_data = switch_thread(profile, thread_id);
+    if (!profile->last_thread_data || profile->last_thread_data->fiber_id != fiber_id)
+      thread_data = switch_thread(profile, thread_id, fiber_id);
     else
       thread_data = profile->last_thread_data;
 

data/ext/ruby_prof/version.h

@@ -1,7 +1,7 @@
 /* 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 */
 
-#define RUBY_PROF_VERSION  "0.12.2" // as a string, for easy parsing from rake files
+#define RUBY_PROF_VERSION  "0.13.0" // as a string, for easy parsing from rake files
 #define RUBY_PROF_VERSION_MAJ   0
-#define RUBY_PROF_VERSION_MIN   12
-#define RUBY_PROF_VERSION_MIC   2
+#define RUBY_PROF_VERSION_MIN   13
+#define RUBY_PROF_VERSION_MIC   0

data/lib/ruby-prof/printers/call_info_printer.rb

@@ -12,6 +12,7 @@ module RubyProf
 
     def print_header(thread)
       @output << "Thread ID: #{thread.id}\n"
+      @output << "Fiber ID: #{thread.fiber_id}\n"
       @output << "Total Time: #{thread.total_time}\n"
       @output << "Sort by: #{sort_method}\n"
       @output << "\n"
@@ -37,4 +38,4 @@ module RubyProf
       end
     end
   end
-end
+end

data/lib/ruby-prof/printers/call_stack_printer.rb

@@ -49,9 +49,12 @@ module RubyProf
       end
 
       @result.threads.each do |thread|
-        @current_thread_id = thread.id
+        @current_thread_id = thread.fiber_id
         @overall_time = thread.total_time
-        @output.print "<div class=\"thread\">Thread: #{thread.id} (#{"%4.2f%%" % ((@overall_time/@overall_threads_time)*100)} ~ #{@overall_time})</div>"
+        thread_info = "Thread: #{thread.id}"
+        thread_info << ", Fiber: #{thread.fiber_id}" unless thread.id == thread.fiber_id
+        thread_info << " (#{"%4.2f%%" % ((@overall_time/@overall_threads_time)*100)} ~ #{@overall_time})"
+        @output.print "<div class=\"thread\">#{thread_info}</div>"
         @output.print "<ul name=\"thread\">"
         thread.methods.each do |m|
           # $stderr.print m.dump
@@ -195,14 +198,14 @@ module RubyProf
       @output.puts "<title>#{h title}</title>"
       print_css
       print_java_script
-      @output.puts '</head><body>'
+      @output.puts '</head><body><div style="display: inline-block;">'
       print_title_bar
       print_commands
       print_help
     end
 
     def print_footer
-      @output.puts '<div id="sentinel"></div></body></html>'
+      @output.puts '<div id="sentinel"></div></div></body></html>'
     end
 
     def print_css