hijack 0.2.0.rc2 → 0.2.0.rc3

data/lib/hijack.rb

@@ -29,8 +29,8 @@ module Hijack
   def self.socket_path_for(pid)
     "/tmp/hijack.#{pid}.sock"
   end
-  
+
   def self.version
-    "0.2.0.rc2"
+    "0.2.0.rc3"
   end
 end

data/lib/hijack/gdb.rb

@@ -49,7 +49,7 @@ module Hijack
       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."
+        puts "=> This means either the process calls GC.start frequently or GC runs are slow - try hijacking again."
         exit 1
       end
 
@@ -58,7 +58,7 @@ module Hijack
     end
     
     def during_gc?
-      backtrace.any? { |line| line =~ /garbage_collect/i }
+      !!(call("(int)rb_during_gc()").first =~ /\$[\d]+ = 1/)
     end
     
     def detach

data/lib/hijack/output_receiver.rb

@@ -1,22 +1,38 @@
 module Hijack
   class OutputReceiver
-    attr_reader :pid
+    def self.pid
+      @pid
+    end
     
     def self.start(remote)
+      @started = true
       @instance = new(remote)
-      @instance.start
+      @pid = fork do
+        @instance.start
+      end
+    end
+    
+    def self.started?
+      @started
     end
     
     def self.stop
-      @instance.stop if @instance
+      if started?
+        Process.kill("KILL", @pid)
+        Process.waitpid(@pid)
+      end
     end
 
     def self.mute
-      @instance.mute if @instance
+      Process.kill(Signal.list["USR1"], @pid) if started?
     end
     
     def self.unmute
-      @instance.unmute if @instance
+      Process.kill(Signal.list["USR2"], @pid) if started?
+    end
+    
+    def self.mute_momentarily
+      Process.kill(Signal.list["HUP"], @pid) if started?
     end
 
     def initialize(remote)
@@ -24,30 +40,34 @@ module Hijack
     end
     
     def start
-      @pid = fork do
-        setup_signal_traps
-        DRb.start_service(Hijack.socket_for(Process.pid), self)
-        @remote.evaluate("__hijack_output_receiver_ready_#{Process.pid}")
-        DRb.thread.join
-      end
-    end
-    
-    def stop
-      Process.kill("KILL", @pid)
-      Process.waitpid(@pid)
+      setup_signal_traps
+      DRb.start_service(Hijack.socket_for(Process.pid), self)
+      @remote.evaluate("OutputCopier.start(#{Process.pid})")
+      DRb.thread.join
     end
-    
+        
     def setup_signal_traps
-      Signal.trap("USR1") { @mute = true }
-      Signal.trap("USR2") { @mute = false }
+      Signal.trap("USR1") { mute }
+      Signal.trap("USR2") { unmute }
+      Signal.trap("HUP")  { mute_momentarily }
     end
     
     def mute
-      Process.kill("USR1", @pid)
+      @mute = true
+      @explicit_mute = true
     end
     
     def unmute
-      Process.kill("USR2", @pid)
+      @mute = false
+      @explicit_mute = false
+    end
+    
+    def mute_momentarily
+      @mute = true
+      Thread.new do 
+        sleep 3
+        @mute = false unless @explicit_mute
+      end
     end
     
     def write(io, str)

data/lib/hijack/payload.rb

@@ -18,98 +18,87 @@ module Hijack
         require 'drb'
 
         debug = #{Hijack.options[:debug] || false}
-        if debug || !defined?(Hijack)
-          puts 'Hijack: Debugging enabled' if debug
-          module Hijack
-            class OutputCopier
-              def self.remote
-                @remote
-              end
+        puts 'Hijack: Debugging enabled' if debug
+        module Hijack
+          class OutputCopier
+            def self.remote
+              @remote
+            end
 
-              def self.stop
-                @remote = nil
-                [$stdout, $stderr].each do |io|
-                  if io.respond_to?(:write_with_copying)
-                    class << io
-                      alias_method :write, :write_without_copying
-                      remove_method :write_with_copying
-                    end
+            def self.stop
+              @remote = nil
+              [$stdout, $stderr].each do |io|
+                if io.respond_to?(:write_with_copying)
+                  class << io
+                    alias_method :write, :write_without_copying
+                    remove_method :write_with_copying
                   end
                 end
               end
+            end
 
-              def self.start(pid)
-                @remote = DRbObject.new(nil, 'drbunix://tmp/hijack.' + pid + '.sock')
-                puts @remote.inspect if Hijack.debug?
+            def self.start(pid)
+              @remote = DRbObject.new(nil, 'drbunix://tmp/hijack.' + pid.to_s + '.sock')
+              puts @remote.inspect if Hijack.debug?
 
-                class << $stdout
-                  def write_with_copying(str)
-                    write_without_copying(str)
-                    begin
-                      Hijack::OutputCopier.remote.write('stdout', str)
-                    rescue Exception => e
-                      write_without_copying(e.message) if Hijack.debug?
-                      Hijack.stop
-                    end
+              class << $stdout
+                def write_with_copying(str)
+                  write_without_copying(str)
+                  begin
+                    Hijack::OutputCopier.remote.write('stdout', str)
+                  rescue Exception => e
+                    write_without_copying(e.message) if Hijack.debug?
+                    Hijack.stop
                   end
-                  alias_method :write_without_copying, :write
-                  alias_method :write, :write_with_copying
                 end
+                alias_method :write_without_copying, :write
+                alias_method :write, :write_with_copying
+              end
 
-                class << $stderr
-                  def write_with_copying(str)
-                    write_without_copying(str)
-                    begin
-                      Hijack::OutputCopier.remote.write('stderr', str)
-                    rescue Exception => e
-                      write_without_copying(e.message) if Hijack.debug?
-                      Hijack.stop
-                    end
+              class << $stderr
+                def write_with_copying(str)
+                  write_without_copying(str)
+                  begin
+                    Hijack::OutputCopier.remote.write('stderr', str)
+                  rescue Exception => e
+                    write_without_copying(e.message) if Hijack.debug?
+                    Hijack.stop
                   end
-                  alias_method :write_without_copying, :write
-                  alias_method :write, :write_with_copying
                 end
+                alias_method :write_without_copying, :write
+                alias_method :write, :write_with_copying
               end
             end
+          end
 
-            class Evaluator
-              def initialize(context)
-                @context = context
-                @file = __FILE__
-              end
-
-              def evaluate(rb)
-                if rb =~ /__hijack_output_receiver_ready_([\\d]+)/
-                  OutputCopier.start($1)
-                elsif rb =~ /__hijack_get_remote_file_name/
-                  @file
-                elsif rb =~ /__hijack_exit/
-                  Hijack.stop
-                else
-                  @context.instance_eval(rb)
-                end
-              end
+          class Evaluator
+            def initialize(context)
+              @context = context
             end
 
-            def self.debug?
-              @debug
+            def evaluate(rb)
+              @context.instance_eval(rb)
             end
+          end
 
-            def self.start(context, debug)
-              return if @service && @service.alive?
-              @debug = debug
-              evaluator = Hijack::Evaluator.new(context)
-              @service = DRb.start_service('#{Hijack.socket_for(pid)}', evaluator)
-              File.chmod(0600, '#{Hijack.socket_path_for(pid)}')
-            end
+          def self.debug?
+            @debug
+          end
 
-            def self.stop
-              begin
-                OutputCopier.stop
-                @service.stop_service
-                @service = nil
-              rescue Exception
-              end
+          def self.start(context, debug)
+            return if @service && @service.alive?
+            @debug = debug
+            evaluator = Hijack::Evaluator.new(context)
+            @service = DRb.start_service('#{Hijack.socket_for(pid)}', evaluator)
+            File.chmod(0600, '#{Hijack.socket_path_for(pid)}')
+          end
+
+          def self.stop
+            begin
+              OutputCopier.stop
+              @service.stop_service
+              @service = nil
+            rescue Exception
             end
           end
         end

data/lib/hijack/workspace.rb

@@ -2,6 +2,7 @@ module Hijack
   Readline.completion_proc = Proc.new do |input|
     bind = IRB.conf[:MAIN_CONTEXT].workspace.binding
     if helpers = Helper.helpers_like(input)
+      OutputReceiver.mute_momentarily
       helpers
     else
       IRB::InputCompletor::CompletionProc.call(input)
@@ -14,7 +15,7 @@ module Hijack
       if statements =~ /IRB\./
         super
       elsif statements.strip =~ /^(exit|quit)/
-        remote.evaluate('__hijack_exit') rescue nil
+        remote.evaluate('Hijack.stop') rescue nil
         super
       elsif helper = Hijack::Helper.find_helper(statements)
         Hijack::Helper.send(helper, remote)

data/test/test.rb

@@ -12,7 +12,7 @@ p Process.pid
 t = Thread.new do
   i = 0
   loop do
-    sleep 1
+    Array.new(3000000).collect {|n| "#{n}"}
     do_shit(i+=1)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hijack
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 0
   - 2
   - 0
-  - rc2
-  version: 0.2.0.rc2
+  - rc3
+  version: 0.2.0.rc3
 platform: ruby
 authors: 
 - Ian Leitch
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +11:00
+date: 2011-02-15 00:00:00 +11:00
 default_executable: 
 dependencies: []