readapt 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 540b9c4c18bdbd634b6db72f49fa456dc306f41f139f966770795f89850a130a
-  data.tar.gz: c0ebaf5c647ddb1c794904928902da3f8bed362562d631c25badf89acbebaef1
+  metadata.gz: 7be0d8ef56332ff58877c89e39b738afc657a831c753c28412f4e418b5edfbc9
+  data.tar.gz: cc7c1cc3bcf5e0ca5aadbc67dd03e97549ad9ef9fb047c737898ab7b9a7b1d96
 SHA512:
-  metadata.gz: b6da35b56e5244c2f3e1071ca3899f790edbfd78291d2756f1a5b0c1ab22e746ac1e83e20ec8f899eaf6fe77a408d671f5a838c2b68fda3d4798ab10ac7b0e6a
-  data.tar.gz: 6a97d5f44f5b866e3b68a78a804b52ed90b2114204f9db180fe3fe7fbe49ccbb3d08567ccdd4783e565acdb0278b195fdd0676d9193c0e59b8cd73d3578a74f2
+  metadata.gz: 5828479f0932064d54fb722763e31d0c9cf5c4edb65d24e1fb712254ff641ee2c10af0ec5b2f248b945fd2d3eecf8e08204face7ad884e6809cc0161ecaca0ac
+  data.tar.gz: b7aaabdcf80008587403f20e24d03c537f20e33eaf977f18b3fea60687f8fb9e12e641baefda5a0ea85a31ff63339892dd78aa44fc1ae04f2e2aedcec4dfb285

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.7.0 - October 12, 2019
+- Conditional breakpoints
+- Graceful shutdown (#2)
+
 # 0.6.2 - September 10, 2019
 - Monitor processes all new threads
 - Discard buggy output redirection

data/lib/readapt.rb

@@ -1,6 +1,7 @@
 require 'backport'
 
 require 'readapt/version'
+require 'readapt/breakpoint'
 require 'readapt/location'
 require 'readapt/thread'
 require 'readapt/frame'

data/lib/readapt/breakpoint.rb

@@ -0,0 +1,13 @@
+module Readapt
+  class Breakpoint
+    attr_reader :source
+    attr_reader :line
+    attr_reader :condition
+
+    def initialize source, line, condition
+      @source = source
+      @line = line
+      @condition = condition
+    end
+  end
+end

data/lib/readapt/debugger.rb

@@ -23,6 +23,7 @@ module Readapt
       @config = {}
       @original_argv = ARGV.clone
       @machine = machine
+      @breakpoints = {}
     end
 
     def config arguments, request
@@ -91,6 +92,20 @@ module Readapt
       })
     end
 
+    def get_breakpoint source, line
+      @breakpoints["#{source}:#{line}"] || Breakpoint.new(source, line, nil)
+    end
+
+    def set_breakpoint source, line, condition
+      @breakpoints["#{source}:#{line}"] = Breakpoint.new(source, line, condition)
+    end
+
+    def clear_breakpoints source
+      @breakpoints.delete_if { |key, value|
+        value.source == source
+      }
+    end
+
     def disconnect
       shutdown if launched?
       @request = nil
@@ -126,6 +141,25 @@ module Readapt
       # elsif snapshot.event == :entry
       #   snapshot.control = :continue
       else
+        if snapshot.event == :breakpoint
+          bp = get_breakpoint(snapshot.file, snapshot.line)
+          unless bp.condition.nil? || bp.condition.empty?
+            # @type [Binding]
+            bnd = ObjectSpace._id2ref(snapshot.binding_id)
+            begin
+              unless bnd.eval(bp.condition)
+                snapshot.control = :continue
+                return
+              end
+            rescue Exception => e
+              STDERR.puts "Breakpoint condition raised an error"
+              STDERR.puts "#{snapshot.file}:#{snapshot.line} - `#{bp.condition}`"
+              STDERR.puts "[#{e.class}] #{e.message}"
+              snapshot.control = :continue
+              return
+            end
+          end
+        end
         changed
         thread = self.thread(snapshot.thread_id)
         thread.control = :pause

data/lib/readapt/message/set_breakpoints.rb

@@ -5,16 +5,20 @@ module Readapt
     class SetBreakpoints < Base
       def run
         path = Readapt.normalize_path(arguments['source']['path'])
-        Breakpoints.set(path, arguments['lines'])
+        debugger.clear_breakpoints path
+        lines = []
         set_body(
-          breakpoints: arguments['lines'].map do |l|
+          breakpoints: arguments['breakpoints'].map do |val|
+            debugger.set_breakpoint path, val['line'], val['condition']
+            lines.push val['line']
             {
               verified: true, # @todo Verify
               source: arguments['source'],
-              line: l
+              line: val['line']
             }
           end
         )
+        Breakpoints.set(path, lines)
       end
     end
   end

data/lib/readapt/shell.rb

@@ -1,6 +1,4 @@
 require 'thor'
-require 'socket'
-require 'stringio'
 require 'backport'
 
 module Readapt
@@ -19,10 +17,10 @@ module Readapt
       machine = Backport::Machine.new
       machine.run do
         Signal.trap("INT") do
-          Backport.stop
+          graceful_shutdown
         end
         Signal.trap("TERM") do
-          Backport.stop
+          graceful_shutdown
         end
         debugger = Readapt::Debugger.new(machine)
         Readapt::Adapter.host debugger
@@ -30,5 +28,12 @@ module Readapt
         STDERR.puts "Readapt Debugger #{Readapt::VERSION} is listening HOST=#{options[:host]} PORT=#{options[:port]} PID=#{Process.pid}"
       end
     end
+
+    private
+
+    def graceful_shutdown
+      Backport.stop
+      exit
+    end
   end
 end

data/lib/readapt/version.rb

@@ -1,3 +1,3 @@
 module Readapt
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: readapt
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Fred Snyder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2019-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport
@@ -130,6 +130,7 @@ files:
 - ext/readapt/threads.h
 - lib/readapt.rb
 - lib/readapt/adapter.rb
+- lib/readapt/breakpoint.rb
 - lib/readapt/debugger.rb
 - lib/readapt/finder.rb
 - lib/readapt/frame.rb