trepanning 0.1.4 → 0.1.6

data/app/options.rb

@@ -8,7 +8,7 @@ require 'optparse'
 class Trepan
   require_relative 'default'
 
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
   PROGRAM = 'trepan'
 
   def self.show_version
@@ -89,6 +89,9 @@ EOB
         |num| 
         options[:port] = num
       end
+      # opts.on('-m', '--post-mortem', 'Activate post-mortem mode') do 
+      #   options[:post_mortem] = true
+      # end
       opts.on('--[no-]readline',
               'Try [not] GNU Readline') do |v|
         options[:readline] = v

data/app/run.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 require 'rbconfig'
 module Trepanning
 
@@ -35,7 +35,7 @@ module Trepanning
 
     dbgr.debugger(:hide_stack=>true) do
       dbgr.core.processor.hidelevels[Thread.current] = 
-        RubyVM::ThreadFrame.current.stack_size + 1
+        RubyVM::Frame.current.stack_size + 1
       begin
         Kernel::load program_to_debug
       rescue Interrupt
@@ -46,6 +46,15 @@ module Trepanning
     # above.
     $0 = old_dollar_0
     untrace_var(:$0, dollar_0_tracker)
+  rescue
+    if dbgr.settings[:post_mortem]
+      frame = RubyVM::Frame.current.prev(0)
+      dbgr.core.step_count = 0  # Make event processor stop
+      dbgr.core.processor.settings[:debugstack] = 0  # Make event processor stop
+      dbgr.core.event_processor('post-mortem', frame, $!)
+    else
+      raise
+    end
   end
 
   # Do a shell-like path lookup for prog_script and return the results.
@@ -71,6 +80,7 @@ module Trepanning
     end
     return nil
   end
+  module_function :ruby_syntax_errors
 end
 
 if __FILE__ == $0

data/bin/trepan

@@ -54,7 +54,8 @@ if File.basename(__FILE__) == File.basename($0)
     Trepan::PROG_SCRIPT = program_to_debug
 
     opts = {}
-    %w(cmdfiles highlight initial_dir host nx port readline server traceprint
+    %w(cmdfiles highlight initial_dir host nx port post_mortem
+       readline server traceprint
       ).each do |opt|
       opts[opt.to_sym] = options[opt.to_sym]
     end

data/check-filter.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# Use this to cut out the crud from make check.
+# Use like this:
+#   make check 2>&1  | ruby ../make-check-filter.rb
+# See Makefile.am
+pats = ["^(?:Loaded",
+        'Started',
+        "Making check in",
+        'Test run options',
+        "^trepan: That",
+       ].join('|') + ')'
+# puts pats
+skip_re = /#{pats}/
+
+while gets()
+  next if $_ =~ skip_re
+  puts $_
+end

data/interface/client.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2011, 2012 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Interface for client (i.e. user to communication-device) interaction.
 # The debugged program is at the other end of the communcation.

data/interface/comcodes.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2011, 2012 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Communication status codes
 module Trepanning
@@ -7,14 +7,15 @@ module Trepanning
   # client interface. COMMAND goes the other way.
   module RemoteCommunication
     unless defined?(PRINT)
-      PRINT         = '.'
-      COMMAND       = 'C'
-      CONFIRM_TRUE  = 'Y'
-      CONFIRM_FALSE = 'N'
+      PRINT         = '.'   # Server wants to print
+      COMMAND       = 'C'   # read a command
+      CONFIRM_TRUE  = 'Y'   # Confirm read, default true
+      CONFIRM_FALSE = 'N'   # Confirm read, default false
       CONFIRM_REPLY = '?'
-      QUIT          = 'q'
-      PROMPT        = 'p'
-      RESTART       = 'r'
+      QUIT          = 'q'   # End debug session
+      PROMPT        = 'p'   # Write prompt
+      SYNC          = 's'   # Resynchronize communication
+      RESTART       = 'r'   # Restart
     end
   end
 end

data/interface/server.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2011, 2012 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Our local modules
 require_relative '../interface'
@@ -37,6 +37,11 @@ class Trepan::ServerInterface < Trepan::Interface
         Trepan::TCPDbgServer.new(@connection_opts)
         # end
       end
+
+    # In case we need to resync
+    @last_action = :nop
+    @last_args = []
+
     # For Compatability 
     @output = @inout
     @input  = @inout
@@ -74,6 +79,8 @@ class Trepan::ServerInterface < Trepan::Interface
         msg "Please answer 'yes' or 'no'. Try again."
       end
     end
+    @last_action = :confirm
+    @last_args   = [prompt, default]
     return default
   end
   
@@ -95,16 +102,22 @@ class Trepan::ServerInterface < Trepan::Interface
   # used to write to a debugger that is connected to this
   # server; `str' written will have a newline added to it
   def msg(msg)
+    @last_args   = [msg]
+    @last_action = :msg
     @inout.writeline(PRINT + msg)
   end
 
   # used to write to a debugger that is connected to this
   # server; `str' written will not have a newline added to it
   def msg_nocr(msg)
+    @last_args   = [msg]
+    @last_action = :msg_nocr
     @inout.write(PRINT +  msg)
   end
   
   def read_command(prompt)
+    @last_args   = [prompt]
+    @last_action = :read_command
     readline(prompt)
   end
   
@@ -112,12 +125,23 @@ class Trepan::ServerInterface < Trepan::Interface
     @inout.read_dat
   end
   
+  def nop; end
+
+  def resync
+    # puts "resync", @last_action, @last_args
+    method(@last_action).call(*@last_args)
+  end
+  
   def readline(prompt, add_to_history=true)
     if prompt
       write_prompt(prompt)
     end
+    
     coded_line = @inout.read_msg()
-    @read_ctrl = coded_line[0..0]
+    while (SYNC == @read_ctrl = coded_line[0..0])
+      resync
+      coded_line = @inout.read_msg()
+    end
     coded_line[1..-1]
   end
   
@@ -128,6 +152,8 @@ class Trepan::ServerInterface < Trepan::Interface
   
   def write_prompt(prompt)
     @inout.write(PROMPT + prompt)
+    @last_args   = [prompt]
+    @last_action = :write_prompt
   end
   
   def write_confirm(prompt, default)
@@ -137,10 +163,20 @@ class Trepan::ServerInterface < Trepan::Interface
       code = CONFIRM_FALSE
     end
     @inout.write(code + prompt)
+    @last_args   = [prompt, default]
+    @last_action = :write_confirm
   end
 end
     
 # Demo
 if __FILE__ == $0
   intf = Trepan::ServerInterface.new(nil, nil, :open => false)
+  intf.resync
+  def intf.msg(msg)
+    @last_args   = [msg]
+    @last_action = :msg
+    puts msg
+  end
+  intf.msg('Hi!')
+  intf.resync
 end

data/interface/user.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Interface when communicating with the user.
 
@@ -118,7 +118,7 @@ class Trepan::UserInterface < Trepan::Interface
 
   def readline(prompt='')
     @output.flush
-    if @input.line_edit && @opts[:readline]
+    if @input.line_edit && @input.use_readline
       @input.readline(prompt)
     else
       @output.write(prompt) if prompt and prompt.size > 0

data/io/input.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 
 # Debugger user/command-oriented input possibly attached to IO-style
 # input or GNU Readline.
@@ -13,6 +13,8 @@ class Trepan
   # input or GNU Readline.
   class UserInput < Trepan::InputBase
 
+    attr_reader   :use_readline
+
     @@readline_finalized = false
 
     def initialize(inp, opts={})
@@ -36,6 +38,12 @@ class Trepan
         if @line_edit && @use_readline
           line = Readline.readline(prompt, true)
         else
+          # Prompt should be empty and should have been 
+          # handled by caller.
+          unless prompt.empty?
+            raise RuntimeError, 
+            "Internal error: prompt '#{prompt}' should have been handled by caller" unless prompt.empty?
+          end
           line = @input.gets
         end
       rescue Interrupt
@@ -66,7 +74,7 @@ class Trepan
       end
 
       def finalize
-       if defined?(RbReadline) && !@@readline_finalized
+        if defined?(RbReadline) && !@@readline_finalized
           begin 
             RbReadline.rl_cleanup_after_signal()
           rescue
@@ -76,7 +84,7 @@ class Trepan
           rescue
           end
           @@readline_finalized = true
-       end
+        end
       end
     end
   end

data/io/tcpclient.rb

@@ -12,8 +12,6 @@ class Trepan
 
     include Trepanning::TCPPacking
 
-    DEFAULT_INIT_OPTS = {:open => true}
-
     CLIENT_SOCKET_OPTS = {
       :host    => 'localhost', # Symbolic name
       :port    => 1027,  # Arbitrary non-privileged port

data/io/tcpserver.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2011, 2012 Rocky Bernstein <rockyb@rubyforge.net>
 # Debugger Server Input/Output interface.
 
 require 'socket'
@@ -84,7 +84,8 @@ class Trepan
     def write(msg)
       wait_for_connect() unless connected?
       # FIXME: do we have to check the size of msg and split output? 
-      @session.print(pack_msg(msg))
+      pack_msg = pack_msg(msg)
+      @session.print(pack_msg)
     end
 
     def writeline(msg)

data/lib/trepanning.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 require 'trace'                          # Trace filtering
 require 'thread_frame'                   # Stack frame introspection and more.
 require_relative '../app/complete'       # command completion
@@ -42,7 +42,7 @@ class Trepan
     # FIXME: Tracing through intialization code is slow. Need to figure
     # out better ways to do this. 
     th = Thread.current
-    th.exec_event_tracing  = true
+    th.exec_event_tracing = true
 
     @settings = Trepan::DEFAULT_SETTINGS.merge(settings)
     @input  = @settings[:input] || STDIN
@@ -65,8 +65,8 @@ class Trepan
         opts[:port] = @settings[:port] if @settings[:port]
         opts[:host] = @settings[:host] if @settings[:host]
         opts[:complete] = @completion_proc
-        opts[:readline] ||= @settings[:readline]
-        [Trepan::ClientInterface.new(nil, nil, nil, {}, opts)]
+        user_opts = @settings[:user_opts] || {}
+        [Trepan::ClientInterface.new(nil, nil, nil, user_opts, opts)]
       else
         opts = {:complete => @completion_proc,
                 :readline => @settings[:readline]}
@@ -111,7 +111,7 @@ class Trepan
       clear_trace_func
       @intf[-1].close 
     end
-    th.exec_event_tracing  = false
+    th.exec_event_tracing = false
   end
 
   # The method is called when we want to do debugger command completion
@@ -179,7 +179,7 @@ class Trepan
     # FIXME: one option we may want to pass is the initial trace filter.
     if opts[:hide_stack]
       @core.processor.hidelevels[Thread.current] = 
-        RubyVM::ThreadFrame.current.stack_size
+        RubyVM::Frame.current.stack_size
     end
     # unless defined?(PROG_UNRESOLVED_SCRIPT)
     #  # We may later do more sophisticated things...
@@ -194,12 +194,12 @@ class Trepan
     elsif opts[:immediate]
       # Stop immediately after this method returns. But if opts[:debugme]
       # is set, we can stop in this method.
-      RubyVM::ThreadFrame::current.trace_off = true unless opts[:debugme]
+      RubyVM::Frame::current.trace_off = true unless opts[:debugme]
       @trace_filter.set_trace_func(@core.event_proc) 
       Trace.event_masks[0] |= @core.step_events
       @core.debugger(1) 
     else
-      RubyVM::ThreadFrame::current.trace_off = true unless opts[:debugme]
+      RubyVM::Frame::current.trace_off = true unless opts[:debugme]
 
       @trace_filter.set_trace_func(@core.event_proc)
       Trace.event_masks[0] |= @core.step_events

data/processor.rb

@@ -79,11 +79,11 @@ class Trepan
       # FIXME: Rework using a general "set substitute file" command and
       # a global default profile which gets read.
       file = File.expand_path(File.join(File.dirname(__FILE__), 
-                                        %w(.. data prelude.rb)))
+                                        %w(data prelude.rb)))
       LineCache::cache(file)
       LineCache::remap_file('<internal:prelude>', file)
       file = File.expand_path(File.join(File.dirname(__FILE__), 
-                                        %w(.. data custom_require.rb)))
+                                        %w(data custom_require.rb)))
       LineCache::cache(file)
       LineCache::remap_file('<internal:lib/rubygems/custom_require>', 
                             file)
@@ -193,8 +193,8 @@ class Trepan
     # This is the main entry point.
     def process_commands(frame)
 
-      frame_setup(frame)
       @event = @core.event
+      frame_setup(frame)
 
       @unconditional_prehooks.run
       
@@ -219,7 +219,7 @@ class Trepan
         @last_pos = [@frame.source_container, frame_line,
                      @stack_size, @current_thread, @event, 
                      @frame.pc_offset]
-      else
+      elsif @event != 'post-mortem'
         return if stepping_skip? || @stack_size <= @hide_level
         if @settings[:traceprint]
           step

data/processor/command/backtrace.rb

@@ -90,7 +90,7 @@ if __FILE__ == $0
   %w(1 100).each {|count| run_cmd(cmd, [cmd.name, count])}
   cmd.settings[:basename] = true
   def foo(cmd, name)
-    cmd.proc.frame_setup(RubyVM::ThreadFrame::current)
+    cmd.proc.frame_setup(RubyVM::Frame::current)
     run_cmd(cmd, [cmd.name])
   end
   foo(cmd, cmd.name)

data/processor/command/base/subcmd.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010, 2011 Rocky Bernstein <rockyb@rubyforge.net>
+# Copyright (C) 2010-2012 Rocky Bernstein <rockyb@rubyforge.net>
 # A base class for debugger subcommands.
 #
 # Note: don't end classname with Command (capital C) since main
@@ -164,6 +164,9 @@ class Trepan
       run_set_bool(args)
     end
 
+    # Returns an Array of commands needed to save this setting. 
+    # Here it is simply:
+    # set xx ... {on|off}
     def save_command
       val     = settings[subcmd_setting_key] ? 'on' : 'off'
       ["#{subcmd_prefix_string} #{val}"]

data/processor/command/break.rb

@@ -86,7 +86,7 @@ if __FILE__ == $0
   run_cmd(cmd, [cmd.name])
   run_cmd(cmd, [cmd.name, __LINE__.to_s])
   require 'thread_frame'
-  tf = RubyVM::ThreadFrame.current
+  tf = RubyVM::Frame.current
   pc_offset = tf.pc_offset
   run_cmd(cmd, [cmd.name, "@#{pc_offset}"])
   def foo