byebug 1.1.0 → 1.1.1

data/ext/byebug/byebug.h

@@ -1,23 +1,19 @@
-#ifndef RUBY_DEBUG
-#define RUBY_DEBUG
+#ifndef BYEBUG
+#define BYEBUG
 
 #include <ruby.h>
 #include <ruby/debug.h>
 
 typedef struct rb_trace_arg_struct rb_trace_point_t;
 
-/* Byebug::Context */
-
 /* flags */
 #define CTX_FL_SUSPEND      (1<<1)
 #define CTX_FL_TRACING      (1<<2)
 #define CTX_FL_SKIPPED      (1<<3)
-#define CTX_FL_IGNORE       (1<<4)
-#define CTX_FL_DEAD         (1<<5)
-#define CTX_FL_WAS_RUNNING  (1<<6)
-#define CTX_FL_ENABLE_BKPT  (1<<7)
-#define CTX_FL_FORCE_MOVE   (1<<8)
-#define CTX_FL_CATCHING     (1<<9)
+#define CTX_FL_DEAD         (1<<4)
+#define CTX_FL_ENABLE_BKPT  (1<<5)
+#define CTX_FL_FORCE_MOVE   (1<<6)
+#define CTX_FL_CATCHING     (1<<7)
 
 /* macro functions */
 #define CTX_FL_TEST(c,f)  ((c)->flags & (f))
@@ -45,27 +41,21 @@ typedef struct debug_frame_t {
 typedef struct {
   debug_frame_t *stack;
   int stack_size;
-
-  VALUE thread;
-  int thnum;
   int flags;
-
   ctx_stop_reason stop_reason;
-  int stop_next;
   int dest_frame;
-  int stop_line;
-  int stop_frame;
-
+  int lines;                   /* # of lines in dest_frame before stopping */
+  int steps;                   /* # of steps before stopping */
+  int stop_frame;              /* frame number after which we must stop */
   char *last_file;
   int last_line;
 } debug_context_t;
 
 /* functions */
 extern VALUE Init_context(VALUE mByebug);
-extern VALUE Context_create(VALUE thread, VALUE cDebugThread);
+extern VALUE Context_create();
 extern VALUE Context_dup(debug_context_t *context);
 extern void reset_stepping_stop_points(debug_context_t *context);
-extern VALUE Context_ignored(VALUE self);
 
 extern void push_frame(debug_context_t *context, char* file, int lineno,
                        VALUE method_id, VALUE defined_class, VALUE binding,
@@ -77,16 +67,6 @@ extern void update_frame(debug_frame_t *context, char* file, int lineno,
                          VALUE method_id, VALUE defined_class, VALUE binding,
                          VALUE self);
 
-/* locked threads container */
-typedef struct locked_thread_t {
-  VALUE thread;
-  struct locked_thread_t *next;
-} locked_thread_t;
-
-extern int is_in_locked(VALUE thread_id);
-extern void add_to_locked(VALUE thread);
-extern VALUE remove_from_locked();
-
 /* utility functions */
 static inline int
 classname_cmp(VALUE name, VALUE klass)

data/ext/byebug/context.c

@@ -1,19 +1,6 @@
 #include <byebug.h>
 
 static VALUE cContext;
-static int thnum_current = 0;
-
-static VALUE
-id2ref(VALUE id)
-{
-    return id;
-}
-
-static VALUE
-context_thread_0(debug_context_t *context)
-{
-    return id2ref(context->thread);
-}
 
 /* "Step", "Next" and "Finish" do their work by saving information about where
  * to stop next. reset_stepping_stop_points removes/resets this information. */
@@ -21,15 +8,9 @@ extern void
 reset_stepping_stop_points(debug_context_t *context)
 {
   context->dest_frame = -1;
-  context->stop_line  = -1;
-  context->stop_next  = -1;
-}
-
-static inline VALUE
-Context_thnum(VALUE self) {
-  debug_context_t *context;
-  Data_Get_Struct(self, debug_context_t, context);
-  return INT2FIX(context->thnum);
+  context->lines      = -1;
+  context->steps      = -1;
+  context->stop_frame = -1;
 }
 
 static inline void
@@ -63,14 +44,6 @@ Context_stack_size(VALUE self)
   return INT2FIX(context->stack_size);
 }
 
-static inline VALUE
-Context_thread(VALUE self)
-{
-  debug_context_t *context;
-  Data_Get_Struct(self, debug_context_t, context);
-  return context->thread;
-}
-
 static inline VALUE
 Context_dead(VALUE self)
 {
@@ -79,16 +52,6 @@ Context_dead(VALUE self)
   return CTX_FL_TEST(context, CTX_FL_DEAD) ? Qtrue : Qfalse;
 }
 
-extern VALUE
-Context_ignored(VALUE self)
-{
-  debug_context_t *context;
-
-  if (self == Qnil) return Qtrue;
-  Data_Get_Struct(self, debug_context_t, context);
-  return CTX_FL_TEST(context, CTX_FL_IGNORE) ? Qtrue : Qfalse;
-}
-
 extern void
 push_frame(debug_context_t *context, char* file, int lineno, VALUE method_id,
            VALUE defined_class, VALUE binding, VALUE self)
@@ -115,7 +78,6 @@ Context_mark(debug_context_t *context)
 {
   debug_frame_t *frame;
 
-//rb_gc_mark(context->thread);
   frame = context->stack;
   while (frame != NULL) {
     rb_gc_mark(frame->self);
@@ -133,20 +95,17 @@ Context_free(debug_context_t *context) {
 }
 
 extern VALUE
-Context_create(VALUE thread, VALUE cDebugThread) {
+Context_create()
+{
   debug_context_t *context;
 
   context = ALLOC(debug_context_t);
   context->stack_size = 0;
   context->stack = NULL;
-  context->thnum = ++thnum_current;
-  context->thread = thread;
   context->flags = 0;
   context->last_file = NULL;
   context->last_line = -1;
-  context->stop_frame = -1;
   reset_stepping_stop_points(context);
-  if (rb_obj_class(thread) == cDebugThread) CTX_FL_SET(context, CTX_FL_IGNORE);
   return Data_Wrap_Struct(cContext, Context_mark, Context_free, context);
 }
 
@@ -169,10 +128,7 @@ Context_dup(debug_context_t *context)
 
     new_context = ALLOC(debug_context_t);
     memcpy(new_context, context, sizeof(debug_context_t));
-    new_context->dest_frame = -1;
-    new_context->stop_line = -1;
-    new_context->stop_frame = -1;
-    new_context->stop_next = -1;
+    reset_stepping_stop_points(new_context);
     new_context->stack_size = context->stack_size;
     CTX_FL_SET(new_context, CTX_FL_DEAD);
     new_context->stack = ALLOC(debug_frame_t);
@@ -364,44 +320,6 @@ Context_stop_reason(VALUE self)
   return ID2SYM(rb_intern(symbol));
 }
 
-static void
-context_suspend_0(debug_context_t *context)
-{
-    VALUE status;
-
-    status = rb_funcall(context_thread_0(context), rb_intern("status"), 0);
-    if (rb_str_cmp(status, rb_str_new2("run")) == 0)
-      CTX_FL_SET(context, CTX_FL_WAS_RUNNING);
-    else if(rb_str_cmp(status, rb_str_new2("sleep")) == 0)
-      CTX_FL_UNSET(context, CTX_FL_WAS_RUNNING);
-    else
-      return;
-    CTX_FL_SET(context, CTX_FL_SUSPEND);
-}
-
-static VALUE
-Context_suspend(VALUE self)
-{
-  debug_context_t *context;
-
-  Data_Get_Struct(self, debug_context_t, context);
-
-  if (CTX_FL_TEST(context, CTX_FL_SUSPEND))
-    rb_raise(rb_eRuntimeError, "Already suspended.");
-  context_suspend_0(context);
-
-  return Qnil;
-}
-
-static VALUE
-Context_is_suspended(VALUE self)
-{
-  debug_context_t *context;
-
-  Data_Get_Struct(self, debug_context_t, context);
-  return CTX_FL_TEST(context, CTX_FL_SUSPEND) ? Qtrue : Qfalse;
-}
-
 #if 0
 
 static VALUE
@@ -427,7 +345,7 @@ Context_jump(VALUE self, VALUE line, VALUE file)
 #endif
 
 static VALUE
-Context_stop_next(int argc, VALUE *argv, VALUE self)
+Context_step_into(int argc, VALUE *argv, VALUE self)
 {
   VALUE steps;
   VALUE force;
@@ -438,7 +356,8 @@ Context_stop_next(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eRuntimeError, "Steps argument can't be negative.");
 
   Data_Get_Struct(self, debug_context_t, context);
-  context->stop_next = FIX2INT(steps);
+  context->steps = FIX2INT(steps);
+
   if(RTEST(force))
       CTX_FL_SET(context, CTX_FL_FORCE_MOVE);
   else
@@ -458,7 +377,7 @@ Context_step_over(int argc, VALUE *argv, VALUE self)
     rb_raise(rb_eRuntimeError, "No frames collected.");
 
   rb_scan_args(argc, argv, "12", &lines, &frame, &force);
-  context->stop_line = FIX2INT(lines);
+  context->lines = FIX2INT(lines);
 
   if (FIX2INT(frame) < 0 && FIX2INT(frame) >= context->stack_size)
     rb_raise(rb_eRuntimeError, "Destination frame is out of range.");
@@ -473,13 +392,14 @@ Context_step_over(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-Context_stop_frame(VALUE self, VALUE frame)
+Context_step_out(VALUE self, VALUE frame)
 {
   debug_context_t *context;
 
   Data_Get_Struct(self, debug_context_t, context);
-  if(FIX2INT(frame) < 0 && FIX2INT(frame) >= context->stack_size)
+  if (FIX2INT(frame) < 0 && FIX2INT(frame) >= context->stack_size)
     rb_raise(rb_eRuntimeError, "Stop frame is out of range.");
+
   context->stop_frame = context->stack_size - FIX2INT(frame);
 
   return frame;
@@ -490,20 +410,15 @@ Context_stop_frame(VALUE self, VALUE frame)
  *
  *   == Summary
  *
- *   Byebug keeps a single instance of this class for each Ruby thread.
+ *   Byebug keeps a single instance of this class.
  */
 VALUE
 Init_context(VALUE mByebug)
 {
   cContext = rb_define_class_under(mByebug, "Context", rb_cObject);
   rb_define_method(cContext, "stack_size", Context_stack_size, 0);
-  rb_define_method(cContext, "thread", Context_thread, 0);
   rb_define_method(cContext, "dead?", Context_dead, 0);
-  rb_define_method(cContext, "ignored?", Context_ignored, 0);
-  rb_define_method(cContext, "thnum", Context_thnum, 0);
   rb_define_method(cContext, "stop_reason", Context_stop_reason, 0);
-  rb_define_method(cContext, "suspend", Context_suspend, 0);
-  rb_define_method(cContext, "suspended?", Context_is_suspended, 0);
   rb_define_method(cContext, "tracing", Context_tracing, 0);
   rb_define_method(cContext, "tracing=", Context_set_tracing, 1);
   rb_define_method(cContext, "frame_file", Context_frame_file, -1);
@@ -514,10 +429,9 @@ Init_context(VALUE mByebug)
   rb_define_method(cContext, "frame_class", Context_frame_class, -1);
   rb_define_method(cContext, "frame_args_info", Context_frame_args_info, -1);
   rb_define_method(cContext, "frame_locals", Context_frame_locals, -1);
-  rb_define_method(cContext, "stop_next=", Context_stop_next, -1);
-  rb_define_method(cContext, "step", Context_stop_next, -1);
+  rb_define_method(cContext, "step_into", Context_step_into, -1);
   rb_define_method(cContext, "step_over", Context_step_over, -1);
-  rb_define_method(cContext, "stop_frame=", Context_stop_frame, 1);
+  rb_define_method(cContext, "step_out", Context_step_out, 1);
 
   return cContext;
 }

data/ext/byebug/extconf.rb

@@ -10,12 +10,3 @@ $CFLAGS += ' -g3' if ENV['debug']
 
 dir_config("ruby")
 create_makefile("byebug")
-
-#if !Byebug::RubyCoreSource.create_makefile_with_core(hdrs, "ruby_debug")
-#  STDERR.print("Makefile creation failed\n")
-#  STDERR.print("*************************************************************\n\n")
-#  STDERR.print("  NOTE: If your headers were not found, try passing\n")
-#  STDERR.print("        --with-ruby-include=PATH_TO_HEADERS      \n\n")
-#  STDERR.print("*************************************************************\n\n")
-#  exit(1)
-#end

data/lib/byebug.rb

@@ -5,7 +5,6 @@ require_relative 'byebug/processor'
 require 'pp'
 require 'stringio'
 require 'socket'
-require 'thread'
 require 'linecache19'
 
 module Byebug
@@ -39,26 +38,6 @@ module Byebug
     # A string to look for in caller() to see if the call stack is truncated
     attr_accessor :start_sentinal
 
-    attr_reader :thread, :control_thread, :cmd_port, :ctrl_port
-
-    #
-    # Interrupts the current thread
-    #
-    def interrupt
-      current_context.interrupt
-    end
-
-    #
-    # Interrupts the last debugged thread
-    #
-    def interrupt_last
-      if context = last_context
-        return nil unless context.thread.alive?
-        context.interrupt
-      end
-      context
-    end
-
     def source_reload
       Object.send(:remove_const, "SCRIPT_LINES__") if
         Object.const_defined?("SCRIPT_LINES__")
@@ -98,7 +77,7 @@ module Byebug
     # Byebug.start(options) -> bool
     # Byebug.start(options) { ... } -> obj
     #
-    # If it's called without a block it returns +true+, unless byebug was
+    # If it's called without a block, it returns +true+ unless byebug was
     # already started.
     #
     # If a block is given, it starts byebug and yields block. After the block is
@@ -143,90 +122,6 @@ module Byebug
       return retval
     end
 
-    #
-    # Starts a remote byebug.
-    #
-    def start_remote(host = nil, port = PORT)
-      return if @thread
-
-      self.interface = nil
-      start
-
-      if port.kind_of?(Array)
-        cmd_port, ctrl_port = port
-      else
-        cmd_port, ctrl_port = port, port + 1
-      end
-
-      ctrl_port = start_control(host, ctrl_port)
-
-      yield if block_given?
-
-      mutex = Mutex.new
-      proceed = ConditionVariable.new
-
-      server = TCPServer.new(host, cmd_port)
-      @cmd_port = cmd_port = server.addr[1]
-      @thread = DebugThread.new do
-        while (session = server.accept)
-          self.interface = RemoteInterface.new(session)
-          if wait_connection
-            mutex.synchronize do
-              proceed.signal
-            end
-          end
-        end
-      end
-      if wait_connection
-        mutex.synchronize do
-          proceed.wait(mutex)
-        end
-      end
-    end
-    alias start_server start_remote
-
-    def start_control(host = nil, ctrl_port = PORT + 1) # :nodoc:
-      return @ctrl_port if defined?(@control_thread) && @control_thread
-      server = TCPServer.new(host, ctrl_port)
-      @ctrl_port = server.addr[1]
-      @control_thread = DebugThread.new do
-        while (session = server.accept)
-          interface = RemoteInterface.new(session)
-          processor = ControlCommandProcessor.new(interface)
-          processor.process_commands
-        end
-      end
-      @ctrl_port
-    end
-
-    #
-    # Connects to the remote byebug
-    #
-    def start_client(host = 'localhost', port = PORT)
-      require "socket"
-      interface = Byebug::LocalInterface.new
-      socket = TCPSocket.new(host, port)
-      puts "Connected."
-
-      catch(:exit) do
-        while (line = socket.gets)
-          case line
-          when /^PROMPT (.*)$/
-            input = interface.read_command($1)
-            throw :exit unless input
-            socket.puts input
-          when /^CONFIRM (.*)$/
-            input = interface.confirm($1)
-            throw :exit unless input
-            socket.puts input
-          else
-            print line
-          end
-        end
-      end
-      socket.close
-    end
-
     ##
     # Runs normal byebug initialization scripts.
     #
@@ -301,25 +196,16 @@ module Byebug
     def handle_post_mortem(exp)
       return if !exp || !exp.__debug_context ||
         exp.__debug_context.stack_size == 0
-      #Byebug.suspend
-      orig_tracing = Byebug.tracing?, Byebug.current_context.tracing
-      Byebug.tracing = Byebug.current_context.tracing = false
+      orig_tracing = Byebug.tracing?
+      Byebug.tracing = false
       Byebug.last_exception = exp
       handler.at_line(exp.__debug_context, exp.__debug_file, exp.__debug_line)
     ensure
-      Byebug.tracing, Byebug.current_context.tracing = orig_tracing
-      #Byebug.resume
+      Byebug.tracing = orig_tracing
     end
     private :handle_post_mortem
 
   end
-
-  class DebugThread # :nodoc:
-  end
-
-  class ThreadsTable # :nodoc:
-  end
-
 end
 
 class Exception
@@ -366,7 +252,7 @@ end
 module Kernel
 
   ##
-  # Enters byebug in the current thread after _steps_ line events occur.
+  # Enters byebug after _steps_ line events occur.
   #
   # Before entering byebug startup, the init script is read. Setting _steps_ to
   # 0 will cause a break in byebug's subroutine and not wait for a line event to
@@ -378,9 +264,9 @@ module Kernel
     Byebug.start
     Byebug.run_init_script(StringIO.new)
     if 0 == steps
-      Byebug.current_context.stop_frame = 0
+      Byebug.context.step_out
     else
-      Byebug.current_context.stop_next = steps
+      Byebug.context.step_into steps
     end
   end
   alias breakpoint byebug unless respond_to?(:breakpoint)
@@ -390,7 +276,7 @@ module Kernel
   #
   def binding_n(n = 0)
     Byebug.skip do
-      Byebug.current_context.frame_binding(n+1)
+      Byebug.context.frame_binding(n+1)
     end
   end
 end