hijack 0.2.0.rc1 → 0.2.0.rc2

data/README.rdoc

@@ -119,3 +119,7 @@ DRb cannot dump objects to the hijack client for types that are not loaded in th
 isn't loaded in the hijack client.
 
 To work around this, when hijack connects to a remote process it will inspect all the files required by the process and also attempt to require them itself. This may not work for all object types however so you may still get a warning when an object cannot be dumped.
+
+== Contributors
+
+* jugyo (十行) (https://github.com/jugyo)

data/lib/hijack/gdb.rb

@@ -6,16 +6,16 @@ module Hijack
       @pid = pid
       @verbose = Hijack.options[:debug]
       @exec_path = File.join(Config::CONFIG['bindir'], Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT'])
-      attach
+      attach_outside_gc
     end
 
     def eval(cmd)
       call("(void)rb_eval_string(#{cmd.strip.gsub(/"/, '\"').inspect})")
     end
 
-    def detach
+    def quit
       return unless @gdb
-      exec('detach')
+      detach
       exec('quit')
       @backtrace = nil
       @gdb.close
@@ -24,35 +24,53 @@ module Hijack
 
   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/i
+    def previous_frame_inner_to_this_frame?
+      backtrace.first =~ /previous frame inner to this frame/i
+    end
+
+    def attach_outside_gc
+      @gdb = IO.popen("gdb -q #{@exec_path} #{@pid} 2>&1", 'r+')
+      wait
+      ensure_attached_to_ruby_process
+      attached = false
+
+      3.times do |i|
+        attach unless i == 0
+
+        if previous_frame_inner_to_this_frame? || during_gc?
           detach
           sleep 0.1
         else
+          attached = true
           break
         end
       end
-      
+
+      unless attached
+        puts
+        puts "=> Tried 3 times to attach to #{@pid} whilst GC wasn't running but failed."
+        puts "=> This means either the process calls GC.start frequently or its GC runs are slow - try hijacking again."
+        exit 1
+      end
+
       # TODO: Check for "Unable to attach to process-id 44528: No child processes (10)"
       ensure_main_thread_not_blocked_by_join
-      set_breakpoint
-      continue
-      delete_breakpoint
     end
     
-    def set_breakpoint
-      exec("break rb_call")
+    def during_gc?
+      backtrace.any? { |line| line =~ /garbage_collect/i }
     end
-
-    def delete_breakpoint
-      exec("delete breakpoints")
+    
+    def detach
+      exec("detach")
     end
-
+    
+    def attach
+      exec("attach #{@pid}")
+    end
+    
     def ensure_main_thread_not_blocked_by_join
-      if backtrace.any? {|line| line =~ /rb_thread_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

data/lib/hijack/payload.rb

@@ -8,7 +8,7 @@ module Hijack
       end
       gdb = GDB.new(pid)
       gdb.eval(payload(pid))
-      gdb.detach
+      gdb.quit
       exit if @received_sigint
     end
 

data/lib/hijack.rb

@@ -31,6 +31,6 @@ module Hijack
   end
   
   def self.version
-    "0.2.0.rc1"
+    "0.2.0.rc2"
   end
 end

data/tasks/gem.rake

@@ -1,18 +1,17 @@
 require 'rake/gempackagetask'
 require 'yaml'
-
-HIJACK_VERSION = '0.1.9'
+require './lib/hijack'
 
 task :clean => :clobber_package
 
 spec = Gem::Specification.new do |s|  
   s.name                  = 'hijack'
-  s.version               = HIJACK_VERSION
+  s.version               = Hijack.version
   s.platform              = Gem::Platform::RUBY
   s.summary               = 
-  s.description           = 'Provides an irb session to an existing ruby process.'
+  s.description           = 'Provides an irb session to a running ruby process.'
   s.author                = "Ian Leitch"
-  s.email                 = 'ian.leitch@systino.net'
+  s.email                 = 'port001@gmail.com'
   s.homepage              = 'http://github.com/ileitch/hijack'
   s.has_rdoc              = false
   s.files                 = %w(COPYING TODO README.rdoc Rakefile) + Dir.glob("{lib,test,tasks,bin,examples}/**/*")
@@ -26,8 +25,8 @@ Rake::GemPackageTask.new(spec) do |p|
 end
 
 namespace :gem do
-  desc "Update the gemspec for GitHub's gem server"
-  task :github do
+  desc "Update the gemspec"
+  task :spec do
     File.open("hijack.gemspec", 'w') { |f| f << YAML.dump(spec) }
   end  
 end

data/test/gc.rb

@@ -7,7 +7,7 @@ class MyObject
 end
 
 puts Process.pid
-n = 0
+n = 10000
 loop do
   (n+=1).times {|i| MyObject.new(i)}
   GC.start

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hijack
 version: !ruby/object:Gem::Version 
-  hash: 977940574
+  hash: 977940575
+  prerelease: true
   segments: 
   - 0
   - 2
   - 0
-  - rc1
-  version: 0.2.0.rc1
+  - rc2
+  version: 0.2.0.rc2
 platform: ruby
 authors: 
 - Ian Leitch
@@ -15,11 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-20 14:00:00 +10:00
+date: 2010-11-26 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
-description: Provides an irb session to an existing ruby process.
+description: Provides an irb session to a running ruby process.
 email: port001@gmail.com
 executables: 
 - hijack
@@ -35,9 +36,9 @@ files:
 - lib/hijack/console.rb
 - lib/hijack/gdb.rb
 - lib/hijack/helper.rb
+- lib/hijack/output_receiver.rb
 - lib/hijack/payload.rb
 - lib/hijack/workspace.rb
-- lib/hijack/output_receiver.rb
 - lib/hijack.rb
 - test/app.rb
 - test/gc.rb
@@ -55,6 +56,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -62,22 +64,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
       segments: 
       - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
-  version: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Provides an irb session to an existing ruby process.
+summary: Provides an irb session to a running ruby process.
 test_files: []