new strategy of notifying the dispatcher

(cherry picked from commit f1c9639)

Author: viuginick1

lib/ruby-debug-ide.rb

@@ -18,6 +18,13 @@
 module Debugger
 
   class << self
+    def find_free_port(host)
+      server = TCPServer.open(host, 0)
+      port   = server.addr[1]
+      server.close
+      port
+    end
+
     # Prints to the stderr using printf(*args) if debug logging flag (-d) is on.
     def print_debug(*args)
       if Debugger.cli_debug
@@ -111,9 +118,15 @@ def start_control(host, port, notify_dispatcher)
           # 127.0.0.1 seemingly works with all systems and with IPv6 as well.
           # "localhost" and nil have problems on some systems.
           host ||= '127.0.0.1'
-          server = TCPServer.new(host, port)
-          print_greeting_msg($stderr, host, port) if defined? IDE_VERSION
-          notify_dispatcher(port) if notify_dispatcher
+
+          server = notify_dispatcher_if_needed(host, port, notify_dispatcher) do |real_port, port_changed = false|
+            s = TCPServer.new(host, real_port)
+            print_greeting_msg $stderr, host, real_port, port_changed ? "Subprocess" : "Fast" if defined? IDE_VERSION
+            s
+          end
+
+          return unless server
+
           while (session = server.accept)
             $stderr.puts "Connected from #{session.peeraddr[2]}" if Debugger.cli_debug
             dispatcher = ENV['IDE_PROCESS_DISPATCHER']
@@ -141,8 +154,9 @@ def start_control(host, port, notify_dispatcher)
 
     private
 
+    def notify_dispatcher_if_needed(host, port, need_notify)
+      return yield port unless need_notify
 
-    def notify_dispatcher(port)
       return unless 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
@@ -151,11 +165,19 @@ def notify_dispatcher(port)
       3.times do |i|
         begin
           s = TCPSocket.open(acceptor_host, acceptor_port)
+          dispatcher_answer = s.gets.chomp
+
+          if dispatcher_answer == "true"
+            port = Debugger.find_free_port(host)
+          end
+
+          server = yield port, dispatcher_answer == "true"
+
           s.print(port)
           s.close
           connected = true
           print_debug "Ide process dispatcher notified about sub-debugger which listens on #{port}\n"
-          return
+          return server
         rescue => bt
           $stderr.puts "#{Process.pid}: connection failed(#{i+1})"
           $stderr.puts "Exception: #{bt}"
@@ -164,7 +186,6 @@ def notify_dispatcher(port)
         end unless connected
       end
     end
-
   end
 
   class Exception # :nodoc:

lib/ruby-debug-ide/greeter.rb

@@ -10,7 +10,7 @@
 module Debugger
 
   class << self
-    def print_greeting_msg(stream, host, port)
+    def print_greeting_msg(stream, host, port, debugger_name = "Fast")
       base_gem_name = if defined?(JRUBY_VERSION) || RUBY_VERSION < '1.9.0'
                         'ruby-debug-base'
                       elsif RUBY_VERSION < '2.0.0'
@@ -31,7 +31,7 @@ def print_greeting_msg(stream, host, port)
         listens_on = "\n"
       end
 
-      msg = "Fast Debugger (ruby-debug-ide #{IDE_VERSION}, #{base_gem_name} #{VERSION}, file filtering is #{file_filtering_support})" + listens_on
+      msg = "#{debugger_name} Debugger (ruby-debug-ide #{IDE_VERSION}, #{base_gem_name} #{VERSION}, file filtering is #{file_filtering_support})" + listens_on
 
       stream.printf msg
     end

lib/ruby-debug-ide/multiprocess/pre_child.rb

@@ -11,7 +11,7 @@ def pre_child(options = nil)
             'frame_bind'  => false,
             'host'        => host,
             'load_mode'   => false,
-            'port'        => find_free_port(host),
+            'port'        => Debugger.find_free_port(host),
             'stop'        => false,
             'tracing'     => false,
             'int_handler' => true,
@@ -24,7 +24,7 @@ def pre_child(options = nil)
         )
 
         if(options.ignore_port)
-          options.port = find_free_port(options.host)
+          options.port = Debugger.find_free_port(options.host)
           options.notify_dispatcher = true
         end
 
@@ -54,14 +54,6 @@ def start_debugger(options)
         Debugger.cli_debug = options.cli_debug
         Debugger.prepare_debugger(options)
       end
-
-
-      def find_free_port(host)
-        server = TCPServer.open(host, 0)
-        port   = server.addr[1]
-        server.close
-        port
-      end
     end
   end
 end

lib/ruby-debug-ide/version.rb

@@ -1,3 +1,3 @@
 module Debugger
-  IDE_VERSION='0.7.0.beta1'
+  IDE_VERSION='0.7.0.beta2'
 end