rbtrace 0.3.16 → 0.3.17

data/bin/rbtrace

@@ -202,9 +202,9 @@ class RBTracer
   # msec - The Fixnum threshold in milliseconds
   #
   # Returns nothing.
-  def watch(msec)
+  def watch(msec, cpu_only=false)
     @watch_slow = true
-    send_cmd(:watch, msec)
+    send_cmd(cpu_only ? :watchcpu : :watch, msec)
   end
 
   # Turn on the firehose (show all method calls).
@@ -658,7 +658,7 @@ class RBTracer
     parser = Trollop::Parser.new do
       version <<-EOS
 rbtrace: like strace, but for ruby code
-  version 0.3.16
+  version 0.3.17
   (c) 2011 Aman Gupta (tmm1)
   http://github.com/tmm1/rbtrace
 EOS
@@ -736,6 +736,11 @@ EOS
         :default => 250,
         :short => '-s'
 
+      opt :slowcpu,
+        "watch for method calls slower than 250 milliseconds (cpu time only)",
+        :default => 250,
+        :short => nil
+
       opt :slow_methods,
         "method(s) to restrict --slow to",
         :type => :strings
@@ -810,8 +815,8 @@ EOS
       ARGV.clear
     end
 
-    unless %w[ fork eval slow firehose methods config gc ].find{ |n| opts[:"#{n}_given"] }
-      $stderr.puts "Error: --slow, --gc, --firehose, --methods or --config required."
+    unless %w[ fork eval slow slowcpu firehose methods config gc ].find{ |n| opts[:"#{n}_given"] }
+      $stderr.puts "Error: --slow, --slowcpu, --gc, --firehose, --methods or --config required."
       $stderr.puts "Try --help for help."
       exit(-1)
     end
@@ -875,7 +880,7 @@ EOS
         filtered.each_with_index do |line, i|
           STDERR.puts "   [#{(i+1).to_s.rjust(max_len)}]   #{line.strip}"
         end
-        STDERR.puts   "   [0]   all #{filtered.size} processes"
+        STDERR.puts   "   [#{'0'.rjust(max_len)}]   all #{filtered.size} processes"
 
         while true
           STDERR.sync = true
@@ -1007,8 +1012,8 @@ EOS
           tracer.firehose
         else
           tracer.add(methods)       if methods.any?
-          if opts[:slow_given]
-            tracer.watch(opts[:slow])
+          if opts[:slow_given] || opts[:slowcpu_given]
+            tracer.watch(opts[:slowcpu] || opts[:slow], opts[:slowcpu_given])
             tracer.add_slow(smethods) if smethods.any?
           end
         end

data/ext/rbtrace.c

@@ -11,6 +11,7 @@
 #include <strings.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
+#include <sys/resource.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -37,12 +38,22 @@
 #define RSTRING_LEN(str) RSTRING(str)->len
 #endif
 
+static uint64_t
+ru_utime_usec()
+{
+  struct rusage r_usage;
+  getrusage(RUSAGE_SELF, &r_usage);
+  return (uint64_t)r_usage.ru_utime.tv_sec*1e6 +
+         (uint64_t)r_usage.ru_utime.tv_usec;
+}
+
 static uint64_t
 timeofday_usec()
 {
   struct timeval tv;
   gettimeofday(&tv, NULL);
-  return (uint64_t)tv.tv_sec*1e6 + (uint64_t)tv.tv_usec;
+  return (uint64_t)tv.tv_sec*1e6 +
+         (uint64_t)tv.tv_usec;
 }
 
 #define MAX_CALLS 32768 // up to this many stack frames examined in slow watch mode
@@ -87,7 +98,9 @@ static struct {
   bool firehose;
 
   bool slow;
+  bool slowcpu;
   uint64_t call_times[MAX_CALLS];
+  uint64_t call_utimes[MAX_CALLS];
   int num_calls;
   uint32_t threshold;
 
@@ -116,6 +129,7 @@ rbtracer = {
   .firehose = false,
 
   .slow = false,
+  .slowcpu = false,
   .num_calls = 0,
   .threshold = 250,
 
@@ -377,13 +391,18 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
 
   // are we watching for slow method calls?
   if (rbtracer.slow && (!tracer || tracer->is_slow)) {
-    uint64_t usec = timeofday_usec(), diff = 0;
+    uint64_t usec = timeofday_usec(),
+             ut_usec = ru_utime_usec(),
+             diff = 0;
 
     switch (event) {
       case RUBY_EVENT_C_CALL:
       case RUBY_EVENT_CALL:
-        if (rbtracer.num_calls < MAX_CALLS)
+        if (rbtracer.num_calls < MAX_CALLS) {
           rbtracer.call_times[ rbtracer.num_calls ] = usec;
+          if (rbtracer.slowcpu)
+            rbtracer.call_utimes[ rbtracer.num_calls ] = ut_usec;
+        }
 
         rbtracer.num_calls++;
         break;
@@ -393,8 +412,12 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
         if (rbtracer.num_calls > 0) {
           rbtracer.num_calls--;
 
-          if (rbtracer.num_calls < MAX_CALLS)
-            diff = usec - rbtracer.call_times[ rbtracer.num_calls ];
+          if (rbtracer.num_calls < MAX_CALLS) {
+            if (rbtracer.slowcpu)
+              diff = ut_usec - rbtracer.call_utimes[ rbtracer.num_calls ];
+            else
+              diff = usec - rbtracer.call_times[ rbtracer.num_calls ];
+          }
         }
         break;
     }
@@ -568,6 +591,7 @@ rbtracer_detach()
 
   rbtracer.firehose = false;
   rbtracer.slow = false;
+  rbtracer.slowcpu = false;
   rbtracer.gc = false;
   rbtracer.devmode = false;
 
@@ -724,13 +748,14 @@ out:
 }
 
 static void
-rbtracer_watch(uint32_t threshold)
+rbtracer_watch(uint32_t threshold, bool cpu_time)
 {
   if (!rbtracer.slow) {
     rbtracer.num_calls = 0;
     rbtracer.threshold = threshold;
     rbtracer.firehose = false;
     rbtracer.slow = true;
+    rbtracer.slowcpu = cpu_time;
 
     event_hook_install();
   }
@@ -837,13 +862,13 @@ rbtrace__process_event(msgpack_object cmd)
 
     rbtracer_detach();
 
-  } else if (0 == strncmp("watch", str.ptr, str.size)) {
+  } else if (0 == strncmp("watch", str.ptr, 5)) {
     if (ary.size != 2 ||
         ary.ptr[1].type != MSGPACK_OBJECT_POSITIVE_INTEGER)
       return;
 
     unsigned int msec = ary.ptr[1].via.u64;
-    rbtracer_watch(msec);
+    rbtracer_watch(msec, str.size > 5 /* watchcpu */);
 
   } else if (0 == strncmp("firehose", str.ptr, str.size)) {
     rbtracer.firehose = true;

data/rbtrace.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rbtrace'
-  s.version = '0.3.16'
+  s.version = '0.3.17'
   s.homepage = 'http://github.com/tmm1/rbtrace'
 
   s.authors = 'Aman Gupta'

data/server.rb

@@ -7,6 +7,14 @@ class String
   end
 end
 
+def fib(n)
+  curr = 0
+  succ = 1
+
+  n.times{ curr, succ = succ, curr + succ }
+  curr
+end
+
 (reload_test = proc{
   Object.send(:remove_const, :Test) if defined? Test
   Test = Class.new do
@@ -29,6 +37,8 @@ while true
 
       reload_test.call
       Test.run
+
+      fib(1024*100)
     end
   }.call
 end

data/test.sh

@@ -24,25 +24,28 @@ trace() {
   echo ./bin/rbtrace -p $PID $*
   echo ------------------------------------------
   ./bin/rbtrace -p $PID $* &
-  sleep 2
+  sleep 5
   kill $!
   wait $! || true
   echo
 }
 
-bin/rbtrace -m sleep --wait 2 --exec ruby -e '10.times{ sleep 0.5 }'
-#trace -m Test.run --devmode
-#trace -m sleep
-#trace -m sleep Dir.chdir Dir.pwd Process.pid "String#gsub" "String#*"
-#trace -m "Kernel#"
-#trace -m "String#gsub(self,@test)" "String#*(self,__source__)" "String#multiply_vowels(self,self.length,num)"
-#trace --gc --slow=200
-#trace --gc -m Dir.
-#trace --slow=250
-#trace --slow=250 --slow-methods sleep
-#trace --gc -m Dir. --slow=250 --slow-methods sleep
-#trace --gc -m Dir. --slow=250
-#trace -m Process. Dir.pwd "Proc#call"
+# bin/rbtrace -m sleep --wait 2 --exec ruby -e '10.times{ sleep 0.5 }'
+
+trace --slowcpu=500
+
+# trace -m Test.run --devmode
+# trace -m sleep
+# trace -m sleep Dir.chdir Dir.pwd Process.pid "String#gsub" "String#*"
+# trace -m "Kernel#"
+# trace -m "String#gsub(self,@test)" "String#*(self,__source__)" "String#multiply_vowels(self,self.length,num)"
+# trace --gc --slow=200
+# trace --gc -m Dir.
+# trace --slow=250
+# trace --slow=250 --slow-methods sleep
+# trace --gc -m Dir. --slow=250 --slow-methods sleep
+# trace --gc -m Dir. --slow=250
+# trace -m Process. Dir.pwd "Proc#call"
 # trace --firehose
 
 cleanup

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbtrace
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 3
-  - 16
-  version: 0.3.16
+  - 17
+  version: 0.3.17
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-25 00:00:00 -08:00
+date: 2011-11-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency