readapt 1.0.0 → 1.1.0

data/ext/readapt/stack.h

@@ -1,20 +1,20 @@
-#ifndef STACK_H_
-#define STACK_H_
-
-#include "stddef.h"
-
-typedef struct readapt_stack_struct {
-    int size;
-    size_t elem_size;
-    void (*free_func)(void *);
-    int capacity;
-    void **elements;
-} readapt_stack_t;
-
-readapt_stack_t *stack_alloc(size_t elem_size, void(*free_func)(void*));
-void stack_push(readapt_stack_t *stack, void *element);
-void *stack_peek(readapt_stack_t *stack);
-void stack_pop(readapt_stack_t *stack);
-void stack_free(readapt_stack_t *stack);
-
-#endif
+#ifndef STACK_H_
+#define STACK_H_
+
+#include "stddef.h"
+
+typedef struct readapt_stack_struct {
+    int size;
+    size_t elem_size;
+    void (*free_func)(void *);
+    int capacity;
+    void **elements;
+} readapt_stack_t;
+
+readapt_stack_t *stack_alloc(size_t elem_size, void(*free_func)(void*));
+void stack_push(readapt_stack_t *stack, void *element);
+void *stack_peek(readapt_stack_t *stack);
+void stack_pop(readapt_stack_t *stack);
+void stack_free(readapt_stack_t *stack);
+
+#endif

data/ext/readapt/threads.c

@@ -6,13 +6,14 @@
 
 static VALUE c_Thread;
 static VALUE threads;
+static VALUE ids;
+static int next_id;
 
 static void thread_reference_free(void* data)
 {
 	thread_reference_t* thr;
 
 	thr = data;
-	// stack_free(thr->calls);
 	stack_free(thr->frames);
 	free(thr);
 }
@@ -37,12 +38,12 @@ static VALUE thread_reference_new(VALUE thr)
 {
 	thread_reference_t *data = malloc(sizeof(thread_reference_t));
 	VALUE obj = TypedData_Make_Struct(c_Thread, thread_reference_t, &thread_reference_type, data);
-	data->id = NUM2LONG(rb_funcall(thr, rb_intern("object_id"), 0));
+	data->id = next_id;
 	data->cursor = 0;
 	data->depth = 0;
 	data->control = rb_intern("continue");
 	data->frames = stack_alloc(sizeof(frame_t), frame_free);
-	// data->calls = stack_alloc(sizeof(frame_t), NULL);
+	next_id++;
 	return obj;
 }
 
@@ -65,20 +66,24 @@ VALUE thread_reference(VALUE thr)
 
 VALUE thread_reference_id(VALUE id)
 {
-	return rb_hash_aref(threads, id);
+	return rb_hash_aref(ids, id);
 }
 
 VALUE thread_add_reference(VALUE thr)
 {
 	VALUE ref;
+	thread_reference_t *ptr;
 
 	ref = thread_reference_new(thr);
+	ptr = thread_reference_pointer(ref);
 	rb_hash_aset(threads, rb_obj_id(thr), ref);
+	rb_hash_aset(ids, INT2NUM(ptr->id), ref);
 	return ref;
 }
 
 VALUE thread_delete_reference(VALUE thr)
 {
+	// TODO: Do we need to delete from ids here?
 	return rb_hash_delete(threads, rb_obj_id(thr));
 }
 
@@ -101,6 +106,7 @@ void thread_pause()
 void thread_clear()
 {
 	rb_funcall(threads, rb_intern("clear"), 0);
+	rb_funcall(ids, rb_intern("clear"), 0);
 }
 
 static VALUE thread_allocate_s(VALUE self)
@@ -110,7 +116,6 @@ static VALUE thread_allocate_s(VALUE self)
 	data->depth = 0;
 	data->cursor = 0;
 	data->frames = stack_alloc(sizeof(frame_t), frame_free);
-	// data->calls = stack_alloc(sizeof(frame_t), NULL);
 	data->id = 0;
 	return TypedData_Wrap_Struct(self, &thread_reference_type, data);
 }
@@ -127,7 +132,7 @@ static VALUE thread_find_s(VALUE self, VALUE id)
 
 static VALUE thread_include_s(VALUE self, VALUE id)
 {
-	return rb_funcall(threads, rb_intern("include?"), 1, id);
+	return rb_funcall(ids, rb_intern("include?"), 1, id);
 }
 
 static VALUE thread_id_m(VALUE self)
@@ -167,17 +172,14 @@ void thread_reference_build_frames(thread_reference_t *ptr)
 
 void thread_reference_clear_frames(thread_reference_t *ptr)
 {
-	// TODO This is probably suboptimal
-	// while (ptr->frames->size > 0)
-	// {
-	// 	stack_pop(ptr->frames);
-	// }
 	stack_free(ptr->frames);
 	ptr->frames = stack_alloc(sizeof(frame_t), frame_free);
 }
 
 void initialize_threads(VALUE m_Readapt)
 {
+	next_id = 1;
+
 	c_Thread = rb_define_class_under(m_Readapt, "Thread", rb_cData);
 	rb_define_alloc_func(c_Thread, thread_allocate_s);
 	rb_define_method(c_Thread, "id", thread_id_m, 0);
@@ -188,4 +190,6 @@ void initialize_threads(VALUE m_Readapt)
 
 	threads = rb_hash_new();
 	rb_global_variable(&threads);
+	ids = rb_hash_new();
+	rb_global_variable(&ids);
 }

data/ext/readapt/threads.h

@@ -6,7 +6,7 @@
 #include "stack.h"
 
 typedef struct thread_reference_struct {
-	long id;
+	int id;
 	int cursor;
 	int depth;
 	ID control;

data/lib/readapt.rb

@@ -1,20 +1,21 @@
-require 'backport'
-
-require 'readapt/version'
-require 'readapt/readapt'
-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,20 +1,20 @@
-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
-
-    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
+
+    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