ileitch-hijack 0.1.8 → 0.1.9

data/README.rdoc

@@ -14,7 +14,7 @@ Hijack uses DRb over a unix socket file, so you need to be on the same machine a
 
 == Using ruby-debug
 
-Hijack can be used a means to start ruby-debug in your target process, for example:
+Hijack can be used to start ruby-debug in your target process, for example:
 
   $ hijack 61378
   => Hijacked 61378 (/opt/local/bin/thin) (ruby 1.8.7 [i686-darwin9])

data/TODO

@@ -1,5 +1,2 @@
-* Use thread local stdout & stderr capture.
-* assigning a variable doesn't work
 * Improve startup experience
-* Require actual remote script if possible so that if it defines any classes we can dump those too.
 * Add a hijack_exec helper to execute a local .rb on the target

data/lib/hijack/console.rb

@@ -8,7 +8,6 @@ module Hijack
       $stdout.write(str)
       $stdout.flush
       Payload.inject(@pid)
-      signal_drb_start
       connect
       $stdout.write("\b" * str.size)
       $stdout.flush
@@ -32,15 +31,11 @@ module Hijack
       end
     end
 
-    def signal_drb_start
-      Process.kill('USR2', @pid.to_i)
+    def connect
       loop do
         break if File.exists?(Hijack.socket_path_for(@pid))
         sleep 0.01
       end
-    end
-
-    def connect
       @remote = DRbObject.new(nil, Hijack.socket_for(@pid))
     end
 

data/lib/hijack/gdb.rb

@@ -3,35 +3,63 @@
 module Hijack
   class GDB
     def initialize(pid)
+      @pid = pid
       @verbose = Hijack.options[:gdb_debug]
-      exec_path = File.join(Config::CONFIG['bindir'], Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT'])
-      @gdb = IO.popen("gdb -q #{exec_path} #{pid} 2>&1", 'r+')
-      wait
+      @exec_path = File.join(Config::CONFIG['bindir'], Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT'])
+      attach
     end
 
-    def attached_to_ruby_process?
-      backtrace.any? {|line| line =~ /ruby_run/}
+    def ensure_attached_to_ruby_process
+      unless backtrace.any? {|line| line =~ /rb_/}
+        puts "\n=> #{@pid} doesn't appear to be a Ruby process!"
+        detach
+        exit 1
+      end
     end
 
-    def main_thread_blocked_by_join?
-      backtrace.any? {|line| line =~ /rb_thread_join/}
+    def ensure_main_thread_not_blocked_by_join
+      if backtrace.any? {|line| line =~ /rb_thread_join/}
+        puts "\n=> Unable to hijack #{@pid} because the main thread is blocked waiting for another thread to join."
+        puts "=> Check that you are using the most recent version of hijack, a newer version may have solved this shortcoming."
+        detach
+        exit 1
+      end
     end
 
     def eval(cmd)
-      set_trap_pending
-      set_breakpoint
-      continue
-      clear_breakpoint
       call("(void)rb_eval_string(#{cmd.strip.gsub(/"/, '\"').inspect})")
     end
 
     def detach
+      return unless @gdb
       exec('detach')
       exec('quit')
+      @backtrace = nil
       @gdb.close
+      @gdb = nil
     end
 
   protected
+    def attach
+      loop do
+        @gdb = IO.popen("gdb -q #{@exec_path} #{@pid} 2>&1", 'r+')
+        wait
+        if backtrace.first =~ /Previous frame inner to this frame/
+          detach
+          sleep 0.1
+        else
+          break
+        end
+      end
+
+      ensure_attached_to_ruby_process
+      ensure_main_thread_not_blocked_by_join
+      set_trap_pending
+      set_breakpoint
+      continue
+      clear_breakpoint
+    end
+
     def backtrace
       @backtrace ||= exec('bt').reverse
     end

data/lib/hijack/payload.rb

@@ -1,20 +1,15 @@
 module Hijack
   class Payload
     def self.inject(pid)
-      gdb = GDB.new(pid)
-      unless gdb.attached_to_ruby_process?
-        puts "\n=> #{pid} doesn't appear to be a Ruby process!"
-        gdb.detach
-        exit 1
-      end
-      if gdb.main_thread_blocked_by_join?
-        puts "\n=> Unable to hijack #{pid} because the main thread is blocked waiting for another thread to join."
-        puts "=> Check that you are using the most recent version of hijack, a newer version may have solved this shortcoming."
-        gdb.detach
-        exit 1
+      gdb = nil
+      trap('SIGINT') do
+        puts
+        @received_sigint = true
       end
+      gdb = GDB.new(pid)
       gdb.eval(payload(pid))
       gdb.detach
+      exit if @received_sigint
     end
 
     def self.payload(pid)
@@ -108,8 +103,7 @@ module Hijack
             end
           end
         end
-        __hijack_context = self
-        Signal.trap('USR2') { Hijack.start(__hijack_context) }
+        Hijack.start(self)
       RUBY
     end
   end

data/tasks/gem.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'yaml'
 
-HIJACK_VERSION = '0.1.8'
+HIJACK_VERSION = '0.1.9'
 
 task :clean => :clobber_package
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ileitch-hijack
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Ian Leitch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 21:00:00 -07:00
+date: 2009-09-19 21:00:00 -07:00
 default_executable: 
 dependencies: []