ruined 0.0.5 → 0.0.6

data/ChangeLog

@@ -1,4 +1,8 @@
-Tue Oct 13 21:01:00 2010 arton
+Wed Oct 13 22:39:00 2010 arton
+ * ruined/ruinmain.rb
+	version 0.0.5 => 0.0.6
+	support multi-thread app (but very limited)
+Wed Oct 13 21:01:00 2010 arton
  * Rakefile
 	add BSDL into gem
  * ruined/html/main.html

data/lib/ruined/ruinmain.rb

@@ -9,14 +9,51 @@ require 'monitor'
 require 'stringio'
 
 module Ruined
-  RUINED_VERSION = '0.0.5'
+  RUINED_VERSION = '0.0.6'
   
   @queue = [Queue.new, Queue.new]
   @breakpoints = []
   @monitor = Monitor.new
-  @tlses = { '$!' => nil, '$?' => nil, '$@' => nil, '$SAFE' => nil}
   IGNORES = [:$&, :$', :$+, :$_, :$`, :$~, :$KCODE, :$= ]
+  @unbreakable_threads = []
   
+  class <<Thread
+    alias :_original_start :start
+    def start(&proc)
+      webrick = caller.first.include?('webrick')
+      $stderr.puts "caller=#{caller[2]}, webrick=#{webrick}"
+      $stderr.flush
+      _original_start do
+        Ruined.add_unbreakable(Thread.current) if webrick
+        begin
+          proc.call
+        ensure
+          Ruined.remove_unbreakable(Thread.current) if webrick    
+        end
+      end  
+    end
+  end
+  
+  class Context
+    TLSES = ['$!', '$?', '$@', '$SAFE']
+    def initialize(e, f, l, id, bnd, b, s)
+      @event = e
+      @file = f
+      @line = l
+      @iid = id.to_s
+      @break = b
+      @binding = bnd
+      @stdout = s
+      @tlses = Hash[*(TLSES.map{|k| [k, eval(k)]}.flatten(1))]
+    end
+    def to_hash
+      { :event => @event, :file => @file, :line => @line, :id => @iid, :break => @break,
+        :stdout => @stdout }
+    end
+    attr_reader :tlses, :file, :line, :iid, :binding, :break
+    attr_accessor :event, :stdout
+  end
+
   include WEBrick
   svr = HTTPServer.new(:Port => 8383,
                        :ServerType => Thread,
@@ -70,13 +107,13 @@ module Ruined
 
     def stepping(*a)
       Ruined.wait 1      
-      JSON(Ruined.current)
+      JSON(Ruined.current_context)
     end
 
     def cont(*a)
       Ruined.release 0
       Ruined.wait 1
-      JSON(Ruined.current)
+      JSON(Ruined.current_context)
     end
 
     def step(*a)
@@ -145,8 +182,8 @@ module Ruined
     end
   end
 
-  def self.current
-    @current
+  def self.current_context
+    @current.to_hash
   end
   
   def self.breakpoints
@@ -159,7 +196,7 @@ local_variables.map do |_0|
   (_0 == :_) ? nil : { :name => _0.to_s, :value => eval(_0.to_s) }
 end - [nil]
 EOD
-    @current_binding ? eval(script, @current_binding) : []
+    @current.binding ? eval(script, @current.binding) : []
   end
   
   def self.self_vars
@@ -172,7 +209,7 @@ self.class.class_variables.map do |v|
   { :name => v.to_s, :value => instance_eval(v.to_s) }
 end
 EOD
-    @current_binding ? eval(script, @current_binding) : []
+    @current.binding ? eval(script, @current.binding) : []
   end
   
   def self.global_vars
@@ -187,38 +224,30 @@ end - [nil]
 EOD
     a = eval(script)
     0.upto(a.size - 1) do |i|
-      if @tlses.has_key?(a[i][:name])
-        a[i][:value] = @tlses[a[i][:name]]
+      if @current.tlses.has_key?(a[i][:name])
+        a[i][:value] = @current.tlses[a[i][:name]]
       end
     end
     a
   end
   
   def self.set(var, val)
-    eval("#{var} = #{val}", @current_binding)
+    eval("#{var} = #{val}", @current.binding)
   end
   
-  def self.tls_vars
-    @@tlses
-  end
-
   def self.wait(t)
-    @monitor.synchronize {        
-      unless @queue[t].empty?
-        @queue[t].clear
-        logger.debug("------------not wait exit #{t}")
-        return
-      end
-    }
     logger.debug("------------wait #{t}")
-    @queue[t].pop
+    o = @queue[t].pop
+    if t == 1
+      @current = o
+    end
     logger.debug("------------wait exit #{t}")
   end
 
-  def self.release(t)
+  def self.release(t, obj = nil)
     logger.debug("------------release #{t}")
     @monitor.synchronize {    
-      @queue[t].push nil
+      @queue[t].push obj
     }
     logger.debug("------------release exit #{t}")
   end
@@ -234,6 +263,24 @@ EOD
     end
     ret
   end
+  
+  def self.add_unbreakable(t)
+    @monitor.synchronize {
+      @unbreakable_threads << t
+    }
+  end
+  
+  def self.remove_unbreakable(t)
+    @monitor.synchronize {
+      @unbreakable_threads.delete t
+    }
+  end
+  
+  def self.unbreakable?(t)
+    @monitor.synchronize {
+      @unbreakable_threads.include? t
+    }
+  end
 
   svr.mount('/debug', DebugServlet)
   svr.mount_proc('/quit') do |req, res|
@@ -264,23 +311,18 @@ EOD
 
   svr.start
 
-  main_thread = Thread.current
-
   set_trace_func Proc.new {|event, file, line, id, binding, klass|
-    unless file =~ %r#(lib/ruby|webrick|internal)# || main_thread != Thread.current
+    unless file =~ %r#(lib/ruby|ruinmain|webrick|internal)# || unbreakable?(Thread.current)
       if event.index('c-') != 0
         if file == $0 && !$stdout.instance_of?(StringIO)
           $stdout = StringIO.new
         end
-        @tlses.each do |k, v|
-          @tlses[k] = eval(k)
-        end
         b = breakpoints.include? [file, line]
-        @current_binding = binding
-        @current = { 'event' => event, 'file' => file, 'line' => line, 
-          'id' => id.to_s, 'break' => b, 'stdout' => output }
-        svr.logger.debug(@current.inspect)
-        release 1
+        ctxt = @monitor.synchronize {            
+          Context.new(event, file, line, id, binding, b, output)
+        }
+        svr.logger.debug(ctxt.inspect)
+        release 1, ctxt
         wait 0
         svr.logger.debug('continue...')
       end
@@ -288,9 +330,9 @@ EOD
   }
   at_exit { 
     if @current
-      @current['event'] = 'exit'
-      @current['stdout'] = output
-      release 1
+      @current.event = 'exit'
+      @current.stdout = output
+      release 1, @current #reschedule
       wait 0
     end
   }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruined
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - arton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +09:00
+date: 2010-10-14 00:00:00 +09:00
 default_executable: 
 dependencies: []