eric: comparison DebugClients/Ruby/Debuggee.rb

-:f75dbdd22959
+:61bfcff921d8
 =begin edoc
 File implementing the real debugger, which is connected to the IDE frontend.
 =end
+require 'continuation'
 require 'DebugQuit'
 require 'rbconfig'
 class DEBUGGER__
 =begin edoc
 Class implementing the real debugger.
 =end
-class Mutex
-=begin edoc
-Class implementing a mutex.
-=end
-def initialize
-=begin edoc
-Constructor
-=end
-@locker = nil
-@waiting = []
-@locked = false;
-end
-def locked?
-=begin edoc
-Method returning the locked state.
-@return flag indicating the locked state (boolean)
-=end
-@locked
-end
-def lock
-=begin edoc
-Method to lock the mutex.
-@return the mutex
-=end
-return if @locker == Thread.current
-while (Thread.critical = true; @locked)
-@waiting.push Thread.current
-Thread.stop
-end
-@locked = true
-@locker = Thread.current
-Thread.critical = false
-self
-end
-def unlock
-=begin edoc
-Method to unlock the mutex.
-@return the mutex
-=end
-return unless @locked
-unless @locker == Thread.current
-raise RuntimeError, "unlocked by other"
-end
-Thread.critical = true
-t = @waiting.shift
-@locked = false
-@locker = nil
-Thread.critical = false
-t.run if t
-self
-end
-end
 MUTEX = Mutex.new
 class Context
 =begin edoc
 Class defining the current execution context.
 def check_suspend
 =begin edoc
 Method to check the suspend state.
 =end
-while (Thread.critical = true; @suspend_next)
+while MUTEX.synchronize {
-DEBUGGER__.waiting.push Thread.current
+if @suspend_next
-@suspend_next = false
+DEBUGGER__.waiting.push Thread.current
-Thread.stop
+@suspend_next = false
-end
+true
-Thread.critical = false
+end
+}
+end
 end
 def stdout
 =begin edoc
 Method returning the stdout object.
 # bp[5] condition
 # bp[6] ignore count
 # bp[7] special condition
 # bp[8] hash of special values
 return false if break_points.empty?
-for b in break_points
+break_points.each do |b|
 if b[0]
 if b[1] == 0 and b[2] == file and b[3] == pos   # breakpoint
 # Evaluate condition
 if b[5]
 begin
 @param file filename of the breakpoint (String)
 @param pos line number of the breakpoint (int)
 @param enable flag indicating the new enabled state (boolean)
 =end
-for bp in break_points
+break_points.each do |bp|
 if (bp[1] == 0 and bp[2] == file and bp[3] == pos)
 bp[0] = enable
 break
 end
 end
 @param file filename of the breakpoint (String)
 @param pos line number of the breakpoint (int)
 @param count ignore count to be set (int)
 =end
-for bp in break_points
+break_points.each do |bp|
 if (bp[2] == file and bp[3] == pos)
 bp[6] = count
 break
 end
 end
 Method to set the enabled state of a watch expression.
 @param cond expression of the watch expression (String)
 @param enable flag indicating the new enabled state (boolean)
 =end
-for bp in break_points
+break_points.each do |bp|
 if (bp[1] == 1 and bp[2] == cond)
 bp[0] = enable
 break
 end
 end
 Method to set the ignore count of a watch expression.
 @param cond expression of the watch expression (String)
 @param count ignore count to be set (int)
 =end
-for bp in break_points
+break_points.each do |bp|
 if (bp[1] == 1 and bp[2] == cond)
 bp[6] = count
 break
 end
 end
 if file =~ /\(eval\)/
 return true
 end
 if not traceRuby? and
-(file =~ /#{Config::CONFIG['sitelibdir']}/ or
+(file =~ /#{RbConfig::CONFIG['sitelibdir']}/ or
-file =~ /#{Config::CONFIG['rubylibdir']}/)
+file =~ /#{RbConfig::CONFIG['rubylibdir']}/)
 return true
 end
 if ["AsyncFile.rb", "AsyncIO.rb", "Config.rb", "DebugClient.rb",
 "DebugClientBaseModule.rb", "DebugClientCapabilities.rb",
 @frames.unshift [binding_, file, line, id]
 when 'return', 'end'
 @frames.shift
-when 'end'
-@frames.shift
 when 'raise'
 excn_handle(file, line, id, binding_)
 end
 @last_file = file
 debug_command(file, line, id, binding_)
 end
 when 'c-call'
 frame_set_pos(file, line)
-if id == :require and klass == Kernel
+##                if id == :require and klass == Kernel
-@frames.unshift [binding_, file, line, id]
+##                    @frames.unshift [binding_, file, line, id]
-else
+##                else
-frame_set_pos(file, line)
+##                    frame_set_pos(file, line)
-end
+##                end
+##
-when 'c-return'
+##            when 'c-return'
-if id == :require and klass == Kernel
+##                if id == :require and klass == Kernel
-if @frames.size == @finish_pos
+##                    if @frames.size == @finish_pos
-@stop_next = 1
+##                        @stop_next = 1
-@finish_pos = 0
+##                        @finish_pos = 0
-end
+##                    end
-@frames.shift
+##                    @frames.shift
-end
+##                end
 when 'class'
 @frames.unshift [binding_, file, line, id]
 when 'return', 'end'
 if @frames.size == @finish_pos
 @stop_next = 1
 @finish_pos = 0
 end
-@frames.shift
-when 'end'
 @frames.shift
 when 'raise'
 @no_step = nil
 @stop_next = 0        # break here before leaving...
 def suspend
 =begin edoc
 Method to suspend the program being debugged.
 =end
-Thread.critical = true
+MUTEX.synchronize do
 make_thread_list
 for th, in @thread_list
 next if th == Thread.current
 context(th).set_suspend
 end
-Thread.critical = false
+end
 # Schedule other threads to suspend as soon as possible.
 Thread.pass
 end
 def resume
 =begin edoc
 Method to resume the program being debugged.
 =end
-Thread.critical = true
+MUTEX.synchronize do
 make_thread_list
 for th, in @thread_list
 next if th == Thread.current
 context(th).clear_suspend
 end
 waiting.each do |th|
 th.run
 end
 waiting.clear
-Thread.critical = false
+end
 # Schedule other threads to restart as soon as possible.
 Thread.pass
 end
 def context(thread=Thread.current)
 Method returning a thread by number.
 @param num thread number (int)
 @return thread with the requested number
 =end
-th = @thread_list.index(num)
+th = @thread_list.key(num)
 unless th
 @stdout.print "No thread ##{num}\n"
 throw :debug_error
 end
 th

Mercurial Repositories > eric / file comparison

comparison: DebugClients/Ruby/Debuggee.rb

DebugClients/Ruby/Debuggee.rb