ruby-debug 0.6.1-mswin32 → 0.6.2-mswin32

data/AUTHORS

@@ -0,0 +1,6 @@
+Author and maintainer:
+Kent Sibilev
+
+Contributers:
+Markus Barchfeld
+R. Bernstein

data/CHANGES

@@ -1,3 +1,8 @@
+0.6.2
+- Added thread lookup cache.
+- Control thread is always started by rdebug script.
+- Ability to specify negative frame number to frame commands. Patch from R. Bernstein.
+
 0.6.1
 - Another performance optimization.
 

data/Rakefile

@@ -12,6 +12,7 @@ FILES = FileList[
   'README',
   'LICENSE',
   'CHANGES',
+  'AUTHORS',
   'lib/**/*',
   'ext/*',
   'doc/*',

data/bin/rdebug

@@ -27,14 +27,15 @@ EOB
   opts.separator ""
   opts.separator "Options:"
   opts.on("-s", "--server", "Listen for remote connections") {options.server = true}
+  opts.on("-w", "--wait", "Wait for a client connection, implies -s option") {options.wait = true}
   opts.on("-c", "--client", "Connect to remote debugger") {options.client = true}
   opts.on("-h", "--host HOST", "Host name used for remote debugging") {|options.host|}
-  opts.on("-w", "--wait", "Wait for a client connection, implies -s option") {options.wait = true}
+  opts.on("-p", "--port PORT", Integer, "Port used for remote debugging") {|options.port|}
+  opts.on("--cport PORT", Integer, "Port used for contol commands, implies -s option") {|options.port|}
   opts.on("-x", "--trace", "turn on line tracing") {options.tracing = true}
   opts.on("-n", "--nostop", "Do not stop when stript is loaded") {options.nostop = true}
   opts.on("-f", "--keep-frame-info", "Keep frame info") {options.frame_info = true}
   opts.on("-m", "--post-mortem", "Activate post-mortem mode") {options.post_mortem = true}
-  opts.on("-p", "--port PORT", Integer, "Port used for remote debugging") {|options.port|}
   opts.on("-I", "--include PATH", String, "Add PATH to $LOAD_PATH") do |path|
     $LOAD_PATH.unshift(path)
   end
@@ -44,7 +45,6 @@ EOB
       exit
     end
   end
-  opts.on("--cport PORT", Integer, "Port used for contol commands, implies -s option") {|options.port|}
   opts.separator ""
   opts.separator "Common options:"
   opts.on_tail("--help", "Show this message") do
@@ -82,26 +82,43 @@ else
     exit(-1)
   end
 
+  # save script name
   Debugger::PROG_SCRIPT = ARGV.shift
+  
+  # install interruption handler
   trap('INT') { Debugger.interrupt_last }
+  
+  # set options
   Debugger.stop_on_connect = !options.nostop
   Debugger.wait_connection = options.wait
   Debugger.keep_frame_info = options.frame_info
+  
+  # load user script
   load "#{ENV["HOME"]}/.rdebugrc" if File.exists?("#{ENV["HOME"]}/.rdebugrc")
+  
   if options.server
+    # start remote mode
     Debugger.start_remote(options.host, [options.port, options.cport], options.post_mortem)
+    # load script
     Debugger.debug_load Debugger::PROG_SCRIPT
   else
+    # activate debugger
     Debugger.start
+    # start control thread
+    Debugger.start_control(options.host, options.cport)
+    
+    # run startup script if specified
     if options.script
       Debugger.run_script(options.script)
     end
+    # activate post-mortem
     Debugger.post_mortem if options.post_mortem
     if options.tracing
       Debugger.tracing = true
     else
       debugger 2 unless options.nostop
     end
+    # load script
     Debugger.debug_load Debugger::PROG_SCRIPT
   end
 end

data/ext/ruby_debug.c

@@ -4,7 +4,7 @@
 #include <rubysig.h>
 #include <st.h>
 
-#define DEBUG_VERSION "0.6.1"
+#define DEBUG_VERSION "0.6.2"
 
 #define CTX_FL_MOVED        (1<<1)
 #define CTX_FL_SUSPEND      (1<<2)
@@ -26,6 +26,13 @@
 #define min(x,y) ((x) < (y) ? (x) : (y))
 #endif
 
+typedef struct {
+    ID id;
+    VALUE binding;
+    int line;
+    const char * file;
+} debug_frame_t;
+
 typedef struct {
     int thnum;
     int flags;
@@ -35,17 +42,11 @@ typedef struct {
     int stop_frame;
     unsigned long thread_id;
     VALUE frames;
+    debug_frame_t *top_frame;
     const char * last_file;
     int last_line;
 } debug_context_t;
 
-typedef struct {
-    ID id;
-    VALUE binding;
-    int line;
-    const char * file;
-} debug_frame_t;
-
 enum bp_type {BP_POS_TYPE, BP_METHOD_TYPE};
 
 typedef struct {
@@ -72,6 +73,10 @@ static VALUE locker          = Qnil;
 static VALUE post_mortem     = Qfalse;
 static VALUE keep_frame_info = Qfalse;
 
+static VALUE last_context = Qnil;
+static VALUE last_thread  = Qnil;
+static debug_context_t *last_debug_context = NULL;
+
 static VALUE mDebugger;
 static VALUE cThreadsTable;
 static VALUE cContext;
@@ -86,8 +91,6 @@ static ID idAtCatchpoint;
 static ID idAtTracing;
 static ID idEval;
 static ID idList;
-static ID idClear;
-static ID idIndex;
 
 static int start_count = 0;
 static int thnum_max = 0;
@@ -130,7 +133,7 @@ id2ref_unprotected(VALUE id)
     static id2ref_func_t f_id2ref = NULL;
     if(f_id2ref == NULL)
     {
-        f_id2ref = ruby_method_ptr(rb_mObjectSpace, rb_intern("_id2ref"));
+        f_id2ref = (id2ref_func_t)ruby_method_ptr(rb_mObjectSpace, rb_intern("_id2ref"));
     }
     return f_id2ref(rb_mObjectSpace, id);
 }
@@ -204,25 +207,6 @@ remove_from_locked()
     return thread;
 }
 
-static int
-thread_hash(unsigned long thread_id)
-{
-    return (int)thread_id;
-}
-
-static int
-thread_cmp(VALUE a, VALUE b)
-{
-    if(a == b) return 0;
-    if(a < b) return -1;
-    return 1;
-}
-
-static struct st_hash_type st_thread_hash = {
-    thread_cmp,
-    thread_hash
-};
-
 static int
 threads_table_mark_keyvalue(VALUE key, VALUE value, int dummy)
 {
@@ -251,7 +235,7 @@ threads_table_create()
     threads_table_t *threads_table;
     
     threads_table = ALLOC(threads_table_t);
-    threads_table->tbl = st_init_table(&st_thread_hash);
+    threads_table->tbl = st_init_numtable();
     return Data_Wrap_Struct(cThreadsTable, threads_table_mark, threads_table_free, threads_table);
 }
 
@@ -273,12 +257,13 @@ threads_table_clear(VALUE table)
 static VALUE
 is_thread_alive(VALUE thread)
 {
-    static ID id_alive = 0;
-    if(!id_alive)
+    typedef VALUE (*thread_alive_func_t)(VALUE);
+    static thread_alive_func_t f_thread_alive = NULL;
+    if(!f_thread_alive)
     {
-        id_alive = rb_intern("alive?");
+        f_thread_alive = (thread_alive_func_t)ruby_method_ptr(rb_cThread, rb_intern("alive?"));
     }
-    return rb_funcall(thread, id_alive, 0);
+    return f_thread_alive(thread);
 }
 
 static int
@@ -353,27 +338,43 @@ debug_context_create(VALUE thread)
     debug_context->stop_line = -1;
     debug_context->stop_frame = -1;
     debug_context->frames = rb_ary_new();
+    debug_context->top_frame = NULL;
     debug_context->thread_id = ref2id(thread);
     result = Data_Wrap_Struct(cContext, debug_context_mark, xfree, debug_context);
     return result;
 }
 
-static VALUE
-thread_context_lookup(VALUE thread)
+static void
+thread_context_lookup(VALUE thread, VALUE *context, debug_context_t **debug_context)
 {
-    VALUE context;
     threads_table_t *threads_table;
-    unsigned long thread_id = ref2id(thread);
+    unsigned long thread_id;
+    debug_context_t *l_debug_context;
 
     debug_check_started();
 
+    if(last_thread == thread && last_context != Qnil)
+    {
+        *context = last_context;
+        if(debug_context)
+            *debug_context = last_debug_context;
+        return;
+    }
+    thread_id = ref2id(thread);
     Data_Get_Struct(threads_tbl, threads_table_t, threads_table);
-    if(!st_lookup(threads_table->tbl, thread_id, &context))
+    if(!st_lookup(threads_table->tbl, thread_id, context))
     {
-        context = debug_context_create(thread);
-        st_insert(threads_table->tbl, thread_id, context);
+        *context = debug_context_create(thread);
+        st_insert(threads_table->tbl, thread_id, *context);
     }
-    return context;
+    
+    Data_Get_Struct(*context, debug_context_t, l_debug_context);
+    if(debug_context)
+        *debug_context = l_debug_context;
+
+    last_thread = thread;
+    last_context = *context;
+    last_debug_context = l_debug_context;
 }
 
 static void
@@ -383,22 +384,6 @@ debug_frame_mark(void *data)
     rb_gc_mark(debug_frame->binding);
 }
 
-static VALUE
-debug_frame_create(char *file, int line, VALUE binding, ID id)
-{
-    VALUE result;
-    debug_frame_t *debug_frame;
-    
-    debug_frame = ALLOC(debug_frame_t);
-    debug_frame->file = file;
-    debug_frame->line = line;
-    debug_frame->binding = binding;
-    debug_frame->id = id;
-    result = Data_Wrap_Struct(cFrame, debug_frame_mark, xfree, debug_frame);
-    
-    return result;
-}
-
 static VALUE
 call_at_line_unprotected(VALUE args)
 {
@@ -423,9 +408,17 @@ static void
 save_call_frame(VALUE self, char *file, int line, ID mid, debug_context_t *debug_context)
 {
     VALUE frame, binding;
+    debug_frame_t *debug_frame;
     
     binding = self && RTEST(keep_frame_info)? create_binding(self) : Qnil;
-    frame = debug_frame_create(file, line, binding, mid);
+    debug_frame = ALLOC(debug_frame_t);
+    debug_frame->file = file;
+    debug_frame->line = line;
+    debug_frame->binding = binding;
+    debug_frame->id = mid;
+    frame = Data_Wrap_Struct(cFrame, debug_frame_mark, xfree, debug_frame);
+    
+    debug_context->top_frame = debug_frame;
     rb_ary_push(debug_context->frames, frame);
 }
 
@@ -570,9 +563,16 @@ get_top_frame(debug_context_t *debug_context)
     debug_frame_t *debug_frame;
     if(RARRAY(debug_context->frames)->len == 0)
         return NULL;
-    else {
-        frame = RARRAY(debug_context->frames)->ptr[RARRAY(debug_context->frames)->len-1];
-        Data_Get_Struct(frame, debug_frame_t, debug_frame);
+    else 
+    {
+        if(debug_context->top_frame == NULL)
+        {
+            frame = RARRAY(debug_context->frames)->ptr[RARRAY(debug_context->frames)->len-1];
+            Data_Get_Struct(frame, debug_frame_t, debug_frame);
+            debug_context->top_frame = debug_frame;
+        }
+        else
+            debug_frame = debug_context->top_frame;
         return debug_frame;
     }
 }
@@ -626,8 +626,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
     if(!node) return;
     
     thread = rb_thread_current();
-    context = thread_context_lookup(thread);
-    Data_Get_Struct(context, debug_context_t, debug_context);
+    thread_context_lookup(thread, &context, &debug_context);
     
     /* return if thread is marked as 'ignored'.
        debugger's threads are marked this way
@@ -753,6 +752,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
             debug_context->stop_frame = 0;
         }
         rb_ary_pop(debug_context->frames);
+        debug_context->top_frame = NULL;
         break;
     }
     case RUBY_EVENT_CLASS:
@@ -811,7 +811,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
     cleanup:
     
     /* check that all contexts point to alive threads */
-    if(hook_count - last_check > 1000)
+    if(hook_count - last_check > 3000)
     {
         check_thread_contexts();
         last_check = hook_count;
@@ -1077,8 +1077,24 @@ debug_current_context(VALUE self)
     debug_check_started();
 
     thread = rb_thread_current();
-    context = thread_context_lookup(thread);
+    thread_context_lookup(thread, &context, NULL);
+
+    return context;
+}
 
+/*
+ *   call-seq:
+ *      Debugger.thread_context(thread) -> context
+ *   
+ *   Returns context of the thread passed as an argument. 
+ */
+static VALUE
+debug_thread_context(VALUE self, VALUE thread)
+{
+    VALUE context;
+    
+    debug_check_started();
+    thread_context_lookup(thread, &context, NULL);
     return context;
 }
 
@@ -1105,7 +1121,7 @@ debug_contexts(VALUE self)
     for(i = 0; i < RARRAY(list)->len; i++)
     {
         thread = rb_ary_entry(list, i);
-        context = thread_context_lookup(thread);
+        thread_context_lookup(thread, &context, NULL);
         rb_ary_push(new_list, context);
     }
     threads_table_clear(threads_tbl);
@@ -1140,7 +1156,7 @@ debug_suspend(VALUE self)
     saved_crit = rb_thread_critical;
     rb_thread_critical = Qtrue;
     context_list = debug_contexts(self);
-    current = thread_context_lookup(rb_thread_current());
+    thread_context_lookup(rb_thread_current(), &current, NULL);
 
     for(i = 0; i < RARRAY(context_list)->len; i++)
     {
@@ -1179,7 +1195,7 @@ debug_resume(VALUE self)
     rb_thread_critical = Qtrue;
     context_list = debug_contexts(self);
 
-    current = thread_context_lookup(rb_thread_current());
+    thread_context_lookup(rb_thread_current(), &current, NULL);
     for(i = 0; i < RARRAY(context_list)->len; i++)
     {
         context = rb_ary_entry(context_list, i);
@@ -1823,6 +1839,7 @@ Init_ruby_debug()
     rb_define_module_function(mDebugger, "last_context", debug_last_interrupted, 0);
     rb_define_module_function(mDebugger, "contexts", debug_contexts, 0);
     rb_define_module_function(mDebugger, "current_context", debug_current_context, 0);
+    rb_define_module_function(mDebugger, "thread_context", debug_thread_context, 1);
     rb_define_module_function(mDebugger, "suspend", debug_suspend, 0);
     rb_define_module_function(mDebugger, "resume", debug_resume, 0);
     rb_define_module_function(mDebugger, "tracing", debug_tracing, 0);
@@ -1847,8 +1864,6 @@ Init_ruby_debug()
     idAtTracing    = rb_intern("at_tracing");
     idEval         = rb_intern("eval");
     idList         = rb_intern("list");
-    idClear        = rb_intern("clear");
-    idIndex        = rb_intern("index");
 
     rb_mObjectSpace = rb_const_get(rb_mKernel, rb_intern("ObjectSpace"));
 
@@ -1856,4 +1871,6 @@ Init_ruby_debug()
     rb_global_variable(&breakpoints);
     rb_global_variable(&catchpoint);
     rb_global_variable(&locker);
+    rb_global_variable(&last_context);
+    rb_global_variable(&last_thread);
 }

data/lib/ruby-debug.rb

@@ -1,5 +1,6 @@
 require 'pp'
 require 'stringio'
+require "socket"
 require 'thread'
 require 'ruby_debug.so'
 require 'ruby-debug/processor'
@@ -56,11 +57,10 @@ module Debugger
     attr_reader :thread, :control_thread
     
     #
-    # Interrupts the main thread
+    # Interrupts the current thread
     #
     def interrupt
-      context = contexts.find{|c| c.thread == Thread.current }
-      context.interrupt
+      current_context.interrupt
     end
     
     #
@@ -89,29 +89,18 @@ module Debugger
       start
       self.post_mortem if post_mortem
 
-      require "socket"
-      
       if port.kind_of?(Array)
         cmd_port, ctrl_port = port
       else
         cmd_port, ctrl_port = port, port + 1
       end
 
-      @control_thread = Thread.start do
-        current_context.ignore = true
-        server = TCPServer.new(host, ctrl_port)
-        while (session = server.accept)
-          interface = RemoteInterface.new(session)
-          processor = ControlCommandProcessor.new(interface)
-          processor.process_commands
-        end
-      end
+      start_control(host, ctrl_port)
       
       mutex = Mutex.new
       proceed = ConditionVariable.new
       
-      @thread = Thread.start do
-        current_context.ignore = true
+      @thread = DebugThread.new do
         server = TCPServer.new(host, cmd_port)
         while (session = server.accept)
           self.interface = RemoteInterface.new(session)
@@ -133,6 +122,19 @@ module Debugger
     end
     alias start_server start_remote
     
+    def start_control(host = nil, ctrl_port = PORT + 1)
+      raise "Debugger is not started" unless started?
+      return if @control_thread
+      @control_thread = DebugThread.new do
+        server = TCPServer.new(host, ctrl_port)
+        while (session = server.accept)
+          interface = RemoteInterface.new(session)
+          processor = ControlCommandProcessor.new(interface)
+          processor.process_commands
+        end
+      end
+    end
+    
     #
     # Connects to the remote debugger
     #
@@ -164,7 +166,7 @@ module Debugger
     def stop_main_thread # :nodoc:
       return unless stop_on_connect
       
-      context = contexts.find{ |c| c.thread == Thread.main }
+      context = thread_context(Thread.main)
       context.stop_next = 2
     end
     private :stop_main_thread
@@ -272,6 +274,13 @@ class Exception # :nodoc:
   attr_reader :__debug_file, :__debug_line, :__debug_binding, :__debug_frames
 end
 
+class DebugThread < Thread # :nodoc:
+  def initialize(*args, &b)
+    Debugger.thread_context(self).ignore = true
+    super
+  end
+end
+
 module Kernel
   #
   # Stops the current thread after a number of _steps_ made.

data/lib/ruby-debug/commands/control.rb

@@ -81,7 +81,7 @@ module Debugger
     
     def execute
       unless Debugger.interrupt_last
-        context = Debugger.contexts.find{ |c| c.thread == Thread.main }
+        context = Debugger.thread_context(Thread.main)
         context.interrupt
       end
     end

data/lib/ruby-debug/commands/frame.rb

@@ -1,5 +1,41 @@
 module Debugger
   module FrameFunctions # :nodoc:
+    def adjust_frame(frame_pos, absolute)
+      if absolute
+        if frame_pos < 0
+          abs_frame_pos = @state.frames.size + frame_pos
+        else
+          abs_frame_pos = frame_pos
+        end
+      else
+        abs_frame_pos = @state.frame_pos + frame_pos
+      end
+
+      if abs_frame_pos >= @state.frames.size then
+        print "Adjusting would put us beyond the oldest (initial) frame.\n"
+        return
+      elsif abs_frame_pos < 0 then
+        print "Adjusting would put us beyond the newest (innermost) frame.\n"
+        return
+      end
+      if @state.frame_pos != abs_frame_pos then
+        @state.previous_line = nil
+        @state.frame_pos = abs_frame_pos
+      end
+      frame = @state.frames[-1-@state.frame_pos]
+      @state.binding, @state.file, @state.line = frame.binding, frame.file, frame.line
+      print format_frame(frame, @state.frame_pos)
+    end
+
+    def get_int(str, cmd)
+      begin
+        return Integer(@match[1])
+      rescue
+        print "%s argument needs to be a number.\n" % cmd
+        return nil
+      end
+    end
+
     def format_frame(frame, pos)
       printf "\032\032" if ENV['EMACS']
       file, line, id = frame.file, frame.line, frame.id
@@ -11,7 +47,7 @@ module Debugger
     include FrameFunctions
 
     def regexp
-      /^\s*(?:w(?:here)?|f(?:rame)?)$/
+      /^\s*(?:w(?:here)?|bt|backtrace)$/
     end
 
     def execute
@@ -37,7 +73,7 @@ module Debugger
           }
         else
           %{
-            f[rame]\t\talias for where
+            bt|backtrace\t\talias for where
           }
         end
       end
@@ -48,46 +84,28 @@ module Debugger
     include FrameFunctions
 
     def regexp
-      /^\s*(?:(up)(?:\s+(\d+))?|(f)(?:rame)?(?:\s+(\d+)))\s*$/
+      /^\s* u(?:p)? (?:\s+(.*))? .*$/x
     end
 
     def execute
-      if @match[1]
-        cmd, arg = @match.captures
-      else
-        cmd, arg = @match.captures[2..-1]
-      end
-      @state.previous_line = nil
-      if cmd == 'f'
-        @state.frame_pos = arg.to_i - 1
+      unless @match[1]
+        pos = 1
       else
-        @state.frame_pos += (arg ? arg.to_i : 1)
+        pos = get_int(@match[1], "Up")
+        return unless pos
       end
-      @state.frame_pos = 0 if @state.frame_pos < 0
-      if @state.frame_pos >= @state.frames.size
-        @state.frame_pos = @state.frames.size - 1
-        print "At toplevel\n"
-      end
-      frame = @state.frames[-1 - @state.frame_pos]
-      @state.binding, @state.file, @state.line = frame.binding, frame.file, frame.line
-      print format_frame(frame, @state.frame_pos)
+      adjust_frame(pos, false)
     end
 
     class << self
       def help_command
-        %w|up frame|
+        up
       end
 
       def help(cmd)
-        if cmd == 'up'
-          %{
-            up[ nn]\tmove to higher frame
-          }
-        else
-          %{
-            f[rame] n\tselect nth frame
-          }
-        end
+        %{
+          up[count]\tmove to higher frame
+        }
       end
     end
   end
@@ -96,19 +114,17 @@ module Debugger
     include FrameFunctions
 
     def regexp
-      /^\s*down(?:\s+(\d+))?$/
+      /^\s* d(?:own)? (?:\s+(.*))? .*$/x
     end
 
     def execute
-      @state.previous_line = nil
-      @state.frame_pos -= @match[1] ? @match[1].to_i : 1
-      if @state.frame_pos < 0
-        @state.frame_pos = 0
-        print "At stack bottom\n"
+      if not @match[1]
+        pos = 1
+      else
+        pos = get_int(@match[1], "Down")
+        return unless pos
       end
-      frame = @state.frames[-1 - @state.frame_pos]
-      @state.binding, @state.file, @state.line = frame.binding, frame.file, frame.line
-      print format_frame(frame, @state.frame_pos)
+      adjust_frame(-pos, false)
     end
 
     class << self
@@ -118,7 +134,42 @@ module Debugger
 
       def help(cmd)
         %{
-          down[ nn]\tmove to lower frame
+          down[count]\tmove to lower frame
+        }
+      end
+    end
+  end
+  
+  class FrameCommand < Command # :nodoc:
+    include FrameFunctions
+    def regexp
+      /^\s* f(?:rame)? (?:\s+ (.*))? \s*$/x
+    end
+
+    def execute
+      if not @match[1]
+        print "Missing a frame number argument.\n"
+        return
+      else
+        pos = get_int(@match[1], "Frame")
+        return unless pos
+      end
+      adjust_frame(pos < 0 ? pos : pos-1, true)
+    end
+
+    class << self
+      def help_command
+        'frame'
+      end
+
+      def help(cmd)
+        %{
+          f[rame] frame-number
+          Move the current frame to the specified frame number.
+
+          A negative number indicates position from the other end.  So
+          'frame -1' moves to the oldest frame, and 'frame 0' moves to
+          the newest frame.
         }
       end
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
-date: 2007-01-26 21:24:26 -05:00
+  version: 0.6.2
+date: 2007-01-28 14:26:27 -05:00
 summary: Fast Ruby debugger
 require_paths: 
 - lib
@@ -33,9 +33,9 @@ files:
 - README
 - LICENSE
 - CHANGES
+- AUTHORS
 - lib/ruby-debug
 - lib/ruby-debug.rb
-- lib/ruby_debug.so
 - lib/ruby-debug/command.rb
 - lib/ruby-debug/commands
 - lib/ruby-debug/interface.rb
@@ -61,6 +61,7 @@ files:
 - ext/tags
 - ext/win32
 - bin/rdebug
+- lib/ruby_debug.so
 test_files: []
 
 rdoc_options: []