rbtrace 0.3.15 → 0.3.16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbtrace (0.3.15)
+    rbtrace (0.3.16)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)

data/bin/rbtrace

@@ -658,7 +658,7 @@ class RBTracer
     parser = Trollop::Parser.new do
       version <<-EOS
 rbtrace: like strace, but for ruby code
-  version 0.3.13
+  version 0.3.16
   (c) 2011 Aman Gupta (tmm1)
   http://github.com/tmm1/rbtrace
 EOS
@@ -672,7 +672,10 @@ for examples and more information, see http://github.com/tmm1/rbtrace
 
 Usage:
 
-  rbtrace -p <PID>         # trace the given process
+  rbtrace --exec <CMD>     # run and trace <CMD>
+  rbtrace --pid <PID+>     # trace the given process(es)
+  rbtrace --ps <CMD>       # look for running <CMD> processes to trace
+
   rbtrace -o <FILE>        # write output to file
   rbtrace -t               # show method call start time
   rbtrace -n               # hide duration of each method call
@@ -709,11 +712,21 @@ Trace Expressions:
 All Options:\n
 
 EOS
+      opt :exec,
+        "spawn new ruby process and attach to it",
+        :type => :strings,
+        :short => nil
+
       opt :pid,
         "pid of the ruby process to trace",
         :type => :ints,
         :short => '-p'
 
+      opt :ps,
+        "find any matching processes to trace",
+        :type => :string,
+        :short => nil
+
       opt :firehose,
         "show all method calls",
         :short => '-f'
@@ -774,11 +787,6 @@ EOS
         :type => String,
         :short => '-e'
 
-      opt :exec,
-        "spawn new ruby process and attach to it",
-        :type => :strings,
-        :short => nil
-
       opt :wait,
         "seconds to wait before attaching to process",
         :default => 0,
@@ -853,6 +861,58 @@ EOS
 
     tracee = nil
 
+    if opts[:ps_given]
+      list = `ps aux`.split("\n")
+      filtered = list.grep(Regexp.new opts[:ps])
+      filtered.reject! do |line|
+        line =~ /^\w+\s+#{Process.pid}\s+/ # cannot trace self
+      end
+
+      if filtered.size > 0
+        max_len = filtered.size.to_s.size
+
+        STDERR.puts "*** found #{filtered.size} processes matching #{opts[:ps].inspect}"
+        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"
+
+        while true
+          STDERR.sync = true
+          STDERR.print "*** trace which processes? (0/1,4): "
+
+          begin
+            input = gets
+          rescue Interrupt
+            exit 1
+          end
+
+          if input =~ /^(\d+,?)+$/
+            if input.strip == '0'
+              pids = filtered.map do |line|
+                line.split[1].to_i
+              end
+            else
+              indices = input.split(',').map(&:to_i)
+              pids = indices.map do |i|
+                if i > 0 and line = filtered[i-1]
+                  line.split[1].to_i
+                end
+              end
+            end
+
+            unless pids.include?(nil)
+              opts[:pid] = pids
+              break
+            end
+          end
+        end
+      else
+        STDERR.puts "*** could not find any processes matching #{opts[:ps].inspect}"
+        exit 1
+      end
+    end
+
     if opts[:exec_given]
       tracee = fork{
         Process.setsid

data/rbtrace.gemspec

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

data/test.sh

@@ -30,18 +30,19 @@ trace() {
   echo
 }
 
-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 -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: 13
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 3
-  - 15
-  version: 0.3.15
+  - 16
+  version: 0.3.16
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 -08:00
+date: 2011-11-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency