ruby-debug 0.6 → 0.6.1

data/CHANGES

@@ -1,3 +1,6 @@
+0.6.1
+- Another performance optimization.
+
 0.6
 - Added option to exclude collecting of frame bindings.
 - Several performance optimizations.

data/bin/rdebug

@@ -31,8 +31,8 @@ EOB
   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("-x", "--trace", "turn on line tracing") {options.tracing = true}
-  opts.on("-n", "--nostop", "Do not stop when a client connects, implies -s option") {options.nostop = true}
-  opts.on("-f", "--keep-frame-state", "Keep frame state") {options.frame_info = 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|
@@ -100,7 +100,7 @@ else
     if options.tracing
       Debugger.tracing = true
     else
-      debugger 2
+      debugger 2 unless options.nostop
     end
     Debugger.debug_load Debugger::PROG_SCRIPT
   end

data/ext/ruby_debug.c

@@ -4,7 +4,7 @@
 #include <rubysig.h>
 #include <st.h>
 
-#define DEBUG_VERSION "0.6"
+#define DEBUG_VERSION "0.6.1"
 
 #define CTX_FL_MOVED        (1<<1)
 #define CTX_FL_SUSPEND      (1<<2)
@@ -98,6 +98,7 @@ static unsigned long hook_count = 0;
 
 static VALUE create_binding(VALUE);
 static VALUE debug_stop(VALUE);
+static void save_current_position(debug_context_t *);
 
 typedef struct locked_thread_t { 
     unsigned long thread_id;
@@ -398,25 +399,6 @@ debug_frame_create(char *file, int line, VALUE binding, ID id)
     return result;
 }
 
-static void
-save_current_position(VALUE context)
-{
-    VALUE cur_frame;
-    debug_context_t *debug_context;
-    debug_frame_t *debug_frame;
-
-    Data_Get_Struct(context, debug_context_t, debug_context);
-    if(RARRAY(debug_context->frames)->len == 0)
-        return;
-
-    cur_frame = *RARRAY(debug_context->frames)->ptr;
-    Data_Get_Struct(cur_frame, debug_frame_t, debug_frame);
-    
-    debug_context->last_file = debug_frame->file;
-    debug_context->last_line = debug_frame->line;
-    CTX_FL_UNSET(debug_context, CTX_FL_MOVED);
-}
-
 static VALUE
 call_at_line_unprotected(VALUE args)
 {
@@ -426,12 +408,12 @@ call_at_line_unprotected(VALUE args)
 }
 
 static VALUE
-call_at_line(VALUE context, int thnum, VALUE file, VALUE line)
+call_at_line(VALUE context, debug_context_t *debug_context, VALUE file, VALUE line)
 {
     VALUE args;
     
-    last_debugged_thnum = thnum;
-    save_current_position(context);
+    last_debugged_thnum = debug_context->thnum;
+    save_current_position(debug_context);
     
     args = rb_ary_new3(3, context, file, line);
     return rb_protect(call_at_line_unprotected, args, 0);
@@ -444,7 +426,7 @@ save_call_frame(VALUE self, char *file, int line, ID mid, debug_context_t *debug
     
     binding = self && RTEST(keep_frame_info)? create_binding(self) : Qnil;
     frame = debug_frame_create(file, line, binding, mid);
-    rb_ary_unshift(debug_context->frames, frame);
+    rb_ary_push(debug_context->frames, frame);
 }
 
 #if defined DOSISH
@@ -589,7 +571,7 @@ get_top_frame(debug_context_t *debug_context)
     if(RARRAY(debug_context->frames)->len == 0)
         return NULL;
     else {
-        frame = RARRAY(debug_context->frames)->ptr[0];
+        frame = RARRAY(debug_context->frames)->ptr[RARRAY(debug_context->frames)->len-1];
         Data_Get_Struct(frame, debug_frame_t, debug_frame);
         return debug_frame;
     }
@@ -616,6 +598,18 @@ set_frame_source(debug_context_t *debug_context, char *file, int line)
     }
 }
 
+static void
+save_current_position(debug_context_t *debug_context)
+{
+    debug_frame_t *debug_frame;
+    
+    debug_frame = get_top_frame(debug_context);
+    if(!debug_frame) return;
+    debug_context->last_file = debug_frame->file;
+    debug_context->last_line = debug_frame->line;
+    CTX_FL_UNSET(debug_context, CTX_FL_MOVED);
+}
+
 static void
 debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
 {
@@ -679,9 +673,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
         set_frame_source(debug_context, file, line);
 
         if(RTEST(tracing) || CTX_FL_TEST(debug_context, CTX_FL_TRACING))
-        {
             rb_funcall(context, idAtTracing, 2, rb_str_new2(file), INT2FIX(line));
-        }
         
         if(debug_context->dest_frame == -1 || 
             RARRAY(debug_context->frames)->len == debug_context->dest_frame)
@@ -691,9 +683,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
                 debug_context->stop_next = -1;
             /* we check that we actualy moved to another line */
             if(DID_MOVED)
-            {
                 debug_context->stop_line--;
-            }
         }
         else if(RARRAY(debug_context->frames)->len < debug_context->dest_frame)
         {
@@ -701,9 +691,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
         }
 
         if(RARRAY(debug_context->frames)->len == 0)
-        {
             save_call_frame(self, file, line, mid, debug_context);
-        }
 
         if(debug_context->stop_next == 0 || debug_context->stop_line == 0 ||
             (breakpoint_index = check_breakpoints_by_pos(debug_context, file, line)) != -1)
@@ -714,9 +702,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
             {
                 breakpoint = get_breakpoint_at(breakpoint_index);
                 if(check_breakpoint_expression(breakpoint, binding))
-                {
                     rb_funcall(context, idAtBreakpoint, 1, breakpoint);
-                }
                 else
                     break;
             }
@@ -727,7 +713,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
             debug_context->stop_next = -1;
 
             save_top_binding(debug_context, binding);
-            call_at_line(context, debug_context->thnum, rb_str_new2(file), INT2FIX(line));
+            call_at_line(context, debug_context, rb_str_new2(file), INT2FIX(line));
         }
         break;
     }
@@ -753,7 +739,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
             {
                 save_top_binding(debug_context, binding);
                 rb_funcall(context, idAtBreakpoint, 1, breakpoint);
-                call_at_line(context, debug_context->thnum, rb_str_new2(file), INT2FIX(line));
+                call_at_line(context, debug_context, rb_str_new2(file), INT2FIX(line));
             }
         }
         break;
@@ -766,7 +752,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
             debug_context->stop_next = 1;
             debug_context->stop_frame = 0;
         }
-        rb_ary_shift(debug_context->frames);
+        rb_ary_pop(debug_context->frames);
         break;
     }
     case RUBY_EVENT_CLASS:
@@ -809,7 +795,7 @@ debug_event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
                 if(self && binding == Qnil)
                     binding = create_binding(self);
                 save_top_binding(debug_context, binding);
-                call_at_line(context, debug_context->thnum, rb_str_new2(file), INT2FIX(line));
+                call_at_line(context, debug_context, rb_str_new2(file), INT2FIX(line));
                 break;
             }
         }
@@ -1436,7 +1422,7 @@ context_step_over(int argc, VALUE *argv, VALUE self)
     {
         if(FIX2INT(frame) < 0 && FIX2INT(frame) >= RARRAY(debug_context->frames)->len)
             rb_raise(rb_eRuntimeError, "Destination frame is out of range.");
-        debug_context->dest_frame = FIX2INT(frame);
+        debug_context->dest_frame = RARRAY(debug_context->frames)->len - FIX2INT(frame);
     }
 
     return Qnil;
@@ -1458,7 +1444,7 @@ context_stop_frame(VALUE self, VALUE frame)
     Data_Get_Struct(self, debug_context_t, debug_context);
     if(FIX2INT(frame) < 0 && FIX2INT(frame) >= RARRAY(debug_context->frames)->len)
         rb_raise(rb_eRuntimeError, "Stop frame is out of range.");
-    debug_context->stop_frame = FIX2INT(frame);
+    debug_context->stop_frame = RARRAY(debug_context->frames)->len - FIX2INT(frame);
 
     return frame;
 }

data/ext/tags

@@ -5,19 +5,21 @@ Init_breakpoint	ruby_debug.c	/^Init_breakpoint()$/
 Init_context	ruby_debug.c	/^Init_context()$/
 Init_frame	ruby_debug.c	/^Init_frame()$/
 Init_ruby_debug	ruby_debug.c	/^Init_ruby_debug()$/
-VALUE	ruby_debug.c	/^    typedef VALUE (*bind_func_t)(VALUE);$/
+VALUE	ruby_debug.c	/^    typedef VALUE (*id2ref_func_t)(VALUE, VALUE);$/
 add_to_locked	ruby_debug.c	/^add_to_locked(VALUE thread)$/
-basename	ruby_debug.c	/^basename(VALUE filename)$/
+bp_type	ruby_debug.c	/^enum bp_type {BP_POS_TYPE, BP_METHOD_TYPE};$/
 breakpoint_expr	ruby_debug.c	/^breakpoint_expr(VALUE self)$/
 breakpoint_id	ruby_debug.c	/^breakpoint_id(VALUE self)$/
 breakpoint_mark	ruby_debug.c	/^breakpoint_mark(void *data)$/
 breakpoint_pos	ruby_debug.c	/^breakpoint_pos(VALUE self)$/
 breakpoint_source	ruby_debug.c	/^breakpoint_source(VALUE self)$/
-call_at_line	ruby_debug.c	/^call_at_line(VALUE context, int thnum, VALUE bindi/
+call_at_line	ruby_debug.c	/^call_at_line(VALUE context, int thnum, VALUE file,/
 call_at_line_unprotected	ruby_debug.c	/^call_at_line_unprotected(VALUE args)$/
 check_breakpoint_expression	ruby_debug.c	/^check_breakpoint_expression(VALUE breakpoint, VALU/
-check_breakpoints	ruby_debug.c	/^check_breakpoints(debug_context_t *debug_context, /
-classname_cmp	ruby_debug.c	/^classname_cmp(debug_breakpoint_t *debug_breakpoint/
+check_breakpoints_by_method	ruby_debug.c	/^check_breakpoints_by_method(debug_context_t *debug/
+check_breakpoints_by_pos	ruby_debug.c	/^check_breakpoints_by_pos(debug_context_t *debug_co/
+check_thread_contexts	ruby_debug.c	/^check_thread_contexts()$/
+classname_cmp	ruby_debug.c	/^classname_cmp(VALUE name, VALUE klass)$/
 context_frames	ruby_debug.c	/^context_frames(VALUE self)$/
 context_ignore	ruby_debug.c	/^context_ignore(VALUE self)$/
 context_resume	ruby_debug.c	/^context_resume(VALUE self)$/
@@ -29,6 +31,7 @@ context_stop_next	ruby_debug.c	/^context_stop_next(VALUE self, VALUE steps)$/
 context_suspend	ruby_debug.c	/^context_suspend(VALUE self)$/
 context_thnum	ruby_debug.c	/^context_thnum(VALUE self)$/
 context_thread	ruby_debug.c	/^context_thread(VALUE self)$/
+context_thread_0	ruby_debug.c	/^context_thread_0(debug_context_t *debug_context)$/
 context_tracing	ruby_debug.c	/^context_tracing(VALUE self)$/
 create_binding	ruby_debug.c	/^create_binding(VALUE self)$/
 debug_add_breakpoint	ruby_debug.c	/^debug_add_breakpoint(int argc, VALUE *argv, VALUE /
@@ -46,15 +49,17 @@ debug_contexts	ruby_debug.c	/^debug_contexts(VALUE self)$/
 debug_current_context	ruby_debug.c	/^debug_current_context(VALUE self)$/
 debug_debug_load	ruby_debug.c	/^debug_debug_load(VALUE self, VALUE file)$/
 debug_event_hook	ruby_debug.c	/^debug_event_hook(rb_event_t event, NODE *node, VAL/
-debug_frame_create	ruby_debug.c	/^debug_frame_create(VALUE file, VALUE line, VALUE b/
+debug_frame_create	ruby_debug.c	/^debug_frame_create(char *file, int line, VALUE bin/
 debug_frame_mark	ruby_debug.c	/^debug_frame_mark(void *data)$/
 debug_frame_t	ruby_debug.c	/^} debug_frame_t;$/
 debug_is_started	ruby_debug.c	/^debug_is_started(VALUE self)$/
+debug_keep_frame_info	ruby_debug.c	/^debug_keep_frame_info(VALUE self)$/
 debug_last_interrupted	ruby_debug.c	/^debug_last_interrupted(VALUE self)$/
 debug_post_mortem	ruby_debug.c	/^debug_post_mortem(VALUE self)$/
 debug_remove_breakpoint	ruby_debug.c	/^debug_remove_breakpoint(VALUE self, VALUE id_value/
 debug_resume	ruby_debug.c	/^debug_resume(VALUE self)$/
 debug_set_catchpoint	ruby_debug.c	/^debug_set_catchpoint(VALUE self, VALUE value)$/
+debug_set_keep_frame_info	ruby_debug.c	/^debug_set_keep_frame_info(VALUE self, VALUE value)/
 debug_set_post_mortem	ruby_debug.c	/^debug_set_post_mortem(VALUE self, VALUE value)$/
 debug_set_tracing	ruby_debug.c	/^debug_set_tracing(VALUE self, VALUE value)$/
 debug_skip	ruby_debug.c	/^debug_skip(VALUE self)$/
@@ -64,23 +69,34 @@ debug_stop_i	ruby_debug.c	/^debug_stop_i(VALUE self)$/
 debug_suspend	ruby_debug.c	/^debug_suspend(VALUE self)$/
 debug_tracing	ruby_debug.c	/^debug_tracing(VALUE self)$/
 eval_expression	ruby_debug.c	/^eval_expression(VALUE args)$/
-filename_cmp	ruby_debug.c	/^filename_cmp(debug_breakpoint_t *debug_breakpoint,/
+filename_cmp	ruby_debug.c	/^filename_cmp(VALUE source, char *file)$/
 find_last_context_func	ruby_debug.c	/^find_last_context_func(VALUE key, VALUE value, VAL/
 frame_binding	ruby_debug.c	/^frame_binding(VALUE self)$/
 frame_file	ruby_debug.c	/^frame_file(VALUE self)$/
 frame_id	ruby_debug.c	/^frame_id(VALUE self)$/
 frame_line	ruby_debug.c	/^frame_line(VALUE self)$/
 get_breakpoint_at	ruby_debug.c	/^get_breakpoint_at(int index) $/
-is_in_locked	ruby_debug.c	/^is_in_locked(VALUE thread)$/
+get_top_frame	ruby_debug.c	/^get_top_frame(debug_context_t *debug_context)$/
+id2ref	ruby_debug.c	/^id2ref(unsigned long id)$/
+id2ref_error	ruby_debug.c	/^id2ref_error()$/
+id2ref_unprotected	ruby_debug.c	/^id2ref_unprotected(VALUE id)$/
+is_in_locked	ruby_debug.c	/^is_in_locked(unsigned long thread_id)$/
+is_thread_alive	ruby_debug.c	/^is_thread_alive(VALUE thread)$/
+isdirsep	ruby_debug.c	/^#define isdirsep(x) ((x) == '\/' || (x) == '\\\\')/
 locked_thread_t	ruby_debug.c	/^} locked_thread_t;$/
+min	ruby_debug.c	/^#define min(x,y) ((x) < (y) ? (x) : (y))$/
+ref2id	ruby_debug.c	/^ref2id(VALUE obj)$/
 remove_from_locked	ruby_debug.c	/^remove_from_locked()$/
-save_call_frame	ruby_debug.c	/^save_call_frame(VALUE self, VALUE file, VALUE line/
+ruby_method_ptr	ruby_debug.c	/^ruby_method_ptr(VALUE class, ID meth_id)$/
+save_call_frame	ruby_debug.c	/^save_call_frame(VALUE self, char *file, int line, /
 save_current_position	ruby_debug.c	/^save_current_position(VALUE context)$/
+save_top_binding	ruby_debug.c	/^save_top_binding(debug_context_t *debug_context, V/
 set_current_skipped_status	ruby_debug.c	/^set_current_skipped_status(VALUE status)$/
-set_frame_source	ruby_debug.c	/^set_frame_source(debug_context_t *debug_context, V/
+set_frame_source	ruby_debug.c	/^set_frame_source(debug_context_t *debug_context, c/
 thread_cmp	ruby_debug.c	/^thread_cmp(VALUE a, VALUE b)$/
 thread_context_lookup	ruby_debug.c	/^thread_context_lookup(VALUE thread)$/
-thread_hash	ruby_debug.c	/^thread_hash(VALUE thread)$/
+thread_hash	ruby_debug.c	/^thread_hash(unsigned long thread_id)$/
+threads_table_check_i	ruby_debug.c	/^threads_table_check_i(VALUE key, VALUE value, VALU/
 threads_table_clear	ruby_debug.c	/^threads_table_clear(VALUE table)$/
 threads_table_clear_i	ruby_debug.c	/^threads_table_clear_i(VALUE key, VALUE value, VALU/
 threads_table_create	ruby_debug.c	/^threads_table_create()$/

data/lib/ruby-debug.rb

@@ -284,7 +284,7 @@ module Kernel
   # Returns a binding of n-th call frame
   #
   def binding_n(n = 0)
-    frame = Debugger.current_context.frames[n+1]
+    frame = Debugger.current_context.frames[-2 - n]
     raise "Unknown frame #{n}" unless frame
     frame.binding 
   end

data/lib/ruby-debug/command.rb

@@ -64,7 +64,7 @@ module Debugger
 
     def debug_eval(str, b = @state.binding)
       unless b
-        print "Can't evaluate in the current context.\n"
+        print "Can't evaluate in the current context.\nUse rdebug with -f option, or set Debugger.keep_frame_info = true.\n"
         throw :debug_error
       end
       begin

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

@@ -15,7 +15,7 @@ module Debugger
     end
 
     def execute
-      @state.frames.each_with_index do |frame, idx|
+      @state.frames.reverse.each_with_index do |frame, idx|
         if idx == @state.frame_pos
           print "--> "
         else
@@ -68,7 +68,7 @@ module Debugger
         @state.frame_pos = @state.frames.size - 1
         print "At toplevel\n"
       end
-      frame = @state.frames[@state.frame_pos]
+      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
@@ -106,7 +106,7 @@ module Debugger
         @state.frame_pos = 0
         print "At stack bottom\n"
       end
-      frame = @state.frames[@state.frame_pos]
+      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

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

@@ -8,7 +8,7 @@ module Debugger
 
     def execute
       steps = @match[1] ? @match[1].to_i : 1
-      @state.context.step_over steps, @state.frames.size - @state.frame_pos
+      @state.context.step_over steps, @state.frame_pos
       @state.proceed
     end
 
@@ -61,7 +61,7 @@ module Debugger
       if @state.frame_pos == @state.frames.size
         print "\"finish\" not meaningful in the outermost frame.\n"
       else
-        @state.context.stop_frame = @state.frames.size - @state.frame_pos
+        @state.context.stop_frame = @state.frame_pos
         @state.frame_pos = 0
         @state.proceed
       end

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

@@ -6,7 +6,7 @@ module Debugger
       print "%s%s", c_flag, d_flag
       print "%d ", c.thnum
       print "%s\t", c.thread.inspect
-      last_frame = c.frames.first
+      last_frame = c.frames.last
       if last_frame
         print "%s:%d", last_frame.file, last_frame.line
       end

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

@@ -12,7 +12,7 @@ module Debugger
             print "Wrong frame number\n"
             return
           end
-          frame = @state.frames[frm_n - 1]
+          frame = @state.frames[-frm_n]
           file, line = frame.file, frame.line
         else
           file, line = @state.file, @state.line

data/lib/ruby-debug/processor.rb

@@ -46,7 +46,7 @@ module Debugger
     
     def at_catchpoint(context, excpt)
       frames = context.frames
-      print "Catchpoint at %s:%d: `%s' (%s)\n", frames[0].file, frames[0].line, excpt, excpt.class
+      print "Catchpoint at %s:%d: `%s' (%s)\n", frames.last.file, frames.last.line, excpt, excpt.class
       fs = frames.size
       tb = caller(0)[-fs..-1]
       if tb
@@ -88,7 +88,7 @@ module Debugger
         s.context = context
         s.file    = file
         s.line    = line
-        s.binding = frames.first.binding
+        s.binding = frames.last.binding
         s.display = display
         s.interface = interface
         s.commands = event_cmds

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: ruby-debug
 version: !ruby/object:Gem::Version 
-  version: "0.6"
-date: 2007-01-26 15:22:30 -05:00
+  version: 0.6.1
+date: 2007-01-26 21:24:25 -05:00
 summary: Fast Ruby debugger
 require_paths: 
 - lib
@@ -35,6 +35,7 @@ files:
 - CHANGES
 - 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