ruby-prof 0.7.3 → 0.7.4

data/README

@@ -37,6 +37,12 @@ includes a pre-built binary. Due to a bug in ruby-gems, you cannot
 install the gem to a path that contains spaces
 (see http://rubyforge.org/tracker/?func=detail&aid=23003&group_id=126&atid=577).
 
+If you on windows mswin [not mingw] (check via ruby -v)
+please install v0.7.3 which has a prebuilt binary
+C:> gem install ruby-prof -v0.7.3
+
+If you're on mingw, please install the devkit first.
+
 ruby-prof is also available as a tarred gzip archive and zip archive. 
 
 == Usage
@@ -430,7 +436,10 @@ repository also includes a Microsoft VC++ 2005 solution.  If you wish to run
 a debug version of ruby-prof on Windows, then it is highly recommended
 you use VC++.
 
-
 == License
 
 See LICENSE for license information.
+
+== Development
+
+Code is located at http://github.com/rdp/ruby-prof

data/ext/extconf.rb

@@ -31,4 +31,10 @@ have_func("rb_gc_heap_info")
 have_func("rb_gc_malloc_allocations")
 have_func("rb_gc_malloc_allocated_size")
 
+def add_define(name)
+  $defs.push("-D#{name}")
+end
+
+add_define 'RUBY_VM' if RUBY_VERSION >= '1.9'
+
 create_makefile("ruby_prof")

data/ext/ruby_prof.c

@@ -307,13 +307,28 @@ prof_call_info_create(prof_method_t* method, prof_call_info_t* parent)
     return result;
 }
 
+static void prof_method_mark(prof_method_t *method);
+
 static void
 prof_call_info_mark(prof_call_info_t *call_info)
 {
-  rb_gc_mark(prof_method_wrap(call_info->target));
+  {
+    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)
-    rb_gc_mark(prof_call_info_wrap(call_info->parent));
+  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
@@ -863,8 +878,15 @@ get_event_name(rb_event_flag_t event)
 }
 #endif
 
+
+// these differ 1.9/1.8
+
 static prof_method_t* 
-get_method(rb_event_flag_t event, NODE *node, VALUE klass, ID mid, int depth, st_table* method_table)
+#ifdef RUBY_VM
+ get_method(rb_event_flag_t event, VALUE klass, ID mid, int depth, st_table* method_table)
+# else
+ get_method(rb_event_flag_t event, NODE *node, VALUE klass, ID mid, int depth, st_table* method_table)
+#endif 
 {
     prof_method_key_t key;
     prof_method_t *method = NULL;
@@ -1111,19 +1133,24 @@ prof_event_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE kla
           klass = (BUILTIN_TYPE(klass) == T_ICLASS ? RBASIC(klass)->klass : klass);
           
         /* Assume this is the first time we have called this method. */
+#ifdef RUBY_VM
+        method = get_method(event, klass, mid, 0, thread_data->method_table);
+#else
         method = get_method(event, node, klass, mid, 0, thread_data->method_table);
+#endif
 
         /* Check for a recursive call */
-        if (method->active)
+        while (method->active)
         {
           /* Yes, this method is already active */
+#ifdef RUBY_VM
+          method = get_method(event, klass, mid, method->key->depth + 1, thread_data->method_table);
+#else
           method = get_method(event, node, klass, mid, method->key->depth + 1, thread_data->method_table);
+#endif
         }
-        else
-        {
-          /* No, so make it active */
-          method->active = 1;
-        }
+        method->active = 1;
+        
 
         if (!frame)
         {

data/ext/version.h

@@ -1,4 +1,4 @@
-#define RUBY_PROF_VERSION  "0.7.3"
+#define RUBY_PROF_VERSION  "0.7.4"
 #define RUBY_PROF_VERSION_MAJ   0
 #define RUBY_PROF_VERSION_MIN   7
-#define RUBY_PROF_VERSION_MIC   3
+#define RUBY_PROF_VERSION_MIC   4

data/lib/ruby-prof/graph_html_printer.rb

@@ -198,7 +198,7 @@ module RubyProf
             self_percentage = (method.self_time/total_time) * 100 %>
           
             <!-- Parents -->
-            <% for caller in method.aggregate_parents
+            <% for caller in method.aggregate_parents.sort_by(&:total_time)
                  next unless caller.parent
                  next if min_time && caller.total_time < min_time  %>
               <tr>
@@ -228,7 +228,7 @@ module RubyProf
             </tr>
 
             <!-- Children -->
-            <% for callee in method.aggregate_children %>
+            <% for callee in method.aggregate_children.sort_by(&:total_time).reverse %>
             <%   next if min_time && callee.total_time < min_time  %>
               <tr>
                 <td>&nbsp;</td>

data/lib/ruby-prof/graph_printer.rb

@@ -127,7 +127,7 @@ module RubyProf
     end
     
     def print_parents(thread_id, method)
-      method.aggregate_parents.each do |caller|
+      method.aggregate_parents.sort_by(&:total_time).each do |caller|
         next unless caller.parent
         @output << " " * 2 * PERCENTAGE_WIDTH
         @output << sprintf("%#{TIME_WIDTH}.2f", caller.total_time)
@@ -143,7 +143,7 @@ module RubyProf
     end
   
     def print_children(method)
-      method.aggregate_children.each do |child|
+      method.aggregate_children.sort_by(&:total_time).reverse.each do |child|
         # Get children method
         
         @output << " " * 2 * PERCENTAGE_WIDTH

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-prof
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Shugo Maeda and Charlie Savage
@@ -9,11 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-09 00:00:00 -07:00
+date: 2009-12-22 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: ruby-prof is a fast code profiler for Ruby. It is a C extension and therefore is many times faster than the standard Ruby profiler. It supports both flat and graph profiles.  For each method, graph profiles show how long the method ran, which methods called it and which  methods it called. RubyProf generate both text and html and can output it to standard out or to a file.
+description: |
+  ruby-prof is a fast code profiler for Ruby. It is a C extension and
+  therefore is many times faster than the standard Ruby profiler. It
+  supports both flat and graph profiles.  For each method, graph profiles
+  show how long the method ran, which methods called it and which 
+  methods it called. RubyProf generate both text and html and can output
+  it to standard out or to a file.
+
 email: shugo@ruby-lang.org and cfis@savagexi.com
 executables: 
 - ruby-prof
@@ -38,16 +45,13 @@ files:
 - ext/measure_memory.h
 - ext/measure_process_time.h
 - ext/measure_wall_time.h
-- ext/mingw
 - ext/ruby_prof.c
 - ext/ruby_prof.h
-- ext/vc
 - ext/version.h
 - ext/mingw/Rakefile
 - ext/mingw/build.rake
 - ext/vc/ruby_prof.sln
 - ext/vc/ruby_prof.vcproj
-- lib/ruby-prof
 - lib/ruby-prof/abstract_printer.rb
 - lib/ruby-prof/aggregate_call_info.rb
 - lib/ruby-prof/call_info.rb
@@ -60,9 +64,7 @@ files:
 - lib/ruby-prof/test.rb
 - lib/ruby-prof.rb
 - lib/unprof.rb
-- rails/environment
 - rails/environment/profile.rb
-- rails/example
 - rails/example/example_test.rb
 - rails/profile_test_helper.rb
 - test/aggregate_test.rb
@@ -86,6 +88,8 @@ files:
 - test/unique_call_path_test.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/ruby-prof/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -106,9 +110,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-prof
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Fast Ruby profiler
 test_files: 
 - test/test_suite.rb