additionals/bin/socket @@ -82,9 +82,28 @@ endfunction " only through g:RubyDebugger.send_command function function! s:send_message_to_debugger(message) if g:ruby_debugger_fast_sender - call system(s:runtime_dir . "/bin/socket " . s:hostname . " 39768 '" . a:message . "'") + call system(s:runtime_dir . "/bin/socket " . s:hostname . " " . s:debugger_port . " '" . a:message . "'") else - call system("ruby -e \"require 'socket'; a = TCPSocket.open('" . s:hostname . "', 39768); a.puts('" . a:message . "'); a.close\"") + let script = "ruby -e \"require 'socket'; " + let script .= "attempts = 0; " + let script .= "begin; " + let script .= "a = TCPSocket.open('" . s:hostname . "', " . s:debugger_port . "); " + let script .= "a.puts('" . a:message . "'); " + let script .= "a.close; " + let script .= "rescue Errno::ECONNREFUSED; " + let script .= "attempts += 1; " + let script .= "if attempts < 400; " + let script .= "sleep 0.05; " + let script .= "retry; " + let script .= "else; " + let script .= "puts('" . s:hostname . ":" . s:debugger_port . " can not be opened'); " + let script .= "exit; " + let script .= "end; " + let script .= "end; \"" + let output = system(script) + if output =~ 'can not be opened' + call g:RubyDebugger.logger.put("Can't send a message to rdebug - port is not opened") + endif endif endfunction ruby_debugger/common.vim @@ -29,21 +29,17 @@ function! s:Server.start(script) dict " Start in background if has("win32") || has("win64") silent exe '! start ' . rdebug - sleep 2 let debugger = 'ruby "' . expand(self.runtime_dir . "/bin/ruby_debugger.rb") . '"' . debugger_parameters silent exe '! start ' . debugger - sleep 2 else call system(rdebug . ' > ' . self.output_file . ' &') - sleep 2 let debugger = 'ruby ' . expand(self.runtime_dir . "/bin/ruby_debugger.rb") . debugger_parameters call system(debugger. ' &') - sleep 2 endif " Set PIDs of processes - let self.rdebug_pid = self._get_pid(self.hostname, self.rdebug_port) - let self.debugger_pid = self._get_pid(self.hostname, self.debugger_port) + let self.rdebug_pid = self._get_pid(self.hostname, self.rdebug_port, 1) + let self.debugger_pid = self._get_pid(self.hostname, self.debugger_port, 1) call g:RubyDebugger.logger.put("Start debugger") endfunction @@ -60,15 +56,30 @@ endfunction " Return 1 if processes with set PID exist. function! s:Server.is_running() dict - return (self._get_pid(self.hostname, self.rdebug_port) =~ '^\d\+$') && (self._get_pid(self.hostname, self.debugger_port) =~ '^\d\+$') + return (self._get_pid(self.hostname, self.rdebug_port, 0) =~ '^\d\+$') && (self._get_pid(self.hostname, self.debugger_port, 0) =~ '^\d\+$') endfunction " ** Private methods -" Get PID of process, that listens given port on given host -function! s:Server._get_pid(bind, port) +" Get PID of process, that listens given port on given host. If must_get_pid +" parameter is true, it will try to get PID for 20 seconds. +function! s:Server._get_pid(bind, port, must_get_pid) + let attempt = 0 + let pid = self._get_pid_attempt(a:bind, a:port) + while a:must_get_pid && pid == "" && attempt < 2000 + sleep 10m + let attempt += 1 + let pid = self._get_pid_attempt(a:bind, a:port) + endwhile + return pid +endfunction + + +" Just try to get PID of process and return empty string if it was +" unsuccessful +function! s:Server._get_pid_attempt(bind, port) if has("win32") || has("win64") let netstat = system("netstat -anop tcp") let pid_match = matchlist(netstat, ':' . a:port . '\s.\{-}LISTENING\s\+\(\d\+\)') @@ -85,7 +96,7 @@ endfunction " Kill listener of given host/port function! s:Server._stop_server(bind, port) dict - let pid = self._get_pid(a:bind, a:port) + let pid = self._get_pid(a:bind, a:port, 0) if pid =~ '^\d\+$' call self._kill_process(pid) endif ruby_debugger/server.vim @@ -11,6 +11,8 @@ #include <stdlib.h> #include <unistd.h> +#include <time.h> + extern int errno; int main(int argc, char **argv) { @@ -49,8 +51,14 @@ int main(int argc, char **argv) { memcpy(&socketaddr.sin_addr, hostaddr->h_addr, hostaddr->h_length); int rval; - rval = connect(sd, (struct sockaddr *) &socketaddr, sizeof(socketaddr)); - printf("%d\n", rval); + int attempts = 0; + struct timespec ts = { .tv_sec = 0, .tv_nsec = 50000000 }; + do { + rval = connect(sd, (struct sockaddr *) &socketaddr, sizeof(socketaddr)); + attempts += 1; + nanosleep(&ts, NULL); + } while (rval == -1 && attempts < 400); + if (rval == -1) { perror("connect()"); return(errno); socket.c @@ -23,8 +23,8 @@ function! s:Tests.server.test_should_stop_server(test) exe "Rdebugger" call g:RubyDebugger.server.stop() call g:TU.ok(!g:RubyDebugger.server.is_running(), "Server should not be run", a:test) - call g:TU.equal("", s:Server._get_pid(s:hostname, s:rdebug_port), "Process rdebug-ide should not exist", a:test) - call g:TU.equal("", s:Server._get_pid(s:hostname, s:debugger_port), "Process debugger.rb should not exist", a:test) + call g:TU.equal("", s:Server._get_pid(s:hostname, s:rdebug_port, 0), "Process rdebug-ide should not exist", a:test) + call g:TU.equal("", s:Server._get_pid(s:hostname, s:debugger_port, 0), "Process debugger.rb should not exist", a:test) call g:TU.equal("", g:RubyDebugger.server.rdebug_pid, "Pid of rdebug-ide should be nullified", a:test) call g:TU.equal("", g:RubyDebugger.server.debugger_pid, "Pid of debugger.rb should be nullified", a:test) endfunction tests/server.vim @@ -1,68 +1,107 @@ require 'socket' -def create_directory(file) - dir = File.dirname(file) - Dir.mkdir(dir) unless File.exist?(dir) && File.directory?(dir) - dir -end +class VimRubyDebugger -def have_unclosed_tag(output) - start_match = output.match(/^<([a-zA-Z0-9\-_]+)>/) - if start_match - end_match = output.match(/<\/#{start_match[1]}>$/) - return end_match ? false : true - else - return false + def initialize(params) + @params = params + create_directory(@params[:messages_file]) + @rdebug = wait_for_opened_socket(@params[:host], @params[:rdebug_port]) + @vim_ruby_debugger = TCPServer.new(@params[:host], @params[:vim_ruby_debugger_port]) + run end -end -def read_socket(response, debugger, output = "") - if response && response[0] && response[0][0] - output += response[0][0].recv(10000) - if have_unclosed_tag(output) - # If rdebug-ide doesn't send full message, we should wait for rest parts too. - # We can understand that this is just part of message by matching unclosed tags - another_response = select([debugger], nil, nil) - else - # Sometimes by some reason rdebug-ide sends blank strings just after main message. - # We need to remove these strings by receiving them - another_response = select([debugger], nil, nil, 0.01) + private + + def wait_for_opened_socket(host, port, &block) + attempts = 0 + begin + socket = TCPSocket.open(host, port) + yield if block_given? + rescue Errno::ECONNREFUSED => msg + attempts += 1 + # If socket wasn't be opened for 20 seconds, exit + if attempts < 400 + sleep 0.05 + retry + else + raise Errno::ECONNREFUSED, "#{host}:#{port} wasn't be opened" + end + end + socket end - if another_response && another_response[0] && another_response[0][0] - output = read_socket(another_response, debugger, output) + + + def create_directory(file) + dir = File.dirname(file) + Dir.mkdir(dir) unless File.exist?(dir) && File.directory?(dir) end - end - output -end -server = TCPServer.new(ARGV[0], ARGV[2]) -debugger = TCPSocket.open(ARGV[0], ARGV[1]) -create_directory(ARGV[5]) -storage = [] + def run + t1 = Thread.new do + while(session = @vim_ruby_debugger.accept) + input = session.gets + @rdebug.puts(input) + end + end + t2 = Thread.new do + loop do + response = select([@rdebug], nil, nil) + output = read_socket(response, @rdebug) + File.open(@params[:messages_file], 'w') { |f| f.puts(output) } + command = ":call RubyDebugger.receive_command()" + starter = (@params[:os] == 'win' ? "<C-\\>" : "<C-\\\\>") + system("#{@params[:vim_executable]} --servername #{@params[:vim_servername]} -u NONE -U NONE --remote-send \"" + starter + "<C-N>#{command}<CR>\""); + end + end + t1.join + + @rdebug.puts('exit') + @rdebug.close + @vim_ruby_debugger.close + end + + + def read_socket(response, debugger, output = "") + if response && response[0] && response[0][0] + output += response[0][0].recv(10000) + if have_unclosed_tag(output) + # If rdebug-ide doesn't send full message, we should wait for rest parts too. + # We can understand that this is just part of message by matching unclosed tags + another_response = select([debugger], nil, nil) + else + # Sometimes by some reason rdebug-ide sends blank strings just after main message. + # We need to remove these strings by receiving them + another_response = select([debugger], nil, nil, 0.01) + end + if another_response && another_response[0] && another_response[0][0] + output = read_socket(another_response, debugger, output) + end + end + output + end + + + def have_unclosed_tag(output) + start_match = output.match(/^<([a-zA-Z0-9\-_]+)>/) + if start_match + end_match = output.match(/<\/#{start_match[1]}>$/) + return end_match ? false : true + else + return false + end + end -t1 = Thread.new do - while(session = server.accept) - input = session.gets - - debugger.puts(input) - end -end -t2 = Thread.new do - loop do - response = select([debugger], nil, nil) - output = read_socket(response, debugger) - File.open(ARGV[5], 'w') { |f| f.puts(output) } - command = ":call RubyDebugger.receive_command()" - starter = (ARGV[6] == 'win' ? "<C-\\>" : "<C-\\\\>") - system("#{ARGV[3]} --servername #{ARGV[3]} -u NONE -U NONE --remote-send \"" + starter + "<C-N>#{command}<CR>\""); - end end -t1.join -debugger.puts('exit') -debugger.close -server.close -puts "End" +VimRubyDebugger.new( + :host => ARGV[0], + :rdebug_port => ARGV[1], + :vim_ruby_debugger_port => ARGV[2], + :vim_executable => ARGV[3], + :vim_servername => ARGV[4], + :messages_file => ARGV[5], + :os => ARGV[6] +) vim/bin/ruby_debugger.rb @@ -139,9 +139,28 @@ endfunction " only through g:RubyDebugger.send_command function function! s:send_message_to_debugger(message) if g:ruby_debugger_fast_sender - call system(s:runtime_dir . "/bin/socket " . s:hostname . " 39768 '" . a:message . "'") + call system(s:runtime_dir . "/bin/socket " . s:hostname . " " . s:debugger_port . " '" . a:message . "'") else - call system("ruby -e \"require 'socket'; a = TCPSocket.open('" . s:hostname . "', 39768); a.puts('" . a:message . "'); a.close\"") + let script = "ruby -e \"require 'socket'; " + let script .= "attempts = 0; " + let script .= "begin; " + let script .= "a = TCPSocket.open('" . s:hostname . "', " . s:debugger_port . "); " + let script .= "a.puts('" . a:message . "'); " + let script .= "a.close; " + let script .= "rescue Errno::ECONNREFUSED; " + let script .= "attempts += 1; " + let script .= "if attempts < 400; " + let script .= "sleep 0.05; " + let script .= "retry; " + let script .= "else; " + let script .= "puts('" . s:hostname . ":" . s:debugger_port . " can not be opened'); " + let script .= "exit; " + let script .= "end; " + let script .= "end; \"" + let output = system(script) + if output =~ 'can not be opened' + call g:RubyDebugger.logger.put("Can't send a message to rdebug - port is not opened") + endif endif endfunction @@ -1345,21 +1364,17 @@ function! s:Server.start(script) dict " Start in background if has("win32") || has("win64") silent exe '! start ' . rdebug - sleep 2 let debugger = 'ruby "' . expand(self.runtime_dir . "/bin/ruby_debugger.rb") . '"' . debugger_parameters silent exe '! start ' . debugger - sleep 2 else call system(rdebug . ' > ' . self.output_file . ' &') - sleep 2 let debugger = 'ruby ' . expand(self.runtime_dir . "/bin/ruby_debugger.rb") . debugger_parameters call system(debugger. ' &') - sleep 2 endif " Set PIDs of processes - let self.rdebug_pid = self._get_pid(self.hostname, self.rdebug_port) - let self.debugger_pid = self._get_pid(self.hostname, self.debugger_port) + let self.rdebug_pid = self._get_pid(self.hostname, self.rdebug_port, 1) + let self.debugger_pid = self._get_pid(self.hostname, self.debugger_port, 1) call g:RubyDebugger.logger.put("Start debugger") endfunction @@ -1376,15 +1391,30 @@ endfunction " Return 1 if processes with set PID exist. function! s:Server.is_running() dict - return (self._get_pid(self.hostname, self.rdebug_port) =~ '^\d\+$') && (self._get_pid(self.hostname, self.debugger_port) =~ '^\d\+$') + return (self._get_pid(self.hostname, self.rdebug_port, 0) =~ '^\d\+$') && (self._get_pid(self.hostname, self.debugger_port, 0) =~ '^\d\+$') endfunction " ** Private methods -" Get PID of process, that listens given port on given host -function! s:Server._get_pid(bind, port) +" Get PID of process, that listens given port on given host. If must_get_pid +" parameter is true, it will try to get PID for 20 seconds. +function! s:Server._get_pid(bind, port, must_get_pid) + let attempt = 0 + let pid = self._get_pid_attempt(a:bind, a:port) + while a:must_get_pid && pid == "" && attempt < 2000 + sleep 10m + let attempt += 1 + let pid = self._get_pid_attempt(a:bind, a:port) + endwhile + return pid +endfunction + + +" Just try to get PID of process and return empty string if it was +" unsuccessful +function! s:Server._get_pid_attempt(bind, port) if has("win32") || has("win64") let netstat = system("netstat -anop tcp") let pid_match = matchlist(netstat, ':' . a:port . '\s.\{-}LISTENING\s\+\(\d\+\)') @@ -1401,7 +1431,7 @@ endfunction " Kill listener of given host/port function! s:Server._stop_server(bind, port) dict - let pid = self._get_pid(a:bind, a:port) + let pid = self._get_pid(a:bind, a:port, 0) if pid =~ '^\d\+$' call self._kill_process(pid) endif vim/plugin/ruby_debugger.vim @@ -139,9 +139,28 @@ endfunction " only through g:RubyDebugger.send_command function function! s:send_message_to_debugger(message) if g:ruby_debugger_fast_sender - call system(s:runtime_dir . "/bin/socket " . s:hostname . " 39768 '" . a:message . "'") + call system(s:runtime_dir . "/bin/socket " . s:hostname . " " . s:debugger_port . " '" . a:message . "'") else - call system("ruby -e \"require 'socket'; a = TCPSocket.open('" . s:hostname . "', 39768); a.puts('" . a:message . "'); a.close\"") + let script = "ruby -e \"require 'socket'; " + let script .= "attempts = 0; " + let script .= "begin; " + let script .= "a = TCPSocket.open('" . s:hostname . "', " . s:debugger_port . "); " + let script .= "a.puts('" . a:message . "'); " + let script .= "a.close; " + let script .= "rescue Errno::ECONNREFUSED; " + let script .= "attempts += 1; " + let script .= "if attempts < 400; " + let script .= "sleep 0.05; " + let script .= "retry; " + let script .= "else; " + let script .= "puts('" . s:hostname . ":" . s:debugger_port . " can not be opened'); " + let script .= "exit; " + let script .= "end; " + let script .= "end; \"" + let output = system(script) + if output =~ 'can not be opened' + call g:RubyDebugger.logger.put("Can't send a message to rdebug - port is not opened") + endif endif endfunction @@ -1345,21 +1364,17 @@ function! s:Server.start(script) dict " Start in background if has("win32") || has("win64") silent exe '! start ' . rdebug - sleep 2 let debugger = 'ruby "' . expand(self.runtime_dir . "/bin/ruby_debugger.rb") . '"' . debugger_parameters silent exe '! start ' . debugger - sleep 2 else call system(rdebug . ' > ' . self.output_file . ' &') - sleep 2 let debugger = 'ruby ' . expand(self.runtime_dir . "/bin/ruby_debugger.rb") . debugger_parameters call system(debugger. ' &') - sleep 2 endif " Set PIDs of processes - let self.rdebug_pid = self._get_pid(self.hostname, self.rdebug_port) - let self.debugger_pid = self._get_pid(self.hostname, self.debugger_port) + let self.rdebug_pid = self._get_pid(self.hostname, self.rdebug_port, 1) + let self.debugger_pid = self._get_pid(self.hostname, self.debugger_port, 1) call g:RubyDebugger.logger.put("Start debugger") endfunction @@ -1376,15 +1391,30 @@ endfunction " Return 1 if processes with set PID exist. function! s:Server.is_running() dict - return (self._get_pid(self.hostname, self.rdebug_port) =~ '^\d\+$') && (self._get_pid(self.hostname, self.debugger_port) =~ '^\d\+$') + return (self._get_pid(self.hostname, self.rdebug_port, 0) =~ '^\d\+$') && (self._get_pid(self.hostname, self.debugger_port, 0) =~ '^\d\+$') endfunction " ** Private methods -" Get PID of process, that listens given port on given host -function! s:Server._get_pid(bind, port) +" Get PID of process, that listens given port on given host. If must_get_pid +" parameter is true, it will try to get PID for 20 seconds. +function! s:Server._get_pid(bind, port, must_get_pid) + let attempt = 0 + let pid = self._get_pid_attempt(a:bind, a:port) + while a:must_get_pid && pid == "" && attempt < 2000 + sleep 10m + let attempt += 1 + let pid = self._get_pid_attempt(a:bind, a:port) + endwhile + return pid +endfunction + + +" Just try to get PID of process and return empty string if it was +" unsuccessful +function! s:Server._get_pid_attempt(bind, port) if has("win32") || has("win64") let netstat = system("netstat -anop tcp") let pid_match = matchlist(netstat, ':' . a:port . '\s.\{-}LISTENING\s\+\(\d\+\)') @@ -1401,7 +1431,7 @@ endfunction " Kill listener of given host/port function! s:Server._stop_server(bind, port) dict - let pid = self._get_pid(a:bind, a:port) + let pid = self._get_pid(a:bind, a:port, 0) if pid =~ '^\d\+$' call self._kill_process(pid) endif @@ -1676,8 +1706,8 @@ function! s:Tests.server.test_should_stop_server(test) exe "Rdebugger" call g:RubyDebugger.server.stop() call g:TU.ok(!g:RubyDebugger.server.is_running(), "Server should not be run", a:test) - call g:TU.equal("", s:Server._get_pid(s:hostname, s:rdebug_port), "Process rdebug-ide should not exist", a:test) - call g:TU.equal("", s:Server._get_pid(s:hostname, s:debugger_port), "Process debugger.rb should not exist", a:test) + call g:TU.equal("", s:Server._get_pid(s:hostname, s:rdebug_port, 0), "Process rdebug-ide should not exist", a:test) + call g:TU.equal("", s:Server._get_pid(s:hostname, s:debugger_port, 0), "Process debugger.rb should not exist", a:test) call g:TU.equal("", g:RubyDebugger.server.rdebug_pid, "Pid of rdebug-ide should be nullified", a:test) call g:TU.equal("", g:RubyDebugger.server.debugger_pid, "Pid of debugger.rb should be nullified", a:test) endfunction vim/plugin/ruby_debugger_test.vim e50f6a8699aee1e43fb04b6317e2c6a12e838a46 Anton Astashov anton@localhost.(none) http://github.com/astashov/vim-ruby-debugger/commit/3db814e6ba3e0d899f44731374874419c5a9a711 3db814e6ba3e0d899f44731374874419c5a9a711 2009-05-21T19:22:15-07:00 2009-05-21T19:22:15-07:00 Removed all stupid 'sleep 2'. Now all socket functions are just trying to connect for some time (20 seconds) every 50ms. It speeds up and stabilizing the debugger 0ef11c79cbd0ad3f4caa8a0504bf8c955d7dde1d Anton Astashov anton@localhost.(none)