debase 0.2.2 → 0.2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d9fb180b5086361e7572b01988d7b09a02cab4f3
-  data.tar.gz: ad2bed6b9d52476544c9d2bc9683c954ef7907ec
+SHA256:
+  metadata.gz: 107e62228760d4c312c185830e9b6c152814c02b2f85d94a094c44e6687402b8
+  data.tar.gz: 740ccb46f3bb6e97d60afd38e90c6d9cb3be58f0a29c66efc44f0e06d18acec8
 SHA512:
-  metadata.gz: b4bbb5c1d47aa70a2cbda6428e5a8720d128a476a259b462db72b668090c0b75b34b84f5bd0daa16459a68e4a42126e29aafb465ab4cc35248d758d876f8c9d9
-  data.tar.gz: 287b789b0fb345c5db12a719c9839208aeb851741cb0d8a72319e460c547b002377b38807e43adacc49f530a8bb8db73570282ec7109961309d3b9bf4baf65e2
+  metadata.gz: 6ade635981299fee6a15e4e353c66db86f6afe14ae5c1a3e6f364a7936cec11f21f32ce4527d249d89738a573106a80be861b63ff334d591ef29adf6bdbcc5f0
+  data.tar.gz: a9c840b6868a842f94f4402a4161115b703522c9a29ff5bb3b09ab2025fcff451b3bb912858d413bfb673eb2a994c989498fe08cef062cd04db44c68f4d5ad54

data/.travis.yml

@@ -10,7 +10,8 @@ rvm:
   - 2.2
   - 2.3
   - 2.4.2
-  - 2.5.0
+  - 2.5.3
+  - 2.6.0
   - ruby-head
 
 matrix:

data/ext/attach/extconf.rb

@@ -28,7 +28,13 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 require "debase/ruby_core_source"
 
 hdrs = proc {
-  have_header("vm_core.h")
+  have_header("vm_core.h") and
+  have_header("iseq.h") and
+  have_header("version.h") and
+  have_header("vm_core.h") and
+  have_header("vm_insnhelper.h") and
+  have_header("vm_core.h") and
+  have_header("method.h")
 }
 
 # Allow use customization of compile options. For example, the

data/ext/context.c

@@ -135,7 +135,6 @@ Context_mark(debug_context_t *context)
 
 static void
 Context_free(debug_context_t *context) {
-  xfree(context->init_stack_files);
   xfree(context);
 }
 
@@ -143,25 +142,12 @@ extern VALUE
 context_create(VALUE thread, VALUE cDebugThread) {
   debug_context_t *context;
   VALUE locations;
-  VALUE location;
-  VALUE path;
-  VALUE lineno;
 
   context = ALLOC(debug_context_t);
   context->stack_size = 0;
   locations = rb_funcall(thread, rb_intern("backtrace_locations"), 1, INT2FIX(1));
-  context->init_stack_size = context->calced_stack_size = locations != Qnil ? RARRAY_LENINT(locations) : 0;
-
-  context->init_stack_files = ruby_xmalloc2((context->init_stack_size),sizeof(char*));
-  
-  int i;
-  for (i = 0; i < context->init_stack_size; i++) {
-    location = rb_ary_entry(locations, i);
-    path = rb_funcall(location, rb_intern("path"), 0);
-    lineno = rb_funcall(location, rb_intern("lineno"), 0);
-    context->init_stack_files[i] = path != Qnil ? RSTRING_PTR(path) : "";
-  }
-
+  context->calced_stack_size = locations != Qnil ? RARRAY_LENINT(locations) : 0;
+  context->init_stack_size = -1;
 
   context->stack = NULL;
   context->thnum = ++thnum_current;
@@ -169,6 +155,8 @@ context_create(VALUE thread, VALUE cDebugThread) {
   context->flags = 0;
   context->last_file = NULL;
   context->last_line = -1;
+  context->hit_user_code = 0;
+  context->script_finished = 0;
   context->stop_frame = -1;
   context->thread_pause = 0;
   context->stop_reason = CTX_STOP_NONE;

data/ext/debase_internals.c

@@ -303,6 +303,8 @@ remove_pause_flag(VALUE thread, VALUE context_object, VALUE ignored)
 static void 
 call_at_line(debug_context_t *context, char *file, int line, VALUE context_object)
 {
+  context->hit_user_code = 1;
+
   rb_hash_foreach(contexts, remove_pause_flag, 0);
   CTX_FL_UNSET(context, CTX_FL_STEPPED);
   CTX_FL_UNSET(context, CTX_FL_FORCE_MOVE);
@@ -311,6 +313,35 @@ call_at_line(debug_context_t *context, char *file, int line, VALUE context_objec
   rb_funcall(context_object, idAtLine, 2, rb_str_new2(file), INT2FIX(line));
 }
 
+int count_stack_size() {
+    rb_thread_t *thread = ruby_current_thread;
+    rb_control_frame_t *last_cfp = TH_CFP(thread);
+    rb_control_frame_t *start_cfp = RUBY_VM_END_CONTROL_FRAME(TH_INFO(thread));
+    rb_control_frame_t *cfp;
+
+    ptrdiff_t size, i;
+
+    start_cfp =
+      RUBY_VM_NEXT_CONTROL_FRAME(
+      RUBY_VM_NEXT_CONTROL_FRAME(start_cfp)); /* skip top frames */
+
+    if (start_cfp < last_cfp) {
+        size = 0;
+    }
+    else {
+        size = start_cfp - last_cfp + 1;
+    }
+
+    int stack_size = 0;
+    for (i=0, cfp = start_cfp; i<size; i++, cfp = RUBY_VM_NEXT_CONTROL_FRAME(cfp)) {
+        if (cfp->iseq && cfp->pc) {
+            stack_size++;
+        }
+    }
+
+    return stack_size;
+}
+
 static void
 process_line_event(VALUE trace_point, void *data)
 {
@@ -323,7 +354,6 @@ process_line_event(VALUE trace_point, void *data)
   char *file;
   int line;
   int moved;
-  int not_user_code = 0;
 
   context_object = Debase_current_context(mDebase);
   Data_Get_Struct(context_object, debug_context_t, context);
@@ -338,19 +368,14 @@ process_line_event(VALUE trace_point, void *data)
     file = RSTRING_PTR(path);
     line = FIX2INT(lineno);
 
-    int i;
-    if(context->calced_stack_size < context->init_stack_size) {
-      for(i = 0; i < context->init_stack_size; i++)
-      {
-        if(strcmp(file, context->init_stack_files[i]) == 0) {
-          not_user_code = 1;
-        }
-      } 
-    }
-
     update_stack_size(context);
     print_event(tp, context);
 
+    if(context->init_stack_size == -1) {
+        context->stack_size = count_stack_size();
+        context->init_stack_size = context->stack_size;
+    }
+
     if (context->thread_pause) {
       context->stop_next = 1;
       context->dest_frame = -1;
@@ -384,15 +409,20 @@ process_line_event(VALUE trace_point, void *data)
     }
 
     breakpoint = breakpoint_find(breakpoints, path, lineno, trace_point);
-    if (not_user_code == 0 && (context->stop_next == 0 || context->stop_line == 0 || breakpoint != Qnil)) {
+    if (context->stop_next == 0 || context->stop_line == 0 || breakpoint != Qnil) {
       rb_ensure(start_inspector, context_object, stop_inspector, Qnil);
-      context->stop_reason = CTX_STOP_STEP;
-      if (breakpoint != Qnil) {
-        context->stop_reason = CTX_STOP_BREAKPOINT;
-        rb_funcall(context_object, idAtBreakpoint, 1, breakpoint);
+      if(context->stack_size <= context->init_stack_size && context->hit_user_code) {
+        context->script_finished = 1;
+      }
+      if(!context->script_finished) {
+        context->stop_reason = CTX_STOP_STEP;
+        if (breakpoint != Qnil) {
+          context->stop_reason = CTX_STOP_BREAKPOINT;
+          rb_funcall(context_object, idAtBreakpoint, 1, breakpoint);
+        }
+        reset_stepping_stop_points(context);
+        call_at_line(context, file, line, context_object);
       }
-      reset_stepping_stop_points(context);
-      call_at_line(context, file, line, context_object);
     }
   }
   cleanup(context);
@@ -648,6 +678,50 @@ Debase_enable_file_filtering(VALUE self, VALUE value)
   return value;
 }
 
+#if RUBY_API_VERSION_CODE >= 20500 && RUBY_API_VERSION_CODE < 20600 && !(RUBY_RELEASE_YEAR == 2017 && RUBY_RELEASE_MONTH == 10 && RUBY_RELEASE_DAY == 10)
+    static const rb_iseq_t *
+    my_iseqw_check(VALUE iseqw)
+    {
+        rb_iseq_t *iseq = DATA_PTR(iseqw);
+
+        if (!iseq->body) {
+            return NULL;
+        }
+
+        return iseq;
+    }
+
+    static void
+    Debase_set_trace_flag_to_iseq(VALUE self, VALUE rb_iseq) {
+        if (!SPECIAL_CONST_P(rb_iseq) && RBASIC_CLASS(rb_iseq) == rb_cISeq) {
+            rb_iseq_t *iseq = my_iseqw_check(rb_iseq);
+
+            if(iseq) {
+                rb_iseq_trace_set(iseq, RUBY_EVENT_TRACEPOINT_ALL);
+            }
+        }
+    }
+
+    static void
+    Debase_unset_trace_flags(VALUE self, VALUE rb_iseq) {
+        if (!SPECIAL_CONST_P(rb_iseq) && RBASIC_CLASS(rb_iseq) == rb_cISeq) {
+            rb_iseq_t *iseq = my_iseqw_check(rb_iseq);
+
+            if(iseq) {
+                rb_iseq_trace_set(iseq, RUBY_EVENT_NONE);
+            }
+        }
+    }
+#else
+      static void
+      Debase_set_trace_flag_to_iseq(VALUE self, VALUE rb_iseq) {
+      }
+
+      static void
+      Debase_unset_trace_flags(VALUE self, VALUE rb_iseq) {
+      }
+#endif
+
 static VALUE
 Debase_init_variables()
 {
@@ -691,6 +765,10 @@ Init_debase_internals()
   rb_define_module_function(mDebase, "enable_trace_points", Debase_enable_trace_points, 0);
   rb_define_module_function(mDebase, "prepare_context", Debase_prepare_context, 0);
   rb_define_module_function(mDebase, "init_variables", Debase_init_variables, 0);
+  rb_define_module_function(mDebase, "set_trace_flag_to_iseq", Debase_set_trace_flag_to_iseq, 1);
+
+  //use only for tests
+  rb_define_module_function(mDebase, "unset_iseq_flags", Debase_unset_trace_flags, 1);
 
   idAlive = rb_intern("alive?");
   idAtLine = rb_intern("at_line");

data/ext/debase_internals.h

@@ -1,8 +1,8 @@
 #ifndef DEBASE_INTERNALS
 #define DEBASE_INTERNALS
 
-#include <ruby.h>
-#include <ruby/debug.h>
+#include "ruby.h"
+#include "ruby/debug.h"
 
 typedef struct rb_trace_arg_struct rb_trace_point_t;
 
@@ -57,12 +57,12 @@ typedef struct debug_context {
   /* dest_frame uses calced_stack_size for stepping */
   int dest_frame;
   int calced_stack_size;
-  int init_stack_size;
-
-  char **init_stack_files;
 
   char *last_file;
   int last_line;
+  int init_stack_size;
+  int script_finished;
+  int hit_user_code;
 } debug_context_t;
 
 typedef struct

data/ext/extconf.rb

@@ -28,8 +28,13 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 require "debase/ruby_core_source"
 
 hdrs = proc {
-  have_header("vm_core.h")
-  have_header("version.h")
+  have_header("vm_core.h") and
+  have_header("iseq.h") and
+  have_header("version.h") and
+  have_header("vm_core.h") and
+  have_header("vm_insnhelper.h") and
+  have_header("vm_core.h") and
+  have_header("method.h")
 }
 
 # Allow use customization of compile options. For example, the

data/lib/debase.rb

@@ -20,7 +20,21 @@ module Debase
       Debugger.const_set('ARGV', ARGV.clone) unless defined? Debugger::ARGV
       Debugger.const_set('PROG_SCRIPT', $0) unless defined? Debugger::PROG_SCRIPT
       Debugger.const_set('INITIAL_DIR', Dir.pwd) unless  defined? Debugger::INITIAL_DIR
-      return Debugger.started? ? block && block.call(self) : Debugger.start_(&block) 
+
+      monkey_patch_prepend
+
+      Debugger.started? ? block && block.call(self) : Debugger.start_(&block)
+    end
+
+    def monkey_patch_prepend
+      class << RubyVM::InstructionSequence
+        def self.prepend(mod, *smth)
+          super
+          if mod.to_s.include?('Bootsnap') && RUBY_VERSION >= '2.5' && RUBY_VERSION < '2.6'
+            prepend InstructionSequenceMixin
+          end
+        end
+      end
     end
 
     # @param [String] file
@@ -81,6 +95,21 @@ module Debase
     def file_filter
       @file_filter ||= FileFilter.new
     end
+
+    module InstructionSequenceMixin
+      def load_iseq(path)
+        iseq = super(path)
+
+        do_set_flags(iseq)
+
+        iseq
+      end
+
+      def do_set_flags(iseq)
+        Debugger.set_trace_flag_to_iseq(iseq)
+        iseq.each_child { |child_iseq| do_set_flags(child_iseq) } if iseq.respond_to? :each_child
+      end
+    end
   end
 
   class FileFilter

data/lib/debase/version.rb

@@ -1,3 +1,3 @@
 module Debase
-  VERSION = "0.2.2" unless defined? VERSION
+  VERSION = "0.2.4.1" unless defined? VERSION
 end

data/test/example/bootsnap/a.rb

@@ -0,0 +1,5 @@
+class A
+  def foo(a)
+    puts a
+  end
+end

data/test/example/bootsnap/bootsnap.rb

@@ -0,0 +1,3 @@
+require_relative 'a.rb'
+
+A.new.foo('hi')

data/test/test_load.rb

@@ -3,6 +3,9 @@ require File.expand_path("helper", File.dirname(__FILE__))
 
 # Test of Debugger.debug_load in C extension ruby_debug.so
 class TestDebugLoad < Test::Unit::TestCase
+
+  self.test_order = :defined
+
   class << self
     def at_line(file, line)
       @@at_line = [File.basename(file), line]
@@ -41,4 +44,35 @@ class TestDebugLoad < Test::Unit::TestCase
   ensure
     Debugger.stop if Debugger.started?
   end
+
+  module MyBootsnap
+    def load_iseq(path)
+      iseq = RubyVM::InstructionSequence.compile_file(path)
+
+      Debugger.unset_iseq_flags(iseq)
+      iseq
+    end
+  end
+
+  def test_bootsnap
+    @@at_line = nil
+    src_dir = File.dirname(__FILE__)
+    prog_script = File.join(src_dir, 'example', 'bootsnap', 'bootsnap.rb')
+
+    class << RubyVM::InstructionSequence
+      prepend MyBootsnap
+    end
+    bt = Debugger.debug_load(prog_script, true)
+    assert_equal(nil, bt)
+    assert_not_nil(@@at_line)
+    if RUBY_VERSION >= '2.5' && RUBY_VERSION < '2.6'
+      assert_equal(['debase.rb', 101], @@at_line)
+    end
+
+    assert(Debugger.started?)
+    Debugger.stop
+
+    class << RubyVM::InstructionSequence; self end.class_eval { undef_method :load_iseq }
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debase
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4.1
 platform: ruby
 authors:
 - Dennis Ushakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -94,6 +94,8 @@ files:
 - test/example/a/example.rb
 - test/example/at-exit.rb
 - test/example/b/example.rb
+- test/example/bootsnap/a.rb
+- test/example/bootsnap/bootsnap.rb
 - test/example/bp_loop_issue.rb
 - test/example/breakpoints-basename.rb
 - test/example/brkpt-class-bug.rb
@@ -134,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: debase
-rubygems_version: 2.6.10
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: debase is a fast implementation of the standard Ruby debugger debug.rb for