ruby-prof 0.7.1 → 0.7.2

data/CHANGES

@@ -1,3 +1,10 @@
+0.7.2 (2008-12-08)
+========================
+* Fixed major bug in printing child methods in graph reports.
+
+* Fixes for supporting x86_64 machines (Diego Pettenò)
+
+
 0.7.1 (2008-11-28)
 ========================
 * Added new AggregateCallInfo class for printers to

data/ext/measure_cpu_time.h

@@ -37,9 +37,9 @@ static prof_measure_t
 measure_cpu_time()
 {
 #if defined(__i386__) || defined(__x86_64__) 
-    unsigned long long x;
-    __asm__ __volatile__ ("rdtsc" : "=A" (x));
-    return x;
+    uint32_t a, d;
+    __asm__ volatile("rdtsc" : "=a" (a), "=d" (d));
+    return ((uint64_t)d << 32) + a;
 #elif defined(__powerpc__) || defined(__ppc__)
     unsigned long long x, y;
 

data/ext/version.h

@@ -1,4 +1,4 @@
-#define RUBY_PROF_VERSION  "0.7.1"
+#define RUBY_PROF_VERSION  "0.7.2"
 #define RUBY_PROF_VERSION_MAJ   0
 #define RUBY_PROF_VERSION_MIN   7
-#define RUBY_PROF_VERSION_MIC   1
+#define RUBY_PROF_VERSION_MIC   2

data/lib/ruby-prof/aggregate_call_info.rb

@@ -55,8 +55,8 @@ module RubyProf
     def aggregate(method_name)
       self.call_infos.inject(0) do |sum, call_info|
         sum += call_info.send(method_name)
+        sum
       end
     end
-
   end
 end

data/lib/ruby-prof/method_info.rb

@@ -79,22 +79,22 @@ module RubyProf
     end
 
     def aggregate_parents
-      aggregate_call_infos(self.call_infos)
-    end
-
-    def aggregate_children
-      aggregate_call_infos(self.children)
-    end
+      # Group call info's based on their parents
+      groups = self.call_infos.inject(Hash.new) do |hash, call_info|
+        key = call_info.parent ? call_info.parent.target : self
+        (hash[key] ||= []) << call_info
+        hash
+      end
 
-    def to_s
-      full_name
+      groups.map do |key, value|
+        AggregateCallInfo.new(value)
+      end
     end
 
-    private
-
-    def aggregate_call_infos(call_infos)
-      groups = call_infos.inject(Hash.new) do |hash, call_info|
-        key = call_info.parent ? call_info.parent.target : self
+    def aggregate_children
+      # Group call info's based on their targets
+      groups = self.children.inject(Hash.new) do |hash, call_info|
+        key = call_info.target
         (hash[key] ||= []) << call_info
         hash
       end
@@ -103,5 +103,9 @@ module RubyProf
         AggregateCallInfo.new(value)
       end
     end
+
+    def to_s
+      full_name
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-prof
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Shugo Maeda and Charlie Savage
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-30 00:00:00 -07:00
+date: 2008-12-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -55,7 +55,6 @@ files:
 - lib/ruby-prof/flat_printer.rb
 - lib/ruby-prof/graph_html_printer.rb
 - lib/ruby-prof/graph_printer.rb
-- lib/ruby-prof/group_by.rb
 - lib/ruby-prof/method_info.rb
 - lib/ruby-prof/task.rb
 - lib/ruby-prof/test.rb

data/lib/ruby-prof/group_by.rb

@@ -1,10 +0,0 @@
-unless Enumerable.method_defined?(:group_by)
-  module Enumerable
-    def group_by
-      inject(Hash.new) do |result, element|
-        (result[yield(element)] ||= []) << element
-        result
-      end
-    end
-  end
-end