debase 0.1.2 → 0.1.3.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6db61940f1aaef2f04f52469fa21fdf00513daea
-  data.tar.gz: 9d32ec37844e491ca6c84042b0c8cb18135cde40
+  metadata.gz: c12b5c66970a15c8070dc6ce49a074c549a85fad
+  data.tar.gz: b41b9cf71db312290e1f6470cbcc092fb9cfdd4f
 SHA512:
-  metadata.gz: 053810fcee3048a773d6fba24960288f08d4cec893c9aacc346368a36fe99f7cd3c487482e6e25e880f5ae09382e0371011213654a3903cf1c8cf0a6186977d1
-  data.tar.gz: e88dd24fcd59c59ecb22997f7478b090cfb7ef681ecf3b22c9189a8c2a8feda44417d2f68df75d55d9a866300a38ed209d39140a5615fc3c28e1bb2b8c382507
+  metadata.gz: 045c4f73b463635eae68dbc1119dd1658aa53740f6a1d7594745472654cdb37f77e494f697051a69eb9fa84cb282cd2b744063786dff0f0e7812030396c2a301
+  data.tar.gz: cf1cd09d4ad03af0a0ad1a84b6927e71db577636276cdd5595fd28747cf18325fa5a1735d8b92250e6cfd957860e521b8d0743de9ed6cbc5291044cdd9a5ed10

data/ext/context.c

@@ -133,9 +133,12 @@ Context_free(debug_context_t *context) {
 extern VALUE
 context_create(VALUE thread, VALUE cDebugThread) {
   debug_context_t *context;
+  VALUE locations;
 
   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 ? (int)RARRAY_LEN(locations) : 0;
   context->stack = NULL;
   context->thnum = ++thnum_current;
   context->thread = thread;
@@ -306,15 +309,15 @@ Context_step_over(int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "12", &lines, &frame, &force);
   context->stop_line = FIX2INT(lines);
   CTX_FL_UNSET(context, CTX_FL_STEPPED);
-  if(frame == Qnil)
+  if (frame == Qnil)
   {
-    context->dest_frame = context->stack_size;
+    context->dest_frame = context->calced_stack_size;
   }
   else
   {
-    if(FIX2INT(frame) < 0 && FIX2INT(frame) >= context->stack_size)
+    if (FIX2INT(frame) < 0 && FIX2INT(frame) >= context->calced_stack_size)
       rb_raise(rb_eRuntimeError, "Destination frame is out of range.");
-    context->dest_frame = context->stack_size - FIX2INT(frame);
+    context->dest_frame = context->calced_stack_size - FIX2INT(frame);
   }
   if(RTEST(force))
     CTX_FL_SET(context, CTX_FL_FORCE_MOVE);

data/ext/debase_internals.c

@@ -106,6 +106,21 @@ check_start_processing(debug_context_t *context, VALUE thread)
   return 1;
 }
 
+static inline const char*
+symbol2str(VALUE symbol)
+{
+  VALUE id;
+  static const char* nil_str= "nil";
+  if (symbol == Qnil) {
+    return nil_str;
+  }
+  id = SYM2ID(symbol);
+  if (symbol == Qnil) {
+    return nil_str;
+  }
+  return rb_id2name(id);
+}
+
 static inline void
 print_event(rb_trace_point_t *tp, debug_context_t *context)
 {  
@@ -120,9 +135,11 @@ print_event(rb_trace_point_t *tp, debug_context_t *context)
     line = rb_tracearg_lineno(tp);
     event = rb_tracearg_event(tp);
     mid = rb_tracearg_method_id(tp);
-    fprintf(stderr, "%s: file=%s, line=%d, mid=%s\n", rb_id2name(SYM2ID(event)), RSTRING_PTR(path), FIX2INT(line), rb_id2name(SYM2ID(mid)));
+    fprintf(stderr, "%s: file=%s, line=%d, mid=%s\n", symbol2str(event), RSTRING_PTR(path), FIX2INT(line), symbol2str(mid));
     locations = rb_funcall(context->thread, rb_intern("backtrace_locations"), 1, INT2FIX(1));
-    fprintf(stderr, "    stack_size=%d, thread=%d, real_stack_size=%d\n", context->stack_size, context->thnum, (int)RARRAY_LEN(locations));
+    fprintf(stderr, "    calced_stack_size=%d, stack_size=%d, thread=%d, real_stack_size=%d\n",
+            context->calced_stack_size, context->stack_size, context->thnum,
+            locations != Qnil ? (int)RARRAY_LEN(locations) : 0);
   }
 }
 
@@ -211,7 +228,7 @@ process_line_event(VALUE trace_point, void *data)
             strcmp(context->last_file, file) != 0;
   }
 
-  if(context->dest_frame == -1 || context->stack_size == context->dest_frame)
+  if (context->dest_frame == -1 || context->calced_stack_size == context->dest_frame)
   {
       if(moved || !CTX_FL_TEST(context, CTX_FL_FORCE_MOVE))
           context->stop_next--;
@@ -223,7 +240,7 @@ process_line_event(VALUE trace_point, void *data)
           CTX_FL_UNSET(context, CTX_FL_STEPPED);
       }
   }
-  else if(context->stack_size < context->dest_frame)
+  else if(context->calced_stack_size < context->dest_frame)
   {
       context->stop_next = 0;
   }
@@ -252,6 +269,7 @@ process_return_event(VALUE trace_point, void *data)
   Data_Get_Struct(context_object, debug_context_t, context);
   if (!check_start_processing(context, rb_thread_current())) return;
 
+  --context->calced_stack_size;
   update_stack_size(context);
   if(context->stack_size == context->stop_frame)
   {
@@ -274,6 +292,7 @@ process_call_event(VALUE trace_point, void *data)
   Data_Get_Struct(context_object, debug_context_t, context);
   if (!check_start_processing(context, rb_thread_current())) return;
 
+  ++context->calced_stack_size;
   update_stack_size(context);
   print_event(TRACE_POINT, context); 
   cleanup(context);
@@ -323,7 +342,7 @@ process_raise_event(VALUE trace_point, void *data)
 
 static VALUE
 Debase_setup_tracepoints(VALUE self)
-{	
+{
   if (catchpoints != Qnil) return Qnil;
   contexts = rb_hash_new();
   breakpoints = rb_ary_new();

data/ext/debase_internals.h

@@ -49,11 +49,14 @@ typedef struct debug_context {
   
   ctx_stop_reason stop_reason;
   int stop_next;
-  int dest_frame;
   int stop_line;
   int stop_frame;
   int thread_pause;
 
+  /* dest_frame uses calced_stack_size for stepping */
+  int dest_frame;
+  int calced_stack_size;
+
   char *last_file;
   int last_line;
 } debug_context_t;

data/lib/debase.rb

@@ -49,6 +49,24 @@ module Debase
     def add_catchpoint(exception)
       catchpoints[exception] = 0
     end
+
+    #call-seq:
+    #   Debase.skip { block } -> obj or nil
+    #
+    #The code inside of the block is escaped from the debugger.
+    def skip
+      #it looks like no-op is ok for this method for now
+      #no-op
+    end
+
+    #call-seq:
+    #   Debugger.last_interrupted -> context
+    #
+    #Returns last debugged context.
+    def last_context
+      # not sure why we need this so let's return nil for now ;)
+      nil
+    end
   end
   
   class DebugThread < Thread

data/lib/debase/version.rb

@@ -1,3 +1,3 @@
 module Debase
-  VERSION = "0.1.2" unless defined? VERSION
+  VERSION = "0.1.3.beta1" unless defined? VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debase
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3.beta1
 platform: ruby
 authors:
 - Dennis Ushakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -125,9 +125,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '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.2.2