debase 0.2.2.beta10 → 0.2.2.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 79fde9e93badfd98fb0fbe1f7f625d154dc9b4f4
-  data.tar.gz: 956c8b8bf4d1d2355440bbb98f76cd3df5ba256e
+SHA256:
+  metadata.gz: 23acd95b1eb4482fcd7e41b5dd392a47acdc2bf14a1980ca516ae29cb116668b
+  data.tar.gz: ca237b3670f35fe7f98af42a378d94f65f919a5db9eb3130566994b61b171688
 SHA512:
-  metadata.gz: be07ccaac91b1707899b07424dbf0a633c3c5ca4695d1cd424cbe17e4b65cbb826a12aee67e7a82d8d08f450a8a93d6b6c85c5a3502dd1b95932af9c76fc33e9
-  data.tar.gz: 91a164dee212080ebe56f434579a49ff07951a41633eb80cd3e83ba2d6144d83a0b117f6dcf76926a70e6825ce63c0cfab8cef689330f421e44c29eb09aa0395
+  metadata.gz: f86e56b22ec68c0a515ed6fc0040a8f5b7e32779149ce7a54d51c3aa51d374ceaf6af1953465663e807df2241f7bf4619328d6cf9ea8a72b0868e72c55ec7389
+  data.tar.gz: 5e674cb7237a4100f0b6b22dbe5f21a302e49b62060810f4c0b5651840933f4e3f04af9c36d1d39db86c9ba767f22bb99ffa48e3ad78eaef962df2fb646f82f7

data/README.md

@@ -1,9 +1,11 @@
 [gem]: https://rubygems.org/gems/debase
 [travis]: https://travis-ci.org/denofevil/debase
+[jb_badges]: https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub
 
 # debase
 [![Gem Version](https://badge.fury.io/rb/debase.png)][gem]
 [![Build Status](https://secure.travis-ci.org/denofevil/debase.png)][travis]
+[![official JetBrains project](http://jb.gg/badges/official.svg)][jb_badges]
 
 ## Overview
 

data/debase.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.extensions = ["ext/extconf.rb", "ext/attach/extconf.rb"]
 
-  s.add_dependency "debase-ruby_core_source"
+  s.add_dependency "debase-ruby_core_source", ">= 0.9.11"
   s.add_development_dependency "test-unit"
   s.add_development_dependency "rake"
 end

data/ext/attach/attach.c

@@ -1,15 +1,26 @@
 #include "attach.h"
 
+#ifndef __GNUC__
+#define __asm__ asm
+#endif
+
 /*
 We need to prevent compiler from optimizing this function calls. For more details
 see "noinline" section here: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html
 */
 static void
-__attribute__ ((noinline))
+#if defined(_MSC_VER)
+__declspec(noinline)
 __func_to_set_breakpoint_at()
 {
-    asm("");
 }
+#else
+__attribute__((noinline))
+__func_to_set_breakpoint_at()
+{
+    __asm__("");
+}
+#endif
 
 static void
 __catch_line_event(rb_event_flag_t evflag, VALUE data, VALUE self, ID mid, VALUE klass)
@@ -48,4 +59,4 @@ Init_attach()
   gdb/lldb. So no initialization here, you should directly
   call functions above.
   */
-}
+}

data/ext/context.c

@@ -46,18 +46,26 @@ fill_stack(debug_context_t *context, const rb_debug_inspector_t *inspector) {
 
   locations = rb_debug_inspector_backtrace_locations(inspector);
   stack_size = locations == Qnil ? 0 : RARRAY_LENINT(locations);
-  context->stack_size = stack_size;
-
+  context->stack_size = 0;
+  
   for (i = 0; i < stack_size; i++) {
-    frame = ALLOC(debug_frame_t);
+    
     location = rb_ary_entry(locations, i);
-    path = rb_funcall(location, rb_intern("path"), 0);
-    lineno = rb_funcall(location, rb_intern("lineno"), 0);
-    file = path != Qnil ? RSTRING_PTR(path) : "";
-    line = FIX2INT(lineno);
-    fill_frame(frame, file, line, rb_debug_inspector_frame_binding_get(inspector, i), rb_debug_inspector_frame_self_get(inspector, i));
-    frame->prev = context->stack;
-    context->stack = frame;
+    VALUE iseq = rb_debug_inspector_frame_iseq_get(inspector, i);
+      
+    if(iseq != Qnil)
+    {
+      frame = ALLOC(debug_frame_t);
+      path = rb_funcall(location, rb_intern("path"), 0);
+      lineno = rb_funcall(location, rb_intern("lineno"), 0);
+      file = path != Qnil ? RSTRING_PTR(path) : "";
+      line = FIX2INT(lineno);
+      
+      fill_frame(frame, file, line, rb_debug_inspector_frame_binding_get(inspector, i), rb_debug_inspector_frame_self_get(inspector, i));
+      frame->prev = context->stack;
+      context->stack = frame;
+      context->stack_size++;
+    }
   }
 }
 
@@ -127,6 +135,7 @@ Context_mark(debug_context_t *context)
 
 static void
 Context_free(debug_context_t *context) {
+  xfree(context->init_stack_files);
   xfree(context);
 }
 
@@ -134,11 +143,26 @@ 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->calced_stack_size = locations != Qnil ? RARRAY_LENINT(locations) : 0;
+  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->stack = NULL;
   context->thnum = ++thnum_current;
   context->thread = thread;
@@ -289,7 +313,10 @@ Context_stop_next(int argc, VALUE *argv, VALUE self)
   if(FIX2INT(steps) < 0) rb_raise(rb_eRuntimeError, "Steps argument can't be negative.");
 
   Data_Get_Struct(self, debug_context_t, context);
+  
   context->stop_next = FIX2INT(steps);
+  
+  
   if(RTEST(force))
       CTX_FL_SET(context, CTX_FL_FORCE_MOVE);
   else
@@ -305,6 +332,7 @@ Context_step_over(int argc, VALUE *argv, VALUE self)
   debug_context_t *context;
 
   Data_Get_Struct(self, debug_context_t, context);
+
   if(context->stack_size == 0)
     rb_raise(rb_eRuntimeError, "No frames collected.");
 
@@ -335,6 +363,7 @@ Context_stop_frame(VALUE self, VALUE frame)
   debug_context_t *debug_context;
 
   Data_Get_Struct(self, debug_context_t, debug_context);
+  
   if(FIX2INT(frame) < 0 && FIX2INT(frame) >= debug_context->calced_stack_size)
     rb_raise(rb_eRuntimeError, "Stop frame is out of range.");
   /* we decrease stack size by frame and 1 because we use stop_frame after

data/ext/debase_internals.c

@@ -37,7 +37,7 @@ print_debug(const char *message, ...)
   va_end(ap);
 }
 
-inline int
+static inline int
 check_stop_frame(debug_context_t *context) {
   return context->calced_stack_size == context->stop_frame && context->calced_stack_size >= 0;
 }
@@ -323,6 +323,7 @@ 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);
@@ -332,10 +333,21 @@ process_line_event(VALUE trace_point, void *data)
   path = rb_tracearg_path(tp);
 
   if (is_path_accepted(path)) {
+
     lineno = rb_tracearg_lineno(tp);
     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);
 
@@ -372,7 +384,7 @@ process_line_event(VALUE trace_point, void *data)
     }
 
     breakpoint = breakpoint_find(breakpoints, path, lineno, trace_point);
-    if (context->stop_next == 0 || context->stop_line == 0 || breakpoint != Qnil) {
+    if (not_user_code == 0 && (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) {

data/ext/debase_internals.h

@@ -57,6 +57,9 @@ 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

@@ -29,6 +29,7 @@ require "debase/ruby_core_source"
 
 hdrs = proc {
   have_header("vm_core.h")
+  have_header("version.h")
 }
 
 # Allow use customization of compile options. For example, the

data/ext/hacks.h

@@ -1,7 +1,14 @@
 #include <vm_core.h>
+#include <version.h>
 
 #define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
 
+#if RUBY_API_VERSION_CODE >= 20500
+  #define TH_CFP(thread) ((rb_control_frame_t *)(thread)->ec.cfp)
+#else
+  #define TH_CFP(thread) ((rb_control_frame_t *)(thread)->cfp)
+#endif
+
 extern void
 update_stack_size(debug_context_t *context) 
 {
@@ -9,7 +16,7 @@ update_stack_size(debug_context_t *context)
 
   thread = ruby_current_thread;
   /* see backtrace_each in vm_backtrace.c */
-  context->stack_size = (int)(RUBY_VM_END_CONTROL_FRAME(thread) - thread->cfp - 1);
+  context->stack_size = (int)(RUBY_VM_END_CONTROL_FRAME(thread) - TH_CFP(thread) - 1);
   if (CTX_FL_TEST(context, CTX_FL_UPDATE_STACK)) {
     context->calced_stack_size = context->stack_size;
     CTX_FL_UNSET(context, CTX_FL_UPDATE_STACK);

data/lib/debase/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debase
 version: !ruby/object:Gem::Version
-  version: 0.2.2.beta10
+  version: 0.2.2.beta11
 platform: ruby
 authors:
 - Dennis Ushakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -135,33 +135,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: debase
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: debase is a fast implementation of the standard Ruby debugger debug.rb for
   Ruby 2.0
-test_files:
-- test/example/a/example.rb
-- test/example/at-exit.rb
-- test/example/b/example.rb
-- test/example/bp_loop_issue.rb
-- test/example/breakpoints-basename.rb
-- test/example/brkpt-class-bug.rb
-- test/example/classes.rb
-- test/example/dollar-0.rb
-- test/example/except-bug1.rb
-- test/example/file with space.rb
-- test/example/gcd.rb
-- test/example/info-var-bug.rb
-- test/example/info-var-bug2.rb
-- test/example/null.rb
-- test/example/output.rb
-- test/example/pm-bug.rb
-- test/example/pm.rb
-- test/example/raise.rb
-- test/helper.rb
-- test/test_base.rb
-- test/test_breakpoints.rb
-- test/test_catchpoint.rb
-- test/test_load.rb
-- test/test_reload_bug.rb
+test_files: []