pwrake 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3bfd1d1e40600085dbe880e57230260fa81b4f
-  data.tar.gz: 84a151198f3d200792e84fbe17715092b33abc15
+  metadata.gz: fab2af42b144ed4aa2389827ba675f7da65bc7b9
+  data.tar.gz: 81af34ffcac4a101b7b46161b6880812d1b6f0d1
 SHA512:
-  metadata.gz: 1db1ccc6ce750393100155219a6b86c012c9126b6dfe77ed7bc2f8e4d8ec7baa113741b51a43765e16513554cae8a077bd005706290b2f139d0e960a21d0d4c2
-  data.tar.gz: c2d49f2af43611bda75f92f74726bd5c7045ea2d85604b480231b5d0e5729d2d90b60f9c58b89aa12ea1e513eb8f3fa4c38a87b1beab485f266a0c759271383e
+  metadata.gz: 7090c590af93e6b1d2ad56b4235888ddd6edf22de3c107f5f97df805893563e8d41b2b3090352139b13fcb2fdb4d425fb16bcd32320c90dcb40e813e2a88ceb4
+  data.tar.gz: 6f51a807cad92475432495a5eeeaf95b5e892730229fd889283dc2c15c7ec83b2f14a9ca8f7f2a59fa987c1cfad2ec059f5fda6240187531ba0297b002312ba8

data/lib/pwrake/master/fiber_pool.rb

@@ -46,7 +46,7 @@ module Pwrake
       run
       while f = @fibers.shift
         if f.alive?
-          raise RuntimeError,"FiberPool#finish: fiber is still alive."
+          $stderr.puts "FiberPool#finish: fiber is still alive."
         end
       end
     end
@@ -66,4 +66,3 @@ module Pwrake
 
   end
 end
-

data/lib/pwrake/master/master.rb

@@ -71,7 +71,9 @@ module Pwrake
         $stderr.puts caller
         if @thread
           $stderr.puts "in branch thread #{@thread}:"
-          $stderr.puts @thread.backtrace.join("\n")
+          if bt = @thread.backtrace
+            $stderr.puts bt.join("\n")
+          end
         end
       end
       kill_end(sig)
@@ -199,6 +201,7 @@ module Pwrake
 
       if @option['GRAPH_PARTITION']
         setup_postprocess0
+        @branch_setup_thread.join
         @task_queue.deq_noaction_task do |tw|
           tw.preprocess
           tw.status = "end"
@@ -322,7 +325,7 @@ module Pwrake
       if count == 0 && !@task_queue.empty? && @hostinfo_by_taskname.empty?
         m="No task was invoked while unexecuted tasks remain"
         Log.error m
-        Log.error "@task_queue="+@task_queue.inspect
+        Log.error "count=#{count} @hostinfo_by_taskname.empty?=#{@hostinfo_by_taskname.empty?} @task_queue=\n"+@task_queue.inspect_q
         raise RuntimeError,m
       end
       #Log.debug "#{self.class}#send_task_to_idle_core end time=#{Time.now-tm}"

data/lib/pwrake/master/master_application.rb

@@ -40,8 +40,8 @@ module Pwrake
           m = Log.bt(e)
           if @master.thread
             m += "\nIn branch thread #{@master.thread}:\n "
-            if @master.thread.backtrace
-              m += @master.thread.backtrace.join("\n ")
+            if bt = @master.thread.backtrace
+              m += bt.join("\n ")
             end
           end
           Log.fatal m

data/lib/pwrake/queue/locality_aware_queue.rb

@@ -34,16 +34,20 @@ module Pwrake
         hints.each do |h|
           HostMap.ipmatch_for_name(h).each{|id| kv[id] = true}
         end
+        q_success = false
         if !kv.empty?
           kv.each_key do |id|
-            t.assigned.push(id)
             q = @q[id]
             if q
               q.push(t)
+              q_success = true
+              t.assigned.push(id)
             else
-              Log.warn("@q[id]=#{q.inspect} : @q.keys=#{@q.keys.inspect} id=#{id.inspect}")
+              Log.warn("lost queue for host id=#{id.inspect}: @q.keys=#{@q.keys.inspect}")
             end
           end
+        end
+        if q_success
           @size_q += 1
         else
           @q_remote.push(t)

data/lib/pwrake/report/parallelism.rb

@@ -222,6 +222,8 @@ plot '-' w l axis x1y1 title 'parallelism', '-' w l axis x1y2 title 'exec/sec'
       case s
       when /^\s*\((.*)$/
         get_command_key($1)
+      when /^\s*\w+=\S+\s+(.*)$/
+        get_command_key($1)
       when /^\s*([\w.,~^\/=+-]+)(.*)$/
         cmd, rest = $1, $2
         if cmd == "cd" && /[^;]*;(.*)$/ =~ rest

data/lib/pwrake/report/report.rb

@@ -141,6 +141,8 @@ EOL
       case s
       when /^\s*\((.*)$/
         get_command($1)
+      when /^\s*\w+=\S+\s+(.*)$/
+        get_command($1)
       when /^\s*([\w.,~^\/=+-]+)(.*)$/
         cmd, rest = $1, $2
         case cmd

data/lib/pwrake/version.rb

@@ -1,3 +1,3 @@
 module Pwrake
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwrake
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel