readapt 1.4.0 → 1.4.1

data/ext/readapt/threads.c

@@ -43,7 +43,8 @@ static VALUE thread_reference_new(VALUE thr)
 	data->depth = 0;
 	data->control = rb_intern("continue");
 	data->frames = stack_alloc(sizeof(frame_t), frame_free);
-	next_id++;
+    data->thread_object_id = NUM2LONG(rb_obj_id(thr));
+    next_id++;
 	return obj;
 }
 
@@ -165,6 +166,15 @@ static VALUE frames_m(VALUE self)
 	return ary;
 }
 
+static VALUE thread_object_id_m(VALUE self)
+{
+	thread_reference_t *data;
+
+    data = thread_reference_pointer(self);
+    return LONG2NUM(data->thread_object_id);
+    // return rb_hash_aref(ids, INT2NUM(data->id))->object_id;
+}
+
 void thread_reference_build_frames(thread_reference_t *ptr)
 {
 	inspector_inspect(ptr);
@@ -184,7 +194,8 @@ void initialize_threads(VALUE m_Readapt)
 	rb_define_alloc_func(c_Thread, thread_allocate_s);
 	rb_define_method(c_Thread, "id", thread_id_m, 0);
 	rb_define_method(c_Thread, "frames", frames_m, 0);
-	rb_define_singleton_method(c_Thread, "all", thread_all_s, 0);
+    rb_define_method(c_Thread, "thread_object_id", thread_object_id_m, 0);
+    rb_define_singleton_method(c_Thread, "all", thread_all_s, 0);
 	rb_define_singleton_method(c_Thread, "find", thread_find_s, 1);
 	rb_define_singleton_method(c_Thread, "include?", thread_include_s, 1);
 

data/ext/readapt/threads.h

@@ -10,7 +10,8 @@ typedef struct thread_reference_struct {
 	int cursor;
 	int depth;
 	ID control;
-	readapt_stack_t *frames;
+    long thread_object_id;
+    readapt_stack_t *frames;
 } thread_reference_t;
 
 void initialize_threads(VALUE);

data/lib/readapt.rb

@@ -1,21 +1,21 @@
-require 'backport'
-
-require 'readapt/version'
-require 'readapt/readapt'
-require 'readapt/references'
-require 'readapt/breakpoint'
-require 'readapt/thread'
-require 'readapt/frame'
-require 'readapt/monitor'
-require 'readapt/snapshot'
-require 'readapt/finder'
-require 'readapt/debugger'
-require 'readapt/message'
-require 'readapt/variable'
-require 'readapt/data_reader'
-require 'readapt/server'
-require 'readapt/adapter'
-require 'readapt/input'
-require 'readapt/output'
-require 'readapt/error'
-require 'readapt/shell'
+require 'backport'
+
+require 'readapt/version'
+require 'readapt/readapt'
+require 'readapt/references'
+require 'readapt/breakpoint'
+require 'readapt/thread'
+require 'readapt/frame'
+require 'readapt/monitor'
+require 'readapt/snapshot'
+require 'readapt/finder'
+require 'readapt/debugger'
+require 'readapt/message'
+require 'readapt/variable'
+require 'readapt/data_reader'
+require 'readapt/server'
+require 'readapt/adapter'
+require 'readapt/input'
+require 'readapt/output'
+require 'readapt/error'
+require 'readapt/shell'

data/lib/readapt/adapter.rb

@@ -1,98 +1,98 @@
-# frozen_string_literal: true
-
-require 'json'
-
-module Readapt
-  module Adapter
-    # @!parse include Backport::Adapter
-
-    @@debugger = nil
-
-    def self.host debugger
-      @@debugger = debugger
-    end
-
-    def self.procid= pid
-      @@procid = pid
-    end
-
-    def procid
-      @@procid
-    end
-
-    def open_message
-      @@open_message ||= "<readapt-#{procid}>"
-    end
-
-    def close_message
-      @@close_message ||= "</readapt-#{procid}>"
-    end
-
-    def format result
-      write_line result.to_protocol.to_json
-    end
-
-    def opening
-      @@debugger.add_observer self
-      @data_reader = DataReader.new
-      @data_reader.set_message_handler do |message|
-        process message
-      end
-    end
-
-    def closing
-      @@debugger.delete_observer(self)
-    end
-
-    def receiving data
-      @data_reader.receive data
-    end
-
-    def update event, data
-      obj = {
-        type: 'event',
-        event: event
-      }
-      obj[:body] = data unless data.nil?
-      json = obj.to_json
-      envelope = "#{open_message}Content-Length: #{json.bytesize}\r\n\r\n#{json}#{close_message}"
-      write envelope
-      write "#{open_message}__TERMINATE__#{close_message}" if event == 'terminated'
-    end
-
-    private
-
-    # @param data [Hash]
-    # @return [void]
-    def process data
-      message = Message.process(data, @@debugger)
-      if data['seq']
-        json = {
-          type: 'response',
-          request_seq: data['seq'],
-          success: true,
-          command: data['command'],
-          body: message.body
-        }.to_json
-        envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
-        write "#{open_message}#{envelope}#{close_message}"
-        if data['command'] == 'disconnect'
-          @@debugger.disconnect
-          # @todo It does not appear necessary to close the adapter after
-          #   disconnecting the debugger.
-          # close
-        end
-        return unless data['command'] == 'initialize'
-        json = {
-          type: 'event',
-          event: 'initialized'
-        }.to_json
-        envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
-        write "#{open_message}#{envelope}#{close_message}"
-      end
-    rescue RuntimeError => e
-      STDERR.puts "[#{e.class}] #{e.message}"
-      STDERR.puts e.backtrace.join
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'json'
+
+module Readapt
+  module Adapter
+    # @!parse include Backport::Adapter
+
+    @@debugger = nil
+
+    def self.host debugger
+      @@debugger = debugger
+    end
+
+    def self.procid= pid
+      @@procid = pid
+    end
+
+    def procid
+      @@procid
+    end
+
+    def open_message
+      @@open_message ||= "<readapt-#{procid}>"
+    end
+
+    def close_message
+      @@close_message ||= "</readapt-#{procid}>"
+    end
+
+    def format result
+      write_line result.to_protocol.to_json
+    end
+
+    def opening
+      @@debugger.add_observer self
+      @data_reader = DataReader.new
+      @data_reader.set_message_handler do |message|
+        process message
+      end
+    end
+
+    def closing
+      @@debugger.delete_observer(self)
+    end
+
+    def receiving data
+      @data_reader.receive data
+    end
+
+    def update event, data
+      obj = {
+        type: 'event',
+        event: event
+      }
+      obj[:body] = data unless data.nil?
+      json = obj.to_json
+      envelope = "#{open_message}Content-Length: #{json.bytesize}\r\n\r\n#{json}#{close_message}"
+      write envelope
+      write "#{open_message}__TERMINATE__#{close_message}" if event == 'terminated'
+    end
+
+    private
+
+    # @param data [Hash]
+    # @return [void]
+    def process data
+      message = Message.process(data, @@debugger)
+      if data['seq']
+        json = {
+          type: 'response',
+          request_seq: data['seq'],
+          success: true,
+          command: data['command'],
+          body: message.body
+        }.to_json
+        envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
+        write "#{open_message}#{envelope}#{close_message}"
+        if data['command'] == 'disconnect'
+          @@debugger.disconnect
+          # @todo It does not appear necessary to close the adapter after
+          #   disconnecting the debugger.
+          # close
+        end
+        return unless data['command'] == 'initialize'
+        json = {
+          type: 'event',
+          event: 'initialized'
+        }.to_json
+        envelope = "Content-Length: #{json.bytesize}\r\n\r\n#{json}"
+        write "#{open_message}#{envelope}#{close_message}"
+      end
+    rescue RuntimeError => e
+      STDERR.puts "[#{e.class}] #{e.message}"
+      STDERR.puts e.backtrace.join
+    end
+  end
+end

data/lib/readapt/breakpoint.rb

@@ -1,21 +1,21 @@
-module Readapt
-  class Breakpoint
-    attr_reader :source
-    attr_reader :line
-    attr_reader :condition
-    attr_reader :hit_condition
-    attr_writer :hit_cursor
-
-    def initialize source, line, condition, hit_condition
-      @source = source
-      @line = line
-      @condition = condition
-      @hit_condition = hit_condition
-    end
-
-    # @return [Integer]
-    def hit_cursor
-      @hit_cursor ||= 0
-    end
-  end
-end
+module Readapt
+  class Breakpoint
+    attr_reader :source
+    attr_reader :line
+    attr_reader :condition
+    attr_reader :hit_condition
+    attr_writer :hit_cursor
+
+    def initialize source, line, condition, hit_condition
+      @source = source
+      @line = line
+      @condition = condition
+      @hit_condition = hit_condition
+    end
+
+    # @return [Integer]
+    def hit_cursor
+      @hit_cursor ||= 0
+    end
+  end
+end

data/lib/readapt/data_reader.rb

@@ -1,62 +1,62 @@
-module Readapt
-  class DataReader
-    def initialize
-      @in_header = true
-      @content_length = 0
-      @buffer = String.new
-    end
-
-    # Declare a block to be executed for each message received from the
-    # client.
-    #
-    # @yieldparam [Hash] The message received from the client
-    def set_message_handler &block
-      @message_handler = block
-    end
-
-    # Process raw data received from the client. The data will be parsed
-    # into messages based on the JSON-RPC protocol. Each message will be
-    # passed to the block declared via set_message_handler. Incomplete data
-    # will be buffered and subsequent data will be appended to the buffer.
-    #
-    # @param data [String]
-    def receive data
-      data.each_char do |char|
-        @buffer.concat char
-        if @in_header
-          prepare_to_parse_message if @buffer.end_with?("\r\n\r\n")
-        else
-          parse_message_from_buffer if @buffer.bytesize == @content_length
-        end
-      end
-    end
-
-    private
-
-    def prepare_to_parse_message
-      @in_header = false
-      @buffer.each_line do |line|
-        parts = line.split(':').map(&:strip)
-        if parts[0] == 'Content-Length'
-          @content_length = parts[1].to_i
-          break
-        end
-      end
-      @buffer.clear
-    end
-
-    def parse_message_from_buffer
-      begin
-        msg = JSON.parse(@buffer)
-        @message_handler.call msg unless @message_handler.nil?
-      rescue JSON::ParserError => e
-        Solargraph::Logging.logger.warn "Failed to parse request: #{e.message}"
-        Solargraph::Logging.logger.debug "Buffer: #{@buffer}"
-      ensure
-        @buffer.clear
-        @in_header = true
-        @content_length = 0
-      end
-    end
-  end
-end
+module Readapt
+  class DataReader
+    def initialize
+      @in_header = true
+      @content_length = 0
+      @buffer = String.new
+    end
+
+    # Declare a block to be executed for each message received from the
+    # client.
+    #
+    # @yieldparam [Hash] The message received from the client
+    def set_message_handler &block
+      @message_handler = block
+    end
+
+    # Process raw data received from the client. The data will be parsed
+    # into messages based on the JSON-RPC protocol. Each message will be
+    # passed to the block declared via set_message_handler. Incomplete data
+    # will be buffered and subsequent data will be appended to the buffer.
+    #
+    # @param data [String]
+    def receive data
+      data.each_char do |char|
+        @buffer.concat char
+        if @in_header
+          prepare_to_parse_message if @buffer.end_with?("\r\n\r\n")
+        else
+          parse_message_from_buffer if @buffer.bytesize == @content_length
+        end
+      end
+    end
+
+    private
+
+    def prepare_to_parse_message
+      @in_header = false
+      @buffer.each_line do |line|
+        parts = line.split(':').map(&:strip)
+        if parts[0] == 'Content-Length'
+          @content_length = parts[1].to_i
+          break
+        end
+      end
+      @buffer.clear
+    end
+
+    def parse_message_from_buffer
+      begin
+        msg = JSON.parse(@buffer)
+        @message_handler.call msg unless @message_handler.nil?
+      rescue JSON::ParserError => e
+        Solargraph::Logging.logger.warn "Failed to parse request: #{e.message}"
+        Solargraph::Logging.logger.debug "Buffer: #{@buffer}"
+      ensure
+        @buffer.clear
+        @in_header = true
+        @content_length = 0
+      end
+    end
+  end
+end