debug 1.4.0 → 1.9.2

data/lib/debug/breakpoint.rb

@@ -6,11 +6,15 @@ module DEBUGGER__
   class Breakpoint
     include SkipPathHelper
 
-    attr_reader :key
+    attr_reader :key, :skip_src
 
-    def initialize do_enable = true
+    def initialize cond, command, path, do_enable: true
       @deleted = false
 
+      @cond = cond
+      @command = command
+      @path = path
+
       setup
       enable if do_enable
     end
@@ -82,8 +86,11 @@ module DEBUGGER__
     end
 
     def skip_path?(path)
-      if @path
+      case @path
+      when Regexp
         !path.match?(@path)
+      when String
+        !path.include?(@path)
       else
         super
       end
@@ -108,7 +115,7 @@ module DEBUGGER__
       @oneshot = oneshot
       @key = [:iseq, @iseq.path, @iseq.first_lineno].freeze
 
-      super()
+      super(nil, nil, nil)
     end
 
     def setup
@@ -124,25 +131,31 @@ module DEBUGGER__
   end
 
   class LineBreakpoint < Breakpoint
-    attr_reader :path, :line, :iseq
+    attr_reader :path, :line, :iseq, :cond, :oneshot, :hook_call, :command
 
-    def initialize path, line, cond: nil, oneshot: false, hook_call: true, command: nil
-      @path = path
+    def self.copy bp, root_iseq
+      nbp = LineBreakpoint.new bp.path, bp.line,
+                               cond: bp.cond, oneshot: bp.oneshot, hook_call: bp.hook_call,
+                               command: bp.command, skip_activate: true
+      nbp.try_activate root_iseq
+      nbp
+    end
+
+    def initialize path, line, cond: nil, oneshot: false, hook_call: true, command: nil, skip_activate: false, skip_src: false
       @line = line
-      @cond = cond
       @oneshot = oneshot
       @hook_call = hook_call
-      @command = command
+      @skip_src = skip_src
       @pending = false
 
       @iseq = nil
       @type = nil
 
-      @key = [@path, @line].freeze
+      @key = [path, @line].freeze
 
-      super()
+      super(cond, command, path)
 
-      try_activate
+      try_activate unless skip_activate
       @pending = !@iseq
     end
 
@@ -184,8 +197,10 @@ module DEBUGGER__
       enable
 
       if @pending && !@oneshot
-        DEBUGGER__.warn "#{self} is activated."
+        DEBUGGER__.info "#{self} is activated."
       end
+
+      @pending = false
     end
 
     def activate_exact iseq, events, line
@@ -202,7 +217,7 @@ module DEBUGGER__
       when events.include?(:RUBY_EVENT_END)
         activate(iseq, :end, line)
       else
-        # not actiavated
+        # not activated
       end
     end
 
@@ -212,42 +227,53 @@ module DEBUGGER__
 
     NearestISeq = Struct.new(:iseq, :line, :events)
 
-    def try_activate
+    def iterate_iseq root_iseq
+      if root_iseq
+        is = [root_iseq]
+        while iseq = is.pop
+          yield iseq
+          iseq.each_child do |child_iseq|
+            is << child_iseq
+          end
+        end
+      else
+        ObjectSpace.each_iseq do |iseq|
+          if DEBUGGER__.compare_path((iseq.absolute_path || iseq.path), self.path) &&
+             iseq.first_lineno <= self.line &&
+             iseq.type != :ensure # ensure iseq is copied (duplicated)
+            yield iseq
+          end
+        end
+      end
+    end
+
+    def try_activate root_iseq = nil
       nearest = nil # NearestISeq
+      iterate_iseq root_iseq do |iseq|
+        iseq.traceable_lines_norec(line_events = {})
+        lines = line_events.keys.sort
+
+        if !lines.empty? && lines.last >= line
+          nline = lines.bsearch{|l| line <= l}
+          events = line_events[nline]
+
+          next if events == [:RUBY_EVENT_B_CALL]
+
+          if @hook_call &&
+            events.include?(:RUBY_EVENT_CALL) &&
+            self.line == iseq.first_lineno
+            nline = iseq.first_lineno
+          end
 
-      ObjectSpace.each_iseq{|iseq|
-        if (iseq.absolute_path || iseq.path) == self.path &&
-            iseq.first_lineno <= self.line &&
-            iseq.type != :ensure # ensure iseq is copied (duplicated)
-
-          iseq.traceable_lines_norec(line_events = {})
-          lines = line_events.keys.sort
-
-          if !lines.empty? && lines.last >= line
-            nline = lines.bsearch{|l| line <= l}
-            events = line_events[nline]
-
-            next if events == [:RUBY_EVENT_B_CALL]
-
-            if @hook_call &&
-               events.include?(:RUBY_EVENT_CALL) &&
-               self.line == iseq.first_lineno
-              nline = iseq.first_lineno
-            end
-
-            if !nearest || ((line - nline).abs < (line - nearest.line).abs)
-              nearest = NearestISeq.new(iseq, nline, events)
-            else
-              if @hook_call && nearest.iseq.first_lineno <= iseq.first_lineno
-                if (nearest.line > line && !nearest.events.include?(:RUBY_EVENT_CALL)) ||
-                   (events.include?(:RUBY_EVENT_CALL))
-                  nearest = NearestISeq.new(iseq, nline, events)
-                end
-              end
-            end
+          if !nearest || ((line - nline).abs < (line - nearest.line).abs)
+            nearest = NearestISeq.new(iseq, nline, events)
+          elsif @hook_call &&
+                nearest.line == iseq.first_line &&
+                events.include?(:RUBY_EVENT_CALL)
+            nearest = NearestISeq.new(iseq, nline, events)
           end
         end
-      }
+      end
 
       if nearest
         activate_exact nearest.iseq, nearest.events, nearest.line
@@ -267,6 +293,10 @@ module DEBUGGER__
     def inspect
       "<#{self.class.name} #{self.to_s}>"
     end
+
+    def path_is? path
+      DEBUGGER__.compare_path(@path, path)
+    end
   end
 
   class CatchBreakpoint < Breakpoint
@@ -277,11 +307,7 @@ module DEBUGGER__
       @key = [:catch, @pat].freeze
       @last_exc = nil
 
-      @cond = cond
-      @command = command
-      @path = path
-
-      super()
+      super(cond, command, path)
     end
 
     def setup
@@ -314,29 +340,41 @@ module DEBUGGER__
   end
 
   class CheckBreakpoint < Breakpoint
-    def initialize expr, path
-      @expr = expr.freeze
-      @key = [:check, @expr].freeze
-      @path = path
+    def initialize cond:, command: nil, path: nil
+      @key = [:check, cond].freeze
 
-      super()
+      super(cond, command, path)
     end
 
     def setup
       @tp = TracePoint.new(:line){|tp|
-        next if tp.path.start_with? __dir__
-        next if tp.path.start_with? '<internal:'
+        next if SESSION.in_subsession? # TODO: Ractor support
         next if ThreadClient.current.management?
         next if skip_path?(tp.path)
 
-        if safe_eval tp.binding, @expr
+        if need_suspend? safe_eval(tp.binding, @cond)
           suspend
         end
       }
     end
 
+    private def need_suspend? cond_result
+      map = ThreadClient.current.check_bp_fulfillment_map
+      if cond_result
+        if map[self]
+          false
+        else
+          map[self] = true
+        end
+      else
+        map[self] = false
+      end
+    end
+
     def to_s
-      "#{generate_label("Check")} #{@expr}"
+      s = "#{generate_label("Check")}"
+      s += super
+      s
     end
   end
 
@@ -348,10 +386,7 @@ module DEBUGGER__
 
       @current = current
 
-      @cond = cond
-      @command = command
-      @path = path
-      super()
+      super(cond, command, path)
     end
 
     def watch_eval(tp)
@@ -374,9 +409,6 @@ module DEBUGGER__
 
     def setup
       @tp = TracePoint.new(:line, :return, :b_return){|tp|
-        next if tp.path.start_with? __dir__
-        next if tp.path.start_with? '<internal:'
-
         watch_eval(tp)
       }
     end
@@ -393,7 +425,7 @@ module DEBUGGER__
   end
 
   class MethodBreakpoint < Breakpoint
-    attr_reader :sig_method_name, :method
+    attr_reader :sig_method_name, :method, :klass
 
     def initialize b, klass_name, op, method_name, cond: nil, command: nil, path: nil
       @sig_klass_name = klass_name
@@ -404,13 +436,10 @@ module DEBUGGER__
 
       @klass = nil
       @method = nil
-      @cond = cond
       @cond_class = nil
-      @command = command
-      @path = path
       @key = "#{klass_name}#{op}#{method_name}".freeze
 
-      super(false)
+      super(cond, command, path, do_enable: false)
     end
 
     def setup
@@ -419,7 +448,6 @@ module DEBUGGER__
         next if @cond_class && !tp.self.kind_of?(@cond_class)
 
         caller_location = caller_locations(2, 1).first.to_s
-        next if caller_location.start_with?(__dir__)
         next if skip_path?(caller_location)
 
         suspend
@@ -476,7 +504,7 @@ module DEBUGGER__
         retried = false
 
         @tp.enable(target: @method)
-        DEBUGGER__.warn "#{self} is activated." if added
+        DEBUGGER__.info "#{self} is activated." if added
 
         if @sig_op == '#'
           @cond_class = @klass if @method.owner != @klass

data/lib/debug/client.rb

@@ -18,9 +18,16 @@ module DEBUGGER__
         case name
         when 'gen-sockpath'
           puts DEBUGGER__.create_unix_domain_socket_name
+        when 'gen-portpath'
+          port_path = File.join(DEBUGGER__.unix_domain_socket_dir, 'tcp_port')
+          File.unlink port_path if File.exist?(port_path)
+          puts port_path
         when 'list-socks'
           cleanup_unix_domain_sockets
           puts list_connections
+        when 'list-socks-verbose'
+          cleanup_unix_domain_sockets
+          puts list_connections verbose: true
         when 'setup-autoload'
           setup_autoload
         else
@@ -38,7 +45,7 @@ module DEBUGGER__
         when /csh/
           :csh
         when /zsh/
-          :szh
+          :zsh
         when /dash/
           :dash
         else
@@ -76,7 +83,7 @@ module DEBUGGER__
 
       def cleanup_unix_domain_sockets
         Dir.glob(DEBUGGER__.create_unix_domain_socket_name_prefix + '*') do |file|
-          if /(\d+)$/ =~ file
+          if File.socket?(file) && (/-(\d+)-\d+$/ =~ file || /-(\d+)$/ =~ file)
             begin
               Process.kill(0, $1.to_i)
             rescue Errno::EPERM
@@ -87,8 +94,24 @@ module DEBUGGER__
         end
       end
 
-      def list_connections
-        Dir.glob(DEBUGGER__.create_unix_domain_socket_name_prefix + '*')
+      def list_connections verbose: false
+        socks = Dir.glob(DEBUGGER__.create_unix_domain_socket_name_prefix + '*').find_all do |path|
+          File.socket?(path)
+        end
+
+        if verbose
+          socks = socks.map{|sock_path|
+            Socket.unix(sock_path){|sock|
+              sock.puts "info cookie: #{CONFIG[:cookie] || '-'}"
+              pid = sock.gets.chomp
+              _dbg = sock.gets.chomp
+              _unm = sock.gets.chomp
+              [sock_path, pid]
+            }
+          }
+        end
+
+        socks
       end
     end
 
@@ -115,7 +138,10 @@ module DEBUGGER__
       @width = IO.console_size[1]
       @width = 80 if @width == 0
 
-      send "version: #{VERSION} width: #{@width} cookie: #{CONFIG[:cookie]}"
+      send "version: #{VERSION} " +
+           "width: #{@width} " +
+           "cookie: #{CONFIG[:cookie] || '-'} " +
+           "nonstop: #{CONFIG[:nonstop] ? 'true' : 'false'}"
     end
 
     def deactivate
@@ -148,9 +174,10 @@ module DEBUGGER__
         when 1
           @s = Socket.unix(files.first)
         else
+          files = Client.list_connections verbose: true
           $stderr.puts "Please select a debug session:"
-          files.each{|f|
-            $stderr.puts "  #{File.basename(f)}"
+          files.each{|(f, desc)|
+            $stderr.puts "  #{File.basename(f)} (#{desc})"
           }
           exit
         end
@@ -167,6 +194,8 @@ module DEBUGGER__
     end
 
     def connect
+      pre_commands = (CONFIG[:commands] || '').split(';;')
+
       trap(:SIGINT){
         send "pause"
       }
@@ -175,7 +204,7 @@ module DEBUGGER__
         trap(:SIGWINCH){
           @width = IO.console_size[1]
         }
-      rescue ArgumentError => e
+      rescue ArgumentError
         @width = 80
       end
 
@@ -193,7 +222,12 @@ module DEBUGGER__
           prev_trap = trap(:SIGINT, 'DEFAULT')
 
           begin
-            line = readline
+            if pre_commands.empty?
+              line = readline
+            else
+              line = pre_commands.shift
+              puts "(rdbg:remote:command) #{line}"
+            end
           rescue Interrupt
             retry
           ensure
@@ -206,7 +240,7 @@ module DEBUGGER__
         when /^ask (\d+) (.*)/
           pid = $1
           print $2
-          send "answer #{pid} #{gets || ''}"
+          send "answer #{pid} #{$stdin.gets || ''}"
 
         when /^quit/
           raise 'quit'
@@ -215,8 +249,8 @@ module DEBUGGER__
           puts "(unknown) #{line.inspect}"
         end
       end
-    rescue
-      STDERR.puts "disconnected (#{$!})"
+    rescue => e
+      STDERR.puts "disconnected (#{e})"
       exit
     ensure
       deactivate