debase 0.2.2 → 0.2.3.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9fb180b5086361e7572b01988d7b09a02cab4f3
-  data.tar.gz: ad2bed6b9d52476544c9d2bc9683c954ef7907ec
+  metadata.gz: 6d0b4ffcf1b88d08e500071b97bd7d2679119dd8
+  data.tar.gz: aea5553eb0fbac211cf081807605bf4226dfd08c
 SHA512:
-  metadata.gz: b4bbb5c1d47aa70a2cbda6428e5a8720d128a476a259b462db72b668090c0b75b34b84f5bd0daa16459a68e4a42126e29aafb465ab4cc35248d758d876f8c9d9
-  data.tar.gz: 287b789b0fb345c5db12a719c9839208aeb851741cb0d8a72319e460c547b002377b38807e43adacc49f530a8bb8db73570282ec7109961309d3b9bf4baf65e2
+  metadata.gz: 7e8c2f94ef8590ee3e94214f641434e5e9d67dc8eb8094830502666772a1896b8df22d9733e885213d6c28018eff2c524e680d12c906baeb7e47f68effdac90b
+  data.tar.gz: a562cc46f2128e1fe54a71052aed7451687c6a2d28a238a7ae7994e8cc2499e23de94c6c93d5fc00c53eb7a718128cd92b543582e7061d78f9e688a3aae1c03b

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,11 @@ 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->stack = NULL;
   context->thnum = ++thnum_current;

data/ext/debase_internals.c

@@ -323,7 +323,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,16 +337,6 @@ 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);
 
@@ -384,7 +373,7 @@ 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) {
@@ -648,6 +637,36 @@ Debase_enable_file_filtering(VALUE self, VALUE value)
   return value;
 }
 
+#if RUBY_API_VERSION_CODE >= 20500
+    static const rb_iseq_t *
+    my_iseqw_check(VALUE iseqw)
+    {
+        rb_iseq_t *iseq = DATA_PTR(iseqw);
+
+        if (!iseq->body) {
+            ibf_load_iseq_complete(iseq);
+        }
+
+        if (!iseq->body->location.label) {
+            rb_raise(rb_eTypeError, "uninitialized InstructionSequence");
+        }
+        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);
+            rb_iseq_trace_set(iseq, RUBY_EVENT_TRACEPOINT_ALL);
+        }
+    }
+#else
+      static void
+      Debase_set_trace_flag_to_iseq(VALUE self, VALUE rb_iseq) {
+      }
+#endif
+
 static VALUE
 Debase_init_variables()
 {
@@ -691,6 +710,7 @@ 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);
 
   idAlive = rb_intern("alive?");
   idAtLine = rb_intern("at_line");

data/ext/debase_internals.h

@@ -1,7 +1,12 @@
 #ifndef DEBASE_INTERNALS
 #define DEBASE_INTERNALS
 
-#include <ruby.h>
+#include "ruby.h"
+#include "vm_core.h"
+#include "version.h"
+#include "iseq.h"
+#include "vm_insnhelper.h"
+#include "method.h"
 #include <ruby/debug.h>
 
 typedef struct rb_trace_arg_struct rb_trace_point_t;
@@ -57,9 +62,6 @@ 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;

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'
+            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)}
+      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.3.beta2" unless defined? VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debase
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3.beta2
 platform: ruby
 authors:
 - Dennis Ushakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -130,9 +130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: debase
 rubygems_version: 2.6.10