rbtrace 0.3.8 → 0.3.9

data/Gemfile.lock

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

data/bin/rbtrace

@@ -123,6 +123,9 @@ class RBTracer
   # Public: The IO where tracing output is written (default: STDOUT).
   attr_accessor :out
 
+  # Public: The timeout before giving up on attaching/detaching to a process.
+  attr_accessor :timeout
+
   # The String prefix used on nested method calls (default: ' ').
   attr_accessor :prefix
 
@@ -176,7 +179,10 @@ class RBTracer
     @max_nesting = @last_nesting = @nesting = 0
     @last_tracer = nil
 
+    @timeout = 5
+
     @out = STDOUT
+    @out.sync = true
     @prefix = '  '
     @printed_newline = true
 
@@ -216,7 +222,7 @@ class RBTracer
   # Returns a Fixnum pid.
   def fork
     send_cmd(:fork)
-    if wait_for(30, 'for fork'){ !!@forked_pid }
+    if wait('for fork', 30){ !!@forked_pid }
       @forked_pid
     else
       STDERR.puts '*** timed out waiting for fork'
@@ -233,7 +239,7 @@ class RBTracer
 
     send_cmd(:eval, code)
 
-    if wait_for(10, 'for eval response'){ !!@eval_result }
+    if wait('for eval response', 15){ !!@eval_result }
       @eval_result
     else
       STDERR.puts '*** timed out waiting for eval response'
@@ -247,28 +253,42 @@ class RBTracer
     send_cmd(:gc)
   end
 
+  # Restrict slow tracing to a specific list of methods.
+  #
+  # methods - The String or Array of method selectors.
+  #
+  # Returns nothing.
+  def add_slow(methods)
+    add(methods, true)
+  end
+
   # Add tracers for the given list of methods.
   #
   # methods - The String or Array of method selectors to trace.
   #
   # Returns nothing.
-  def add(methods)
+  def add(methods, slow=false)
     Array(methods).each do |func|
       func = func.strip
       next if func.empty?
 
-      if func =~ /^(.+)\((.+)\)$/
+      if func =~ /^(.+?)\((.+)\)$/
         name, args = $1, $2
         args = args.split(',').map{ |a| a.strip }
       end
 
-      send_cmd(:add, name || func)
+      send_cmd(:add, name || func, slow)
 
       if args and args.any?
         args.each do |arg|
           if (err = valid_syntax?(arg)) != true
             raise ArgumentError, "#{err.class} for expression #{arg.inspect} in method #{func.inspect}"
           end
+          if arg =~ /^@/ and arg !~ /^@[_a-z][_a-z0-9]+$/i
+            # arg[0]=='@' means ivar, but if this is an expr
+            # we can hack a space in front so it gets eval'd instead
+            arg = " #{arg}"
+          end
           send_cmd(:addexpr, arg)
         end
       end
@@ -280,7 +300,7 @@ class RBTracer
   # Returns nothing.
   def attach
     send_cmd(:attach, Process.pid)
-    if wait_for{ @attached == true }
+    if wait('to attach'){ @attached == true }
       STDERR.puts "*** attached to process #{pid}"
     else
       raise ArgumentError, 'process already being traced?'
@@ -298,7 +318,7 @@ class RBTracer
 
     newline
 
-    if wait_for{ @attached == false }
+    if wait('to detach cleanly'){ @attached == false }
       newline
       STDERR.puts "*** detached from process #{pid}"
     else
@@ -358,13 +378,18 @@ class RBTracer
   # block - The Block that is checked every 50ms until it returns true.
   #
   # Returns true when the condition was met, or false on a timeout.
-  def wait_for(time=5, reason='to detach cleanly')
+  def wait(reason, time=@timeout)
     wait = 0.05 # polling interval
 
     (time/wait).to_i.times do
       begin
         recv_lines
         sleep(wait)
+        begin
+          signal
+        rescue Errno::ESRCH
+          break
+        end
         time -= wait
 
         return true if yield
@@ -491,7 +516,7 @@ class RBTracer
       tracer = @tracers[tracer_id]
 
       if expr_id > -1
-        tracer[:exprs][expr_id] = expr
+        tracer[:exprs][expr_id] = expr.strip
       end
 
     when 'exprval'
@@ -554,7 +579,7 @@ class RBTracer
         print ')' if @last_tracer and @last_tracer[:arglist]
 
         unless tracer == @last_tracer and @last_tracer[:last] == name
-          puts
+          newline
           print ' '*16 if @show_time
           print @prefix*@nesting if @nesting > 0
           print name
@@ -578,6 +603,9 @@ class RBTracer
       name = klass ? "#{klass}#{ is_singleton ? '.' : '#' }" : ''
       name += @methods[mid] || '(unknown)'
 
+      newline
+      nesting = @nesting if @nesting > 0
+
       if @show_time
         t = Time.at(time/1_000_000)
         print t.strftime("%H:%M:%S.")
@@ -599,7 +627,7 @@ class RBTracer
     when 'gc'
       time, = *cmd
 
-      puts unless @watch_slow
+      newline
       if @show_time
         t = Time.at(time/1_000_000)
         print t.strftime("%H:%M:%S.")
@@ -625,7 +653,7 @@ class RBTracer
     parser = Trollop::Parser.new do
       version <<-EOS
 rbtrace: like strace, but for ruby code
-  version 0.3.8
+  version 0.3.9
   (c) 2011 Aman Gupta (tmm1)
   http://github.com/tmm1/rbtrace
 EOS
@@ -690,6 +718,10 @@ EOS
         :default => 250,
         :short => '-s'
 
+      opt :slow_methods,
+        "method(s) to restrict --slow to",
+        :type => :strings
+
       opt :methods,
         "method(s) to trace (valid formats: sleep String#gsub Process.pid Kernel# Dir.)",
         :type => :strings,
@@ -736,6 +768,10 @@ EOS
         "evaluate a ruby expression in the process",
         :type => String,
         :short => '-e'
+
+      opt :timeout,
+        "seconds to wait before giving up on attach/detach",
+        :default => 5
     end
 
     opts = Trollop.with_standard_exception_handling(parser) do
@@ -753,11 +789,14 @@ EOS
       parser.die :fork, '(can only be invoked with one pid)'
     end
 
-    methods = []
+    methods, smethods = [], []
 
     if opts[:methods_given]
       methods += opts[:methods]
     end
+    if opts[:slow_methods_given]
+      smethods += opts[:slow_methods]
+    end
 
     if opts[:config_given]
       Array(opts[:config]).each do |config|
@@ -851,6 +890,7 @@ EOS
 
       else
         tracer.out = output if output
+        tracer.timeout = opts[:timeout] if opts[:timeout] > 0
         tracer.prefix = ' ' * opts[:prefix]
         tracer.show_time = opts[:start_time]
         tracer.show_duration = !opts[:no_duration]
@@ -862,7 +902,10 @@ EOS
           tracer.firehose
         else
           tracer.add(methods)       if methods.any?
-          tracer.watch(opts[:slow]) if opts[:slow_given]
+          if opts[:slow_given]
+            tracer.watch(opts[:slow])
+            tracer.add_slow(smethods) if smethods.any?
+          end
         end
         begin
           tracer.recv_loop

data/ext/extconf.rb

@@ -22,7 +22,7 @@ unless File.exists?("#{CWD}/dst/lib/libmsgpackc.a")
 
     sys("tar zxvf #{msgpack}")
     Dir.chdir(dir) do
-      sys("./configure --disable-shared --with-pic --prefix=#{CWD}/dst/")
+      sys("./configure --disable-shared --disable-cxx --with-pic --prefix=#{CWD}/dst/")
       sys("make install")
     end
   end

data/ext/rbtrace.c

@@ -54,6 +54,7 @@ timeofday_usec()
 typedef struct {
   int id;
   char *query;
+  bool is_slow;
 
   char *klass_name;
   size_t klass_len;
@@ -331,6 +332,9 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
       if (curr->query) {
         n++;
 
+        // there should never be slow method tracers outside slow mode
+        if (!rbtracer.slow && curr->is_slow) continue;
+
         if (rbtracer.devmode) {
           if ((!curr->mid        || curr->mid == mid) &&
               (!curr->klass_name || (
@@ -366,7 +370,7 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
   }
 
   // are we watching for slow method calls?
-  if (rbtracer.slow) {
+  if (rbtracer.slow && (!tracer || tracer->is_slow)) {
     uint64_t usec = timeofday_usec(), diff = 0;
 
     switch (event) {
@@ -481,7 +485,7 @@ event_hook_install()
       event_hook,
       RUBY_EVENT_CALL   | RUBY_EVENT_C_CALL |
       RUBY_EVENT_RETURN | RUBY_EVENT_C_RETURN
-#ifdef RB_EVENT_HOOKS_HAVE_CALLBACK_DATA
+#ifdef RUBY_VM
       , 0
 #endif
     );
@@ -575,7 +579,7 @@ rbtracer_detach()
 }
 
 static int
-rbtracer_add(char *query)
+rbtracer_add(char *query, bool is_slow)
 {
   int i;
   int tracer_id = -1;
@@ -654,6 +658,7 @@ rbtracer_add(char *query)
 
   tracer->id = tracer_id;
   tracer->query = strdup(query);
+  tracer->is_slow = is_slow;
 
   if (klass_end != klass_begin) {
     tracer->klass_name = tracer->query + klass_begin;
@@ -834,15 +839,17 @@ rbtrace__process_event(msgpack_object cmd)
     event_hook_install();
 
   } else if (0 == strncmp("add", str.ptr, str.size)) {
-    if (ary.size != 2 ||
-        ary.ptr[1].type != MSGPACK_OBJECT_RAW)
+    if (ary.size != 3 ||
+        ary.ptr[1].type != MSGPACK_OBJECT_RAW ||
+        ary.ptr[2].type != MSGPACK_OBJECT_BOOLEAN)
       return;
 
     str = ary.ptr[1].via.raw;
+    bool is_slow = ary.ptr[2].via.boolean;
 
     strncpy(query, str.ptr, str.size);
     query[str.size] = 0;
-    last_tracer_id = rbtracer_add(query);
+    last_tracer_id = rbtracer_add(query, is_slow);
 
   } else if (0 == strncmp("addexpr", str.ptr, str.size)) {
     if (ary.size != 2 ||

data/rbtrace.gemspec

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

data/test.sh

@@ -38,7 +38,8 @@ trace -m "String#gsub(self,@test)" "String#*(self,__source__)" "String#multiply_
 trace --gc --slow=200
 trace --gc -m Dir.
 trace --slow=250
-trace --slow=250 -m sleep
+trace --slow=250 --slow-methods sleep
+trace --gc -m Dir. --slow=250 --slow-methods sleep
 trace --firehose
 
 cleanup

data/tracers/testunit.tracer

@@ -0,0 +1 @@
+Test::Unit::TestSuite#run(name, size)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbtrace
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Aman Gupta
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -08:00
+date: 2011-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 0
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 83
         segments: 
         - 1
         - 16
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 4
@@ -88,6 +92,7 @@ files:
 - tracers/io.tracer
 - tracers/mongo.tracer
 - tracers/redis.tracer
+- tracers/testunit.tracer
 - tracers/unicorn.tracer
 has_rdoc: true
 homepage: http://github.com/tmm1/rbtrace
@@ -103,6 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -111,13 +117,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: "rbtrace: like strace but for ruby code"