test/unit.rb: extract deal

* lib/test/unit.rb (Test::Unit::Runner#deal): deal tasks to workers.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,4 +1,6 @@
-Sat Jul 14 16:16:37 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jul 14 16:16:42 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit::Runner#deal): deal tasks to workers.
 
 	* lib/test/unit.rb (Test::Unit::Runner#quit_workers): close and kill
 	  all workers.

lib/test/unit.rb

@@ -520,64 +520,31 @@ module Test
         end
       end
 
-      def _run_parallel suites, type, result
+      def deal(io, type, result, rep, shutting_down = false)
-        if @options[:parallel] < 1
-          warn "Error: parameter of -j option should be greater than 0."
-          return
-        end
-
-        # Require needed things for parallel running
-        require 'thread'
-        require 'timeout'
-        @tasks = @files.dup # Array of filenames.
-        @need_quit = false
-        @dead_workers = []  # Array of dead workers.
-        @warnings = []
-        @total_tests = @tasks.size.to_s(10)
-        shutting_down = false
-        rep = [] # FIXME: more good naming
-
-        @workers      = [] # Array of workers.
-        @workers_hash = {} # out-IO => worker
-        @ios          = [] # Array of worker IOs
-        begin
-          # Thread: watchdog
-          watchdog = start_watchdog
-
-          @options[:parallel].times {launch_worker}
-
-          while _io = IO.select(@ios)[0]
-            break unless _io.each do |io|
-              break if @need_quit
         worker = @workers_hash[io]
         case worker.read
         when /^okay$/
           worker.status = :running
           jobs_status
-              when /^ready(!?)$/
+        when /^ready(!)?$/
           bang = $1
           worker.status = :ready
-                if @tasks.empty?
+
-                  unless @workers.find{|x| [:running, :prepare].include? x.status}
+          return nil unless task = @tasks.shift
-                    break
+          if @options[:separate] and not bang
-                  end
-                else
-                  if @options[:separate] && bang.empty?
-                    delete_worker(workers)
             worker.quit
-                    worker = launch_worker
+            worker = add_worker
           end
-                  worker.run(@tasks.shift, type)
+          worker.run(task, type)
           @test_count += 1
-                end
 
           jobs_status
         when /^done (.+?)$/
           r = Marshal.load($1.unpack("m")[0])
           result << r[0..1] unless r[0..1] == [nil,nil]
-                rep    << {file: worker.real_file,
+          rep    << {file: worker.real_file, report: r[2], result: r[3], testcase: r[5]}
-                           report: r[2], result: r[3], testcase: r[5]}
           $:.push(*r[4]).uniq!
+          return true
         when /^p (.+?)$/
           del_jobs_status
           print $1.unpack("m")[0]
@@ -593,32 +560,50 @@ module Test
             after_worker_down worker
           end
         end
-              break if @need_quit
+        return false
+      end
+
+      def _run_parallel suites, type, result
+        if @options[:parallel] < 1
+          warn "Error: parameter of -j option should be greater than 0."
+          return
+        end
+
+        # Require needed things for parallel running
+        require 'thread'
+        require 'timeout'
+        @tasks = @files.dup # Array of filenames.
+        @need_quit = false
+        @dead_workers = []  # Array of dead workers.
+        @warnings = []
+        @total_tests = @tasks.size.to_s(10)
+        rep = [] # FIXME: more good naming
+
+        @workers      = [] # Array of workers.
+        @workers_hash = {} # out-IO => worker
+        @ios          = [] # Array of worker IOs
+        begin
+          # Thread: watchdog
+          watchdog = start_watchdog
+
+          @options[:parallel].times {launch_worker}
+
+          while _io = IO.select(@ios)[0]
+            break if _io.any? do |io|
+              @need_quit or
+                (deal(io, type, result, rep).nil? and
+                 !@workers.any? {|x| [:running, :prepare].include? x.status})
             end
           end
         rescue Interrupt => e
           @interrupt = e
           return result
         ensure
-          shutting_down = true
-
           watchdog.kill if watchdog
           if @interrupt
             @ios.select!{|x| @workers_hash[x].status == :running }
             while !@ios.empty? && (__io = IO.select(@ios,[],[],10))
-                _io = __io[0]
+              __io[0].reject! {|io| deal(io, type, result, rep, true)}
-                _io.each do |io|
-                  worker = @workers_hash[io]
-                  case worker.read
-                  when /^done (.+?)$/
-                    r = Marshal.load($1.unpack("m")[0])
-                    result << r[0..1] unless r[0..1] == [nil,nil]
-                    rep    << {file: worker.real_file,
-                               report: r[2], result: r[3], testcase: r[5]}
-                    $:.push(*r[4]).uniq!
-                    @ios.delete(io)
-                  end
-                end
             end
           end