debugger-xml 0.2.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTZiODljZjRmYmUxMzk5NTEwMTMwNzlhMWM4NWY3MjhmMGQxOTk3Mw==
+    Y2MzNzI1ODA4M2M0MWU1NDFjNGJiZWU4MzMxZWI1N2NiMDczNWQzNg==
   data.tar.gz: !binary |-
-    OTM4ZDY2YzJhYzJmMDZkOGU0ZDY4MjA3MDBkZjhmYjE4NWFhZDYxOA==
+    NmQ5ZmRkMmEwYTE5NGZjMzdhOWQ2MzVmMTE1ZmI0ZDFjOGQyNjNjYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTFlNGRkNTdlMzlmMDQyNWEyMDgyYzk4YzJiZTVhYjA3YTU2NDlmMTY3YmJj
-    Mzk4YTFkNDdlNDA1ZjI0Mzk5M2Q5ZmYxOTNjY2EzNjk2NzQyMDNkMmQzNmJl
-    YWVhNzlmMjMxN2FiMTdiMjUwZGExNDUwZmMwMzRiOTdjZDk3OTY=
+    NzYwOTdlOTIwOGEzZjYwMmExYWJhMWE0YzkxNDA3MzYxYWNmODVkNjVhMmI1
+    ZjAyNzJjOTZlMzc2NzViN2M0YTExMDcwMzk5N2RkYTI5Yzk3YzE3YmNkYTQ1
+    YmFkMjJjNGNmMzVmZDJiMmI0MTczMTMyNzkxODUyZWEwYjFlYWU=
   data.tar.gz: !binary |-
-    YzhjZDIwZmU1YzA3ZGY1MWVlN2MxYjBmZmZiM2M0YWQ0N2JlNmMxNmFmM2I2
-    MjcwNDc1MzViOTM2MmZlMTBkODQ1YzQ5ZTFmMGVmNmNlOWRjMDQ1Nzc2OTNm
-    YTgzYzU5ZjMwNWZlYjgwMzE0MWZjZjNhMmM3YTQ1ZjJlMDAzY2E=
+    YmUwNDcwYmFjZDc4ZmM0OGI0NmUxYWY0YWIyZmZkNDQ2MzYwNzFjNmNlZjAy
+    YTdhNjFjZjM3NmQ3ZmFhYWJmYmFmZjUyNDlmODNmZjNmZmY0MDZhYzNjODYz
+    ZjZjODg1NzBjZWIwMzU1M2NjNDkxOWYzYTMxYzI4NTg2MGI4MDQ=

data/bin/rdebug-ide

@@ -14,7 +14,7 @@ class RdebugIde
     check_argv!
     Debugger.const_set("ARGV", ARGV.clone)
     Debugger.const_set("RDEBUG_SCRIPT", rdebug_path)
-    install_interruption_hander if options.int_handler
+    install_interruption_handler if options.int_handler
     Debugger.tracing = options.tracing
     Debugger.wait_for_start = options.wait_for_start
     Debugger.wait_connection = true
@@ -25,6 +25,7 @@ class RdebugIde
     else
       Debugger::Xml::FakeLogger.new
     end
+    init_multi_process_debug(options) if options.dispatcher_port
   end
 
   def run
@@ -38,7 +39,17 @@ class RdebugIde
 
   private
 
-    def check_argv!
+  def init_multi_process_debug(options)
+    ENV['IDE_PROCESS_DISPATCHER'] = options.dispatcher_port.to_s
+    ENV['DEBUGGER_HOST'] = options.host.to_s
+    ENV['DEBUGGER_DEBUG_MODE'] = options.debug_mode.to_s
+    ENV['DEBUGGER_STORED_RUBYLIB'] = $LOAD_PATH.join(File::PATH_SEPARATOR)
+    old_opts = ENV['RUBYOPT']
+    ENV['RUBYOPT'] = "-r#{File.expand_path(File.dirname(__FILE__))}/../lib/debugger/xml/multiprocess/starter"
+    ENV['RUBYOPT'] += " #{old_opts}" if old_opts
+  end
+
+  def check_argv!
       if ARGV.empty?
         puts opts
         puts
@@ -47,7 +58,7 @@ class RdebugIde
       end
     end
 
-    def install_interruption_hander
+    def install_interruption_handler
       trap('INT') { Debugger.interrupt_last }
     end
 
@@ -68,7 +79,7 @@ class RdebugIde
       @opts ||= begin
         @options = OpenStruct.new(
           host: "127.0.0.1", port: 12345, stop: false, tracing: false, wait_for_start: true,
-          int_handler: true, debug_mode: false
+          int_handler: true, debug_mode: false, dispatcher_port: nil
         )
         opts = OptionParser.new do |opts|
           opts.banner = %{
@@ -79,9 +90,11 @@ class RdebugIde
           opts.separator ""
           opts.separator "Options:"
           opts.on("-h", "--host HOST", "Host name used for remote debugging") { |host| @options.host = host }
-          opts.on("-d", "--debug", "Enable debug mode") { |host| @options.debug_mode = true }
-          opts.on("--cport PORT", Integer, "Port used for control commands") { |cport| @options.cport = cport }
           opts.on("-p", "--port PORT", Integer, "Port used for remote debugging") { |port| @options.port = port }
+          opts.on('--dispatcher-port PORT', Integer, 'Port used for multi-process debugging dispatcher') do |dp|
+            @options.dispatcher_port = dp
+          end
+          opts.on("-d", "--debug", "Enable debug mode") { |host| @options.debug_mode = true }
           opts.on("--wait", String, "Wait for 'start' command") do |bool|
             @options.wait_for_start = (bool == "false" ? false : true)
           end

data/lib/debugger/printers/texts/xml.yml

@@ -108,6 +108,7 @@ thread:
       id: "{id}"
       status: "{status}"
       current: "{current}"
+      pid: "{pid}"
 
 variable:
   variable:

data/lib/debugger/xml/extensions/commands/frame.rb

@@ -3,7 +3,9 @@ module Debugger
 
     # Mark should be 'true' or 'false', as a String
     def get_pr_arguments_with_xml(mark, *args)
-      get_pr_arguments_without_xml((!!mark).to_s, *args)
+      res = get_pr_arguments_without_xml((!!mark).to_s, *args)
+      res[:file] = File.expand_path(res[:file])
+      res
     end
 
     alias_method :get_pr_arguments_without_xml, :get_pr_arguments

data/lib/debugger/xml/extensions/commands/threads.rb

@@ -0,0 +1,10 @@
+module Debugger
+  module ThreadFunctions # :nodoc:
+    def thread_arguments_with_pid(context, should_show_top_frame = true)
+      thread_arguments_without_pid(context, should_show_top_frame).merge(pid: Process.pid)
+    end
+
+    alias_method :thread_arguments_without_pid, :thread_arguments
+    alias_method :thread_arguments, :thread_arguments_with_pid
+  end
+end

data/lib/debugger/xml/extensions/commands/variables.rb

@@ -1,4 +1,11 @@
 module Debugger
+  module VarFunctions # :nodoc:
+
+    def var_global
+      var_list(global_variables.reject { |v| [:$=, :$KCODE, :$-K, :$FILENAME].include?(v) })
+    end
+
+  end
   class VarInstanceCommand < Command
 
     def execute_with_xml(*args)

data/lib/debugger/xml/extensions/ide_server.rb

@@ -1,6 +1,6 @@
 module Debugger
   class << self
-    attr_accessor :wait_for_start
+    attr_accessor :wait_for_start, :control_thread
 
     def start_remote_ide(host, port)
       return if @control_thread
@@ -11,6 +11,10 @@ module Debugger
         $stderr.printf "Fast Debugger (debugger-xml #{Xml::VERSION}) listens on #{host}:#{port}\n"
         server = TCPServer.new(host, port)
         while (session = server.accept)
+          dispatcher = ENV['IDE_PROCESS_DISPATCHER']
+          if dispatcher && !dispatcher.include?(":")
+            ENV['IDE_PROCESS_DISPATCHER'] = "#{session.peeraddr[2]}:#{dispatcher}"
+          end
           interface = Xml::Ide::Interface.new(session)
           processor = Xml::Ide::ControlCommandProcessor.new(interface)
           self.handler = Xml::Ide::Processor.new(interface)

data/lib/debugger/xml/multiprocess/monkey.rb

@@ -0,0 +1,49 @@
+module Debugger
+  module Xml
+    module MultiProcess
+      def self.create_mp_fork(private=false)
+        %Q{
+          alias pre_debugger_fork fork
+
+          #{private ? "private" : ""}
+          def fork(*args)
+            if block_given?
+              return pre_debugger_fork{Debugger::Xml::MultiProcess::pre_child; yield}
+            end
+            result = pre_debugger_fork
+            Debugger::Xml::MultiProcess::pre_child unless result
+            result
+          end
+        }
+      end
+
+      def self.create_mp_exec(private=false)
+        %Q{
+          alias pre_debugger_exec exec
+
+          #{private ? "private" : ""}
+          def exec(*args)
+            Debugger.handler.interface.close
+            pre_debugger_exec(*args)
+          end
+        }
+      end
+    end
+  end
+end
+
+module Kernel
+  class << self
+    module_eval Debugger::Xml::MultiProcess.create_mp_fork
+    module_eval Debugger::Xml::MultiProcess.create_mp_exec
+  end
+  module_eval Debugger::Xml::MultiProcess.create_mp_fork(true)
+  module_eval Debugger::Xml::MultiProcess.create_mp_exec(true)
+end
+
+module Process
+  class << self
+    module_eval Debugger::Xml::MultiProcess.create_mp_fork
+    module_eval Debugger::Xml::MultiProcess.create_mp_exec
+  end
+end

data/lib/debugger/xml/multiprocess/pre_child.rb

@@ -0,0 +1,80 @@
+module Debugger
+  module Xml
+    module MultiProcess
+      class << self
+        def pre_child
+
+          require 'socket'
+          require 'ostruct'
+
+          host = ENV['DEBUGGER_HOST']
+          port = find_free_port(host)
+
+          options = OpenStruct.new(
+            host: host,
+            port: port,
+            stop: false,
+            tracing: false,
+            wait_for_start: true,
+            int_handler: true,
+            debug_mode: (ENV['DEBUGGER_DEBUG_MODE'] == 'true'),
+            dispatcher_port: ENV['IDE_PROCESS_DISPATCHER']
+          )
+
+          acceptor_host, acceptor_port = ENV['IDE_PROCESS_DISPATCHER'].split(":")
+          acceptor_host, acceptor_port = '127.0.0.1', acceptor_host unless acceptor_port
+
+          connected = false
+          3.times do |i|
+            begin
+              s = TCPSocket.open(acceptor_host, acceptor_port)
+              s.print(port)
+              s.close
+              connected = true
+              start_debugger(options)
+              return
+            rescue => bt
+              $stderr.puts "#{Process.pid}: connection failed(#{i+1})"
+              $stderr.puts "Exception: #{bt}"
+              $stderr.puts bt.backtrace.map { |l| "\t#{l}" }.join("\n")
+              sleep 0.3
+            end unless connected
+          end
+        end
+
+        def start_debugger(options)
+          if Debugger.started?
+            # we're in forked child, only need to restart control thread
+            Debugger.breakpoints.clear
+            Debugger.control_thread = nil
+          end
+
+          if options.int_handler
+            # install interruption handler
+            trap('INT') { Debugger.interrupt_last }
+          end
+
+          # set options
+          Debugger.tracing = options.tracing
+          Debugger.wait_for_start = options.wait_for_start
+          Debugger.wait_connection = true
+          Debugger.printer = Printers::Xml.new
+          Debugger::Xml.logger = if options.debug_mode
+            Debugger::Xml::Ide::Logger.new
+          else
+            Debugger::Xml::FakeLogger.new
+          end
+          Debugger.start_remote_ide(options.host, options.port)
+        end
+
+
+        def find_free_port(host)
+          server = TCPServer.open(host, 0)
+          port   = server.addr[1]
+          server.close
+          port
+        end
+      end
+    end
+  end
+end

data/lib/debugger/xml/multiprocess/starter.rb

@@ -0,0 +1,10 @@
+if ENV['IDE_PROCESS_DISPATCHER']
+  require 'rubygems'
+  # todo: do we need these lines?
+  ENV['DEBUGGER_STORED_RUBYLIB'].split(File::PATH_SEPARATOR).each do |path|
+    next unless path =~ /debugger-xml|\/debugger\/|linecache/
+    $LOAD_PATH << path
+  end
+  require 'debugger/xml'
+  Debugger::Xml::MultiProcess.pre_child
+end

data/lib/debugger/xml/version.rb

@@ -1,5 +1,5 @@
 module Debugger
   module Xml
-    VERSION = "0.2.0"
+    VERSION = "0.3.1"
   end
 end

data/test/thread_test.rb

@@ -9,7 +9,7 @@ describe "Thread Command" do
     thnum = nil
     enter 'break 8', 'cont', 'thread list', release
     debug_file('thread') { thnum = Debugger.contexts.first.thnum }
-    check_output_includes %{<threads><thread id="#{thnum}" status="run" current="yes"/></threads>}
+    check_output_includes %{<threads><thread id="#{thnum}" status="run" current="yes" pid="#{Process.pid}"/></threads>}
   end
 
   it "must show 3 available threads" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debugger-xml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Anton Astashov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
@@ -108,6 +108,7 @@ files:
 - lib/debugger/xml/extensions/commands/inspect.rb
 - lib/debugger/xml/extensions/commands/irb.rb
 - lib/debugger/xml/extensions/commands/kill.rb
+- lib/debugger/xml/extensions/commands/threads.rb
 - lib/debugger/xml/extensions/commands/tmate.rb
 - lib/debugger/xml/extensions/commands/trace.rb
 - lib/debugger/xml/extensions/commands/variables.rb
@@ -119,6 +120,9 @@ files:
 - lib/debugger/xml/ide/interface.rb
 - lib/debugger/xml/ide/logger.rb
 - lib/debugger/xml/ide/processor.rb
+- lib/debugger/xml/multiprocess/monkey.rb
+- lib/debugger/xml/multiprocess/pre_child.rb
+- lib/debugger/xml/multiprocess/starter.rb
 - lib/debugger/xml/version.rb
 - lib/debugger/xml/vim/control_command_processor.rb
 - lib/debugger/xml/vim/interface.rb