ruby-prof 0.15.9 → 0.16.0

data/doc/RubyProf/Cmd.html

@@ -331,8 +331,8 @@
     <span class="ruby-identifier">opts</span>.<span class="ruby-identifier">on</span>(<span class="ruby-string">&#39;--mode=measure_mode&#39;</span>,
             [<span class="ruby-value">:process</span>, <span class="ruby-value">:wall</span>, <span class="ruby-value">:cpu</span>, <span class="ruby-value">:allocations</span>, <span class="ruby-value">:memory</span>, <span class="ruby-value">:gc_runs</span>, <span class="ruby-value">:gc_time</span>],
             <span class="ruby-string">&#39;Select what ruby-prof should measure:&#39;</span>,
-            <span class="ruby-string">&#39;  process - Process time (default).&#39;</span>,
-            <span class="ruby-string">&#39;  wall - Wall time.&#39;</span>,
+            <span class="ruby-string">&#39;  wall - Wall time (default).&#39;</span>,
+            <span class="ruby-string">&#39;  process - Process time.&#39;</span>,
             <span class="ruby-string">&#39;  cpu - CPU time (Pentium and PowerPCs only).&#39;</span>,
             <span class="ruby-string">&#39;  allocations - Object allocations (requires patched Ruby interpreter).&#39;</span>,
             <span class="ruby-string">&#39;  memory - Allocated memory in KB (requires patched Ruby interpreter).&#39;</span>,
@@ -340,10 +340,10 @@
             <span class="ruby-string">&#39;  gc_time - Time spent in garbage collection (requires patched Ruby interpreter).&#39;</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">measure_mode</span><span class="ruby-operator">|</span>
 
       <span class="ruby-keyword">case</span> <span class="ruby-identifier">measure_mode</span>
-      <span class="ruby-keyword">when</span> <span class="ruby-value">:process</span>
-        <span class="ruby-identifier">options</span>.<span class="ruby-identifier">measure_mode</span> = <span class="ruby-constant">RubyProf</span><span class="ruby-operator">::</span><span class="ruby-constant">PROCESS_TIME</span>
       <span class="ruby-keyword">when</span> <span class="ruby-value">:wall</span>
         <span class="ruby-identifier">options</span>.<span class="ruby-identifier">measure_mode</span> = <span class="ruby-constant">RubyProf</span><span class="ruby-operator">::</span><span class="ruby-constant">WALL_TIME</span>
+      <span class="ruby-keyword">when</span> <span class="ruby-value">:process</span>
+        <span class="ruby-identifier">options</span>.<span class="ruby-identifier">measure_mode</span> = <span class="ruby-constant">RubyProf</span><span class="ruby-operator">::</span><span class="ruby-constant">PROCESS_TIME</span>
       <span class="ruby-keyword">when</span> <span class="ruby-value">:cpu</span>
         <span class="ruby-identifier">options</span>.<span class="ruby-identifier">measure_mode</span> = <span class="ruby-constant">RubyProf</span><span class="ruby-operator">::</span><span class="ruby-constant">CPU_TIME</span>
       <span class="ruby-keyword">when</span> <span class="ruby-value">:allocations</span>
@@ -625,7 +625,7 @@
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/doc/RubyProf/DotPrinter.html

@@ -155,7 +155,7 @@ tool to reformat the output into a wide variety of outputs:</p>
         <div class="method-description">
           
           <p>Creates the <a href="DotPrinter.html">DotPrinter</a> using a
-RubyProf::Result.</p>
+RubyProf::Proile.</p>
           
           
             <div class="method-calls-super">
@@ -251,7 +251,7 @@ to use the :min_percent option, for example:</p>
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/doc/RubyProf/FlatPrinter.html

@@ -157,7 +157,7 @@ printer.print(STDOUT, {})</pre>
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/doc/RubyProf/FlatPrinterWithLineNumbers.html

@@ -202,7 +202,7 @@ printer.print(STDOUT, {})</pre>
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/doc/RubyProf/GraphHtmlPrinter.html

@@ -546,7 +546,7 @@ be printed out.</p>
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/doc/RubyProf/GraphPrinter.html

@@ -133,7 +133,7 @@ href="../README_rdoc.html">README</a></p>
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/doc/RubyProf/MethodInfo.html

@@ -643,7 +643,7 @@
           <div class="method-source-code" id="to_s-source">
             <pre><span class="ruby-comment"># File lib/ruby-prof/method_info.rb, line 116</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">to_s</span>
-  <span class="ruby-node">&quot;#{self.full_name} (c: #{self.called}, tt: #{self.total_time}, st: #{self.self_time}, ct: #{self.children_time})&quot;</span>
+  <span class="ruby-node">&quot;#{self.full_name} (c: #{self.called}, tt: #{self.total_time}, st: #{self.self_time}, wt: #{wait_time}, ct: #{self.children_time})&quot;</span>
 <span class="ruby-keyword">end</span></pre>
           </div>
           
@@ -739,7 +739,7 @@
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/doc/RubyProf/MultiPrinter.html

@@ -183,7 +183,7 @@ stack profile and a graph profile.</p>
 
           
           <div class="method-source-code" id="flat_profile-source">
-            <pre><span class="ruby-comment"># File lib/ruby-prof/printers/multi_printer.rb, line 50</span>
+            <pre><span class="ruby-comment"># File lib/ruby-prof/printers/multi_printer.rb, line 52</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">flat_profile</span>
   <span class="ruby-node">&quot;#{@directory}/#{@profile}.flat.txt&quot;</span>
 <span class="ruby-keyword">end</span></pre>
@@ -216,7 +216,7 @@ stack profile and a graph profile.</p>
 
           
           <div class="method-source-code" id="graph_profile-source">
-            <pre><span class="ruby-comment"># File lib/ruby-prof/printers/multi_printer.rb, line 40</span>
+            <pre><span class="ruby-comment"># File lib/ruby-prof/printers/multi_printer.rb, line 42</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">graph_profile</span>
   <span class="ruby-node">&quot;#{@directory}/#{@profile}.graph.html&quot;</span>
 <span class="ruby-keyword">end</span></pre>
@@ -255,15 +255,17 @@ pofile file, defaults to “profile”.</p>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">print</span>(<span class="ruby-identifier">options</span>)
   <span class="ruby-ivar">@profile</span> = <span class="ruby-identifier">options</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-value">:profile</span>) <span class="ruby-operator">||</span> <span class="ruby-string">&quot;profile&quot;</span>
   <span class="ruby-ivar">@directory</span> = <span class="ruby-identifier">options</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-value">:path</span>) <span class="ruby-operator">||</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-string">&quot;.&quot;</span>)
+
   <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">stack_profile</span>, <span class="ruby-string">&quot;w&quot;</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
     <span class="ruby-ivar">@stack_printer</span>.<span class="ruby-identifier">print</span>(<span class="ruby-identifier">f</span>, <span class="ruby-identifier">options</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-value">:graph</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;#{@profile}.graph.html&quot;</span>))
   <span class="ruby-keyword">end</span>
+
   <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">graph_profile</span>, <span class="ruby-string">&quot;w&quot;</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
     <span class="ruby-ivar">@graph_printer</span>.<span class="ruby-identifier">print</span>(<span class="ruby-identifier">f</span>, <span class="ruby-identifier">options</span>)
   <span class="ruby-keyword">end</span>
-  <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">tree_profile</span>, <span class="ruby-string">&quot;w&quot;</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
-    <span class="ruby-ivar">@tree_printer</span>.<span class="ruby-identifier">print</span>(<span class="ruby-identifier">f</span>, <span class="ruby-identifier">options</span>)
-  <span class="ruby-keyword">end</span>
+
+  <span class="ruby-ivar">@tree_printer</span>.<span class="ruby-identifier">print</span>(<span class="ruby-identifier">options</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-value">:path</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-ivar">@directory</span>, <span class="ruby-value">:profile</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-ivar">@profile</span>))
+
   <span class="ruby-constant">File</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">flat_profile</span>, <span class="ruby-string">&quot;w&quot;</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
     <span class="ruby-ivar">@flat_printer</span>.<span class="ruby-identifier">print</span>(<span class="ruby-identifier">f</span>, <span class="ruby-identifier">options</span>)
   <span class="ruby-keyword">end</span>
@@ -297,7 +299,7 @@ pofile file, defaults to “profile”.</p>
 
           
           <div class="method-source-code" id="stack_profile-source">
-            <pre><span class="ruby-comment"># File lib/ruby-prof/printers/multi_printer.rb, line 35</span>
+            <pre><span class="ruby-comment"># File lib/ruby-prof/printers/multi_printer.rb, line 37</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">stack_profile</span>
   <span class="ruby-node">&quot;#{@directory}/#{@profile}.stack.html&quot;</span>
 <span class="ruby-keyword">end</span></pre>
@@ -330,9 +332,9 @@ pofile file, defaults to “profile”.</p>
 
           
           <div class="method-source-code" id="tree_profile-source">
-            <pre><span class="ruby-comment"># File lib/ruby-prof/printers/multi_printer.rb, line 45</span>
+            <pre><span class="ruby-comment"># File lib/ruby-prof/printers/multi_printer.rb, line 47</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">tree_profile</span>
-  <span class="ruby-node">&quot;#{@directory}/#{@profile}.grind.dat&quot;</span>
+  <span class="ruby-node">&quot;#{@directory}/#{@profile}.callgrind.out.#{$$}&quot;</span>
 <span class="ruby-keyword">end</span></pre>
           </div>
           
@@ -352,7 +354,7 @@ pofile file, defaults to “profile”.</p>
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/doc/RubyProf/Profile.html

@@ -131,27 +131,40 @@
         
         <div class="method-heading">
           <span class="method-callseq">
-            RubyProf::Profile.new(mode, exclude_threads) &rarr; instance
+            new()
           </span>
           
           <span class="method-click-advice">click to toggle source</span>
           
         </div>
         
+        <div class="method-heading">
+          <span class="method-callseq">
+            new(options)
+          </span>
+          
+        </div>
+        
         
 
         <div class="method-description">
           
-          <p>Returns a new profiler.</p>
-
-<h2 id="method-c-new-label-Parameters">Parameters<span><a href="#method-c-new-label-Parameters">&para;</a> <a href="#top">&uarr;</a></span></h2>
-<dl class="rdoc-list note-list"><dt>mode
+          <p>Returns a new profiler. Possible options for the options hash are:</p>
+<dl class="rdoc-list note-list"><dt>measure_mode
 <dd>
-<p>Measure mode (optional). Specifies the profile measure mode.  If not
-specified, defaults to RubyProf::WALL_TIME.</p>
+<p>Measure mode. Specifies the profile measure mode. If not specified,
+defaults to RubyProf::WALL_TIME.</p>
 </dd><dt>exclude_threads
 <dd>
-<p>Threads to exclude from the profiling results (optional).</p>
+<p>Threads to exclude from the profiling results.</p>
+</dd><dt>include_threads
+<dd>
+<p>Focus profiling on only the given threads. This will ignore all other
+threads.</p>
+</dd><dt>merge_fibers
+<dd>
+<p>Whether to merge all fibers under a given thread. This should be used when
+profiling for a callgrind printer.</p>
 </dd></dl>
           
           
@@ -162,40 +175,61 @@ specified, defaults to RubyProf::WALL_TIME.</p>
 prof_initialize(int argc,  VALUE *argv, VALUE self)
 {
     prof_profile_t* profile = prof_get_profile(self);
-    VALUE mode;
-    prof_measure_mode_t measurer = MEASURE_WALL_TIME;
-    VALUE exclude_threads;
+    VALUE mode_or_options;
+    VALUE mode = Qnil;
+    VALUE exclude_threads = Qnil;
+    VALUE include_threads = Qnil;
+    VALUE merge_fibers = Qnil;
     int i;
-    
-    switch (rb_scan_args(argc, argv, &quot;02&quot;, &amp;mode, &amp;exclude_threads))
-    {
-      case 0:
-      {
-        measurer = MEASURE_WALL_TIME;
-        exclude_threads = rb_ary_new();
+
+    switch (rb_scan_args(argc, argv, &quot;02&quot;, &amp;mode_or_options, &amp;exclude_threads)) {
+    case 0:
         break;
-      }
-      case 1:
-      {
-        measurer = (prof_measure_mode_t)NUM2INT(mode);
-        exclude_threads = rb_ary_new();
+    case 1:
+        if (FIXNUM_P(mode_or_options)) {
+            mode = mode_or_options;
+        }
+        else {
+            Check_Type(mode_or_options, T_HASH);
+            mode = rb_hash_aref(mode_or_options, ID2SYM(rb_intern(&quot;measure_mode&quot;)));
+            merge_fibers = rb_hash_aref(mode_or_options, ID2SYM(rb_intern(&quot;merge_fibers&quot;)));
+            exclude_threads = rb_hash_aref(mode_or_options, ID2SYM(rb_intern(&quot;exclude_threads&quot;)));
+            include_threads = rb_hash_aref(mode_or_options, ID2SYM(rb_intern(&quot;include_threads&quot;)));
+        }
         break;
-      }
-      case 2:
-      {
+    case 2:
         Check_Type(exclude_threads, T_ARRAY);
-        measurer = (prof_measure_mode_t)NUM2INT(mode);
         break;
-      }
     }
 
-    profile-&gt;measurer = prof_get_measurer(measurer);
+    if (mode == Qnil) {
+        mode = INT2NUM(MEASURE_WALL_TIME);
+    } else {
+        Check_Type(mode, T_FIXNUM);
+    }
+    profile-&gt;measurer = prof_get_measurer(NUM2INT(mode));
+    profile-&gt;merge_fibers = merge_fibers != Qnil &amp;&amp; merge_fibers != Qfalse;
 
-    for (i = 0; i &lt; RARRAY_LEN(exclude_threads); i++)
-    {
-        VALUE thread = rb_ary_entry(exclude_threads, i);
-        VALUE thread_id = rb_obj_id(thread);
-        st_insert(profile-&gt;exclude_threads_tbl, thread_id, Qtrue);
+    if (exclude_threads != Qnil) {
+        Check_Type(exclude_threads, T_ARRAY);
+        assert(profile-&gt;exclude_threads_tbl == NULL);
+        profile-&gt;exclude_threads_tbl = threads_table_create();
+        for (i = 0; i &lt; RARRAY_LEN(exclude_threads); i++) {
+            VALUE thread = rb_ary_entry(exclude_threads, i);
+            VALUE thread_id = rb_obj_id(thread);
+            st_insert(profile-&gt;exclude_threads_tbl, thread_id, Qtrue);
+        }
+    }
+
+    if (include_threads != Qnil) {
+        Check_Type(include_threads, T_ARRAY);
+        assert(profile-&gt;include_threads_tbl == NULL);
+        profile-&gt;include_threads_tbl = threads_table_create();
+        for (i = 0; i &lt; RARRAY_LEN(include_threads); i++) {
+            VALUE thread = rb_ary_entry(include_threads, i);
+            VALUE thread_id = rb_obj_id(thread);
+            st_insert(profile-&gt;include_threads_tbl, thread_id, Qtrue);
+        }
     }
 
     return self;
@@ -215,18 +249,27 @@ prof_initialize(int argc,  VALUE *argv, VALUE self)
         
         <div class="method-heading">
           <span class="method-callseq">
-            profile {block} &rarr; RubyProf::Result
+            profile(&amp;block) &rarr; self
           </span>
           
           <span class="method-click-advice">click to toggle source</span>
           
         </div>
         
+        <div class="method-heading">
+          <span class="method-callseq">
+            profile(options, &amp;block) &rarr; self
+          </span>
+          
+        </div>
+        
         
 
         <div class="method-description">
           
-          <p>Profiles the specified block and returns a RubyProf::Result object.</p>
+          <p>Profiles the specified block and returns a <a
+href="Profile.html">RubyProf::Profile</a> object. Arguments are passed to
+<a href="Profile.html">Profile</a> initialize method.</p>
           
           
 
@@ -286,7 +329,7 @@ name of a file containing regexps.</p>
 
           
           <div class="method-source-code" id="eliminate_methods-21-source">
-            <pre><span class="ruby-comment"># File lib/ruby-prof/profile.rb, line 16</span>
+            <pre><span class="ruby-comment"># File lib/ruby-prof/profile.rb, line 15</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">eliminate_methods!</span>(<span class="ruby-identifier">matchers</span>)
   <span class="ruby-identifier">matchers</span> = <span class="ruby-identifier">read_regexps_from_file</span>(<span class="ruby-identifier">matchers</span>) <span class="ruby-keyword">if</span> <span class="ruby-identifier">matchers</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">String</span>)
   <span class="ruby-identifier">eliminated</span> = []
@@ -310,7 +353,7 @@ name of a file containing regexps.</p>
         
         <div class="method-heading">
           <span class="method-callseq">
-            pause &rarr; RubyProf
+            pause &rarr; self
           </span>
           
           <span class="method-click-advice">click to toggle source</span>
@@ -414,7 +457,7 @@ necessary post-processing on the call graph.</p>
 
           
           <div class="method-source-code" id="post_process-source">
-            <pre><span class="ruby-comment"># File lib/ruby-prof/profile.rb, line 8</span>
+            <pre><span class="ruby-comment"># File lib/ruby-prof/profile.rb, line 7</span>
 <span class="ruby-keyword">def</span> <span class="ruby-identifier">post_process</span>
   <span class="ruby-keyword">self</span>.<span class="ruby-identifier">threads</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">thread</span><span class="ruby-operator">|</span>
     <span class="ruby-identifier">thread</span>.<span class="ruby-identifier">detect_recursion</span>
@@ -435,13 +478,20 @@ necessary post-processing on the call graph.</p>
         
         <div class="method-heading">
           <span class="method-callseq">
-            resume {block} &rarr; RubyProf
+            resume &rarr; self
           </span>
           
           <span class="method-click-advice">click to toggle source</span>
           
         </div>
         
+        <div class="method-heading">
+          <span class="method-callseq">
+            resume(&amp;block) &rarr; self
+          </span>
+          
+        </div>
+        
         
 
         <div class="method-description">
@@ -523,7 +573,7 @@ prof_running(VALUE self)
         
         <div class="method-heading">
           <span class="method-callseq">
-            start &rarr; RubyProf
+            start &rarr; self
           </span>
           
           <span class="method-click-advice">click to toggle source</span>
@@ -663,7 +713,7 @@ prof_stop(VALUE self)
         
         <div class="method-heading">
           <span class="method-callseq">
-            threads &rarr; Array of RubyProf::Thread
+            threads &rarr; array of RubyProf::Thread
           </span>
           
           <span class="method-click-advice">click to toggle source</span>
@@ -684,7 +734,7 @@ that were executed while the the program was being run.</p>
             <pre>static VALUE
 prof_threads(VALUE self)
 {
-        VALUE result = rb_ary_new();
+    VALUE result = rb_ary_new();
     prof_profile_t* profile = prof_get_profile(self);
     st_foreach(profile-&gt;threads_tbl, collect_threads, result);
     return result;
@@ -707,7 +757,7 @@ prof_threads(VALUE self)
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/doc/RubyProf/ProfileTask.html

@@ -484,7 +484,7 @@ allows Test::Unit options to be passed to the test suite.</p>
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>
 

data/doc/RubyProf/Thread.html

@@ -78,6 +78,8 @@
     
     <li ><a href="#method-i-total_time">#total_time</a>
     
+    <li ><a href="#method-i-wait_time">#wait_time</a>
+    
   </ul>
 </div>
 
@@ -251,6 +253,46 @@ should be called only once for each thread</p>
         
 
         
+      </div>
+
+    
+      <div id="method-i-wait_time" class="method-detail ">
+        
+        <div class="method-heading">
+          <span class="method-name">wait_time</span><span
+            class="method-args">()</span>
+          
+          <span class="method-click-advice">click to toggle source</span>
+          
+        </div>
+        
+
+        <div class="method-description">
+          
+          
+          
+          
+
+          
+          <div class="method-source-code" id="wait_time-source">
+            <pre><span class="ruby-comment"># File lib/ruby-prof/thread.rb, line 30</span>
+<span class="ruby-keyword">def</span> <span class="ruby-identifier">wait_time</span>
+  <span class="ruby-comment"># wait_time, like self:time, is always method local</span>
+  <span class="ruby-comment"># thus we need to sum over all methods and call infos</span>
+  <span class="ruby-keyword">self</span>.<span class="ruby-identifier">methods</span>.<span class="ruby-identifier">inject</span>(<span class="ruby-value">0</span>) <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">sum</span>, <span class="ruby-identifier">method_info</span><span class="ruby-operator">|</span>
+    <span class="ruby-identifier">method_info</span>.<span class="ruby-identifier">call_infos</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">call_info</span><span class="ruby-operator">|</span>
+      <span class="ruby-identifier">sum</span> <span class="ruby-operator">+=</span> <span class="ruby-identifier">call_info</span>.<span class="ruby-identifier">wait_time</span>
+    <span class="ruby-keyword">end</span>
+    <span class="ruby-identifier">sum</span>
+  <span class="ruby-keyword">end</span>
+<span class="ruby-keyword">end</span></pre>
+          </div>
+          
+        </div>
+
+        
+
+        
       </div>
 
     
@@ -262,7 +304,7 @@ should be called only once for each thread</p>
 
 <footer id="validator-badges" role="contentinfo">
   <p><a href="http://validator.w3.org/check/referer">Validate</a>
-  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.0.
+  <p>Generated by <a href="http://docs.seattlerb.org/rdoc/">RDoc</a> 4.2.2.
   <p>Based on <a href="http://deveiate.org/projects/Darkfish-RDoc/">Darkfish</a> by <a href="http://deveiate.org">Michael Granger</a>.
 </footer>