rbtrace 0.3.9 → 0.3.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbtrace (0.3.9)
+    rbtrace (0.3.10)
       ffi (>= 1.0.5)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)

data/bin/rbtrace

@@ -550,7 +550,7 @@ class RBTracer
         print ')'
         @last_tracer[:arglist] = false
       end
-      puts
+      newline
       if @show_time
         t = Time.at(time/1_000_000)
         print t.strftime("%H:%M:%S.")
@@ -563,7 +563,7 @@ class RBTracer
       @max_nesting = @nesting if @nesting > @max_nesting
       @last_nesting = @nesting
       @last_tracer = tracer
-      tracer[:last] = name
+      tracer[:last] = "#{name}:#{@nesting-1}"
 
     when 'return','creturn'
       time, tracer_id = *cmd
@@ -574,11 +574,11 @@ class RBTracer
       if start = tracer[:times].pop
         name = tracer[:names].pop
         diff = time - start
-        @last_tracer[:arglist] = false if @last_tracer and @last_tracer[:last] != name
+        @last_tracer[:arglist] = false if @last_tracer and @last_tracer[:last] != "#{name}:#{@nesting}"
 
         print ')' if @last_tracer and @last_tracer[:arglist]
 
-        unless tracer == @last_tracer and @last_tracer[:last] == name
+        unless tracer == @last_tracer and @last_tracer[:last] == "#{name}:#{@nesting}"
           newline
           print ' '*16 if @show_time
           print @prefix*@nesting if @nesting > 0
@@ -653,7 +653,7 @@ class RBTracer
     parser = Trollop::Parser.new do
       version <<-EOS
 rbtrace: like strace, but for ruby code
-  version 0.3.9
+  version 0.3.10
   (c) 2011 Aman Gupta (tmm1)
   http://github.com/tmm1/rbtrace
 EOS

data/ext/rbtrace.c

@@ -91,6 +91,7 @@ static struct {
   uint32_t threshold;
 
   unsigned int num;
+  unsigned int num_slow;
   rbtracer_t list[MAX_TRACERS];
 
   key_t mqo_key;
@@ -118,6 +119,7 @@ rbtracer = {
   .threshold = 250,
 
   .num = 0,
+  .num_slow = 0,
   .list = {},
 
   .mqo_key = 0,
@@ -356,13 +358,16 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
       }
     }
 
-    // no tracer for current method call
-    if (!tracer) goto out;
+    if (tracer) {
+      // matched something, all good!
+    } else if (rbtracer.slow && rbtracer.num_slow == 0) {
+      // in global slow mode, so go ahead.
+    } else {
+      goto out;
+    }
 
-  } else if (rbtracer.slow) {
-    // trace anything that's slow
-    // fall through to slow logic below, after the previous conditional
-    // selects specific methods we might be interested in
+  } else if (rbtracer.slow && rbtracer.num_slow == 0) {
+    // trace everything that's slow
 
   } else {
     // what are we doing here?
@@ -539,6 +544,9 @@ rbtracer_remove(char *query, int id)
     }
 
     rbtracer.num--;
+    if (tracer->is_slow)
+      rbtracer.num_slow--;
+
     if (rbtracer.num == 0)
       event_hook_remove();
   }
@@ -674,6 +682,8 @@ rbtracer_add(char *query, bool is_slow)
     event_hook_install();
 
   rbtracer.num++;
+  if (tracer->is_slow)
+    rbtracer.num_slow++;
 
 out:
   rbtrace__send_event(2,

data/rbtrace.gemspec

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

data/test.sh

@@ -23,7 +23,7 @@ trace() {
   echo ------------------------------------------
   echo ./bin/rbtrace -p $PID $*
   echo ------------------------------------------
-  ./bin/rbtrace -p $PID -r 3 $* &
+  ./bin/rbtrace -p $PID $* &
   sleep 2
   kill $!
   wait $! || true
@@ -40,6 +40,8 @@ trace --gc -m Dir.
 trace --slow=250
 trace --slow=250 --slow-methods sleep
 trace --gc -m Dir. --slow=250 --slow-methods sleep
-trace --firehose
+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: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 3
-  - 9
-  version: 0.3.9
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - Aman Gupta