rbtrace 0.3.13 → 0.3.14

data/README.md

@@ -196,6 +196,5 @@ for popular ruby libraries and functions.
 * add watch expressions to fire tracers only when an expression is true
 * add special expressions for method args (_arg0_, _arguments_)
 * optimize local variable lookup to avoid instance_eval
-* run process via bin/rbtrace (to trace rubygems and bootup time)
 * investigate mach_msg on osx since msgget(2) has hard kernel limits
 

data/bin/rbtrace

@@ -154,11 +154,15 @@ class RBTracer
       raise ArgumentError, 'could not signal process, are you running as root?'
     end
 
-    signal
-    sleep 0.25 # wait for process to create msgqs
+    5.times do
+      signal
+      sleep 0.15 # wait for process to create msgqs
 
-    @qi = MsgQ.msgget( pid, 0666)
-    @qo = MsgQ.msgget(-pid, 0666)
+      @qi = MsgQ.msgget( pid, 0666)
+      @qo = MsgQ.msgget(-pid, 0666)
+
+      break if @qi > -1 || @qo > -1
+    end
 
     if @qi == -1 || @qo == -1
       raise ArgumentError, 'pid is not listening for messages, did you `require "rbtrace"`'
@@ -770,6 +774,11 @@ EOS
         :type => String,
         :short => '-e'
 
+      opt :exec,
+        "spawn new ruby process and attach to it",
+        :type => :strings,
+        :short => nil
+
       opt :timeout,
         "seconds to wait before giving up on attach/detach",
         :default => 5
@@ -777,9 +786,17 @@ EOS
 
     opts = Trollop.with_standard_exception_handling(parser) do
       raise Trollop::HelpNeeded if ARGV.empty?
+      parser.stop_on '--exec'
       parser.parse(ARGV)
     end
 
+    if ARGV.first == '--exec'
+      ARGV.shift
+      opts[:exec_given] = true
+      opts[:exec] = ARGV.dup
+      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."
       $stderr.puts "Try --help for help."
@@ -790,6 +807,15 @@ EOS
       parser.die :fork, '(can only be invoked with one pid)'
     end
 
+    if opts[:exec_given]
+      if opts[:pid_given]
+        parser.die :exec, '(cannot exec and attach to pid)'
+      end
+      if opts[:fork_given]
+        parser.die :fork, '(cannot fork inside newly execed process)'
+      end
+    end
+
     methods, smethods = [], []
 
     if opts[:methods_given]
@@ -822,7 +848,15 @@ EOS
 
     tracee = nil
 
-    if opts[:pid].size <= 1
+    if opts[:exec_given]
+      tracee = fork{
+        Process.setsid
+        ENV['RUBYOPT'] = "-r#{File.expand_path('../../lib/rbtrace',__FILE__)}"
+        exec(*opts[:exec])
+      }
+      STDERR.puts "*** spawned child #{tracee}: #{opts[:exec].inspect[1..-2]}"
+
+    elsif opts[:pid].size <= 1
       tracee = opts[:pid].first
 
     else
@@ -917,6 +951,12 @@ EOS
       if tracer
         tracer.detach
       end
+
+      if opts[:exec_given]
+        STDERR.puts "*** waiting on spawned child #{tracee}"
+        Process.kill 'TERM', tracee
+        Process.waitpid(tracee)
+      end
     end
   end
 end

data/ext/extconf.rb

@@ -16,10 +16,10 @@ unless File.exists?("#{CWD}/dst/lib/libmsgpackc.a")
 
   msgpack = File.basename('msgpack-0.5.4.tar.gz')
   dir = File.basename(msgpack, '.tar.gz')
+  cflags, ldflags = ENV['CFLAGS'], ENV['LDFLAGS']
 
   # build fat binaries on osx
   if RUBY_PLATFORM =~ /darwin/ and (archs = Config::CONFIG['LDFLAGS'].scan(/(-arch\s+.+?)(?:\s|$)/).flatten).any?
-    cflags, ldflags = ENV['CFLAGS'], ENV['LDFLAGS']
     ENV['CFLAGS'] = "#{cflags} #{archs.join(' ')}"
     ENV['LDFLAGS'] = "#{ldflags} #{archs.join(' ')}"
   end
@@ -30,7 +30,7 @@ unless File.exists?("#{CWD}/dst/lib/libmsgpackc.a")
     sys("tar zxvf #{msgpack}")
     Dir.chdir(dir) do
       if RUBY_PLATFORM =~ /i686/ and gcc = `gcc -v 2>&1` and gcc =~ /gcc version (\d\.\d)/ and $1.to_f <= 4.1
-        ENV['CFLAGS'] += " -march=i686 "
+        ENV['CFLAGS'] = " #{ENV['CFLAGS']} -march=i686 "
       end
       sys("./configure --disable-dependency-tracking --disable-shared --disable-cxx --with-pic --prefix=#{CWD}/dst/")
       sys("make install")

data/rbtrace.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbtrace
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 3
-  - 13
-  version: 0.3.13
+  - 14
+  version: 0.3.14
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
+date: 2011-11-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: "rbtrace: like strace but for ruby code"