ruby-debug-base19 0.11.22 → 0.11.23

data/ext/ruby_debug/ruby_debug.c

@@ -392,6 +392,7 @@ debug_context_create(VALUE thread)
     debug_context->jump_pc = NULL;
     debug_context->jump_cfp = NULL;
     debug_context->old_iseq_catch = NULL;
+    debug_context->thread_pause = 0;
     if(rb_obj_class(thread) == cDebugThread)
         CTX_FL_SET(debug_context, CTX_FL_IGNORE);
     return Data_Wrap_Struct(cContext, debug_context_mark, debug_context_free, debug_context);
@@ -800,16 +801,27 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
         debug_context->stack_size--;
     }
 
-    /* ignore a skipped section of code */
-    if(CTX_FL_TEST(debug_context, CTX_FL_SKIPPED)) goto cleanup;
-
-    if ((event == RUBY_EVENT_LINE) && (debug_context->stack_size > 0) && 
-        (get_top_frame(debug_context)->line == line) && (get_top_frame(debug_context)->info.runtime.cfp->iseq == iseq) &&
-        !CTX_FL_TEST(debug_context, CTX_FL_CATCHING))
+    if (debug_context->thread_pause) 
     {
-        /* Sometimes duplicate RUBY_EVENT_LINE messages get generated by the compiler.
-         * Ignore them. */
-        goto cleanup;
+        debug_context->thread_pause = 0;
+        debug_context->stop_next = 1;
+        debug_context->dest_frame = -1;
+        moved = 1;
+    }
+    else
+    {
+        /* ignore a skipped section of code */
+        if (CTX_FL_TEST(debug_context, CTX_FL_SKIPPED)) 
+            goto cleanup;
+
+        if ((event == RUBY_EVENT_LINE) && (debug_context->stack_size > 0) && 
+            (get_top_frame(debug_context)->line == line) && (get_top_frame(debug_context)->info.runtime.cfp->iseq == iseq) &&
+            !CTX_FL_TEST(debug_context, CTX_FL_CATCHING))
+        {
+            /* Sometimes duplicate RUBY_EVENT_LINE messages get generated by the compiler.
+             * Ignore them. */
+            goto cleanup;
+        }
     }
 
     if(debug == Qtrue)
@@ -892,7 +904,7 @@ debug_event_hook(rb_event_flag_t event, VALUE data, VALUE self, ID mid, VALUE kl
             (breakpoint = check_breakpoints_by_pos(debug_context, file, line)) != Qnil)
         {
             call_at_line_check(self, debug_context, breakpoint, context, file, line);
-        }
+        } 
         break;
     }
     case RUBY_EVENT_CALL:
@@ -1794,7 +1806,7 @@ context_frame_line(int argc, VALUE *argv, VALUE self)
 
     pc = GET_FRAME->info.runtime.last_pc;
     cfp = GET_FRAME->info.runtime.cfp;
-    while (cfp > th->cfp)
+    while (cfp >= th->cfp)
     {
         if ((cfp->iseq != NULL) && (pc >= cfp->iseq->iseq_encoded) && (pc < cfp->iseq->iseq_encoded + cfp->iseq->iseq_size))
             return(INT2FIX(rb_vm_get_sourceline(cfp)));
@@ -2307,7 +2319,7 @@ FUNC_FASTCALL(do_jump)(rb_thread_t *th, rb_control_frame_t *cfp)
     cfp->pc[-1] = debug_context->saved_jump_ins[1];
 
     if ((debug_context->jump_pc < debug_context->jump_cfp->iseq->iseq_encoded) || 
-        (debug_context->jump_pc >= debug_context->jump_cfp->iseq->iseq_encoded + cfp->iseq->iseq_size))
+        (debug_context->jump_pc >= debug_context->jump_cfp->iseq->iseq_encoded + debug_context->jump_cfp->iseq->iseq_size))
         rb_raise(rb_eRuntimeError, "Invalid jump PC target");
 
     jump_cfp = debug_context->jump_cfp;
@@ -2431,6 +2443,31 @@ context_jump(VALUE self, VALUE line, VALUE file)
     return(INT2FIX(3)); /* couldn't find a line and file frame match */
 }
 
+/*
+ *   call-seq:
+ *      context.break -> bool
+ *
+ *   Returns +true+ if context is currently running and set flag to break it at next line
+ */
+static VALUE
+context_pause(VALUE self)
+{
+    debug_context_t *debug_context;
+    rb_thread_t *th;
+
+    debug_check_started();
+
+    Data_Get_Struct(self, debug_context_t, debug_context);
+    if (CTX_FL_TEST(debug_context, CTX_FL_DEAD))
+        return(Qfalse);
+
+    GetThreadPtr(context_thread_0(debug_context), th);
+    if (th == GET_THREAD())
+        return(Qfalse);
+
+    debug_context->thread_pause = 1;
+    return(Qtrue);
+}
 
 /*
  *   Document-class: Context
@@ -2473,6 +2510,7 @@ Init_context()
     rb_define_method(cContext, "set_breakpoint", 
              context_set_breakpoint, -1); /* in breakpoint.c */
     rb_define_method(cContext, "jump", context_jump, 2);
+    rb_define_method(cContext, "pause", context_pause, 0);
 }
 
 /*

data/ext/ruby_debug/ruby_debug.h

@@ -78,6 +78,7 @@ typedef struct {
     rb_control_frame_t *jump_cfp;
     VALUE *jump_pc;
     iseq_catch_t *old_iseq_catch;
+    volatile int thread_pause;
 } debug_context_t;
 
 /* variables in ruby_debug.c */

data/lib/ruby-debug-base.rb

@@ -47,7 +47,8 @@ module Debugger
     end
 
     def at_tracing(file, line)
-      handler.at_tracing(self, file, line)
+      @tracing_started = true if File.identical?(file, File.join(Debugger::INITIAL_DIR, Debugger::PROG_SCRIPT))
+      handler.at_tracing(self, file, line) if @tracing_started
     end
 
     def at_line(file, line)
@@ -60,6 +61,7 @@ module Debugger
   end
   
   @reload_source_on_change = false
+  @tracing_started = false
   
   class << self
     # interface modules provide +handler+ object

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-debug-base19
 version: !ruby/object:Gem::Version 
-  version: 0.11.22
+  version: 0.11.23
 platform: ruby
 authors: 
 - Kent Sibilev