pwrake 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 169f1dc9dd2e2b5dbc2b07d4b4ac11abb74cbc60
-  data.tar.gz: e1efd61651870235421f6a10f531daea0dc6ba83
+SHA256:
+  metadata.gz: d2c9f51a1a5bdbb546c288239917a1284a7d831f4332c339474d5eb4e368a0ac
+  data.tar.gz: dda35b31e72bd380b0e6ee5e1e2d6cdecb66698bfd3167ce792e3b4f95146f4c
 SHA512:
-  metadata.gz: dd4a51d8ae3c2c919a553668b4a0009aea6c4c0bb5b80c1f5ad849a8d569f5e600fe296abb3e19ee5f6b1f90e060b17cbe432ac41c74c587aeac3289bc8b7dd9
-  data.tar.gz: 39de4c6360f0d02414dcd6f23fc820f12fef64de7a7b7017c81527df33448b406f5e6d9e9f0a5710d9768ddbff9bf15fb92cbf7800663f2fc2d80a2ee430bc69
+  metadata.gz: 5999d1c3ac6217ebab9d5e1915f6f9cf6c8c2023fa3fe973a3a3de7dfe751f4b89e5c8b1a31d4a0a9e972a8fb1be8233fb2c357b189f339925194bfde2352e52
+  data.tar.gz: 366a8e85bf26d3af24b9f80f4521c8b222c56985b50c644f337d4e996eb232f8c077df6fbe4a314b5794eb91d840639ce8c13a3e508fc695ea12bf3c4cbd3fad

data/lib/pwrake/branch/fiber_queue.rb

@@ -7,10 +7,11 @@ module Pwrake
 
   class FiberQueue
 
-    def initialize
+    def initialize(log=nil)
       @q = []
       @waiter = []
       @finished = false
+      @log = log
     end
 
     def enq(x)
@@ -38,7 +39,13 @@ module Pwrake
     def finish
       @finished = true
       while f = @waiter.shift
-        f.resume
+        begin
+          f.resume
+        rescue => exc
+          if @log
+            @log.error(([exc.to_s]+exc.backtrace).join("\n"))
+          end
+        end
       end
     end
 

data/lib/pwrake/branch/shell.rb

@@ -145,14 +145,16 @@ module Pwrake
       end
       @status = nil
       start_time = Time.now
+      start_clock = Pwrake.clock
       begin
         _puts(cmd)
         @status = io_read_loop(&block)
       ensure
         end_time = Time.now
+        end_clock = Pwrake.clock
         @status = @@profiler.profile(@task_id, @task_name, cmd,
-                     start_time, end_time, host, @ncore, @status,
-                     @gnu_time_status)
+                     start_time, end_time, end_clock-start_clock,
+                     host, @ncore, @status, @gnu_time_status)
       end
     end
 

data/lib/pwrake/branch/shell_profiler.rb

@@ -30,12 +30,12 @@ module Pwrake
       end
       _puts table_header
       t = Time.now
-      profile(nil,nil,'pwrake_profile_start',t,t)
+      profile(nil,nil,'pwrake_profile_start',t,t,0)
     end
 
     def close
       t = Time.now
-      profile(nil,nil,'pwrake_profile_end',t,t)
+      profile(nil,nil,'pwrake_profile_end',t,t,0)
       @lock.synchronize do
         @io.close if @io != nil
         @io = nil
@@ -85,7 +85,7 @@ module Pwrake
       t.strftime("%F %T.%L")
     end
 
-    def profile(task_id, task_name, cmd, start_time, end_time,
+    def profile(task_id, task_name, cmd, start_time, end_time, elap_clock,
                 host=nil, ncore=nil, status=nil, gnu_time_status=nil)
       id = @lock.synchronize do
         id = @id
@@ -96,7 +96,7 @@ module Pwrake
         prof = [ id, task_id, task_name, cmd,
                 format_time(start_time),
                 format_time(end_time),
-                "%.3f" % (end_time-start_time),
+                "%.6f" % elap_clock,
                 host, ncore, status ]
         if @gnu_time && gnu_time_status
           prof.concat(gnu_time_status)

data/lib/pwrake/master/fiber_pool.rb

@@ -9,14 +9,14 @@ module Pwrake
       @fibers = []
       @idle_fiber = []
       @q = []
-      @new_fiber_start_time = Time.now-10
+      @new_fiber_start_time = Pwrake.clock-10
     end
 
     def enq(x)
       @q.push(x)
       @count += 1
       if @idle_fiber.empty? and @fibers.size < @max_fiber and
-          Time.now - @new_fiber_start_time > 0.1
+          Pwrake.clock - @new_fiber_start_time > 0.1
         @idle_fiber << new_fiber
       end
       f = @idle_fiber.shift

data/lib/pwrake/master/master_application.rb

@@ -23,16 +23,17 @@ module Pwrake
         init("pwrake")  # <- parse options here
         @role = @master = Master.new
         t = Time.now
+        t = Pwrake.clock
         @master.setup_branches
         load_rakefile
         begin
-          Log.debug "init: #{Time.now-t} sec"
-          t = Time.now
+          Log.debug "init: #{Pwrake.clock-t} sec"
+          t = Pwrake.clock
           top_level
-          Log.debug "main: #{Time.now-t} sec"
-          t = Time.now
+          Log.debug "main: #{Pwrake.clock-t} sec"
+          t = Pwrake.clock
           @failed = @master.finish
-          Log.debug "finish: #{Time.now-t} sec"
+          Log.debug "finish: #{Pwrake.clock-t} sec"
         rescue SystemExit => e
           @failed = true
         rescue Exception => e
@@ -49,7 +50,7 @@ module Pwrake
           @master.kill_end("INT")
           @failed = true
         end
-        Log.info "pwrake elapsed time: #{Time.now-START_TIME} sec"
+        Log.info "pwrake elapsed time: %.3f sec"%(Pwrake.clock-START_CLOCK)
         Kernel.exit(false) if @failed
       end
     end

data/lib/pwrake/misc/mcgp.rb

@@ -6,7 +6,7 @@ module Pwrake
   module MCGP
 
     def graph_partition(host_map, target=nil)
-      t1 = Time.now
+      t1 = Pwrake.clock
       wgts = host_map.group_weight_sum
       if wgts.size > 1
         list = wgts.size.times.to_a
@@ -24,7 +24,7 @@ module Pwrake
       g = GraphTracerNode.new(list,wgts)
       trace(g,target)
       g.part_graph
-      t2 = Time.now
+      t2 = Pwrake.clock
       Pwrake::Log.info "Time for TOTAL Graph Partitioning: #{t2-t1} sec"
       #g.write_dot('dag2.dot')
       #exit
@@ -308,7 +308,7 @@ module Pwrake
 
       #  puts "@vertex_id2name[#{i}]=#{@vertex_id2name[i]}, depth=#{depth}, edges="+@edges[i].map{|x| @vertex_id2name[x[0]]}.join("|")
 
-      t1 = Time.now
+      t1 = Pwrake.clock
       if false
         puts "@vertex_id2name.size=#{@vertex_id2name.size}"
         if $debug2
@@ -358,7 +358,7 @@ module Pwrake
         @part = Metis.mc_part_graph_recursive2(
                   c,@xadj,@adjcny,@vwgt,nil,@tpwgts)
       end
-      t2 = Time.now
+      t2 = Pwrake.clock
       Pwrake::Log.info "Time for Graph Partitioning: #{t2-t1} sec"
       count_partition
       if $debug

data/lib/pwrake/nbio.rb

@@ -105,14 +105,14 @@ module NBIO
     end
 
     def init_heartbeat
-      t = Time.now
+      t = Pwrake.clock
       @hb_check_time = t
       @hb_time = {}
       @reader.each_key{|io| @hb_time[io] = t}
     end
 
     def check_heartbeat(ios,timeout)
-      t = Time.now
+      t = Pwrake.clock
       if t - @hb_check_time < 3
         if ios
           ios.each do |io|

data/lib/pwrake/option/option.rb

@@ -6,7 +6,12 @@ require "pwrake/option/host_map"
 
 module Pwrake
 
+  def self.clock
+    Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
+
   START_TIME = Time.now
+  START_CLOCK = Pwrake.clock
 
   class Option < Hash
 

data/lib/pwrake/task/task_algorithm.rb

@@ -19,12 +19,12 @@ module Pwrake
 
     def pw_search_tasks(args)
       Log.debug "#{self.class}#pw_search_tasks start, task=#{name} args=#{args.inspect}"
-      tm = Time.now
+      cl = Pwrake.clock
       task_args = TaskArguments.new(arg_names, args)
       # not synchronize owing to fiber
       search_with_call_chain(nil, task_args, InvocationChain::EMPTY)
       #
-      Log.debug "#{self.class}#pw_search_tasks end #{Time.now-tm}"
+      Log.debug "#{self.class}#pw_search_tasks end #{Pwrake.clock-cl}"
     end
 
     # Same as search, but explicitly pass a call chain to detect

data/lib/pwrake/task/task_wrapper.rb

@@ -65,6 +65,7 @@ module Pwrake
 
     def preprocess
       @time_start = Time.now
+      @clock_start = Pwrake.clock
     end
 
     def retry?
@@ -77,15 +78,15 @@ module Pwrake
 
     def postprocess(postproc)
       @executed = true if !@task.actions.empty?
-      #tm_taskend = Time.now
+      #tm_taskend = Pwrake.clock
       if is_file_task?
-        #t = Time.now
+        #t = Pwrake.clock
         if File.exist?(name)
           @file_stat = File::Stat.new(name)
           @location = postproc.run(self)
         end
       end
-      #Log.debug "postprocess time=#{Time.now-tm_taskend}"
+      #Log.debug "postprocess time=#{Pwrake.clock-tm_taskend}"
       log_task
     end
 
@@ -109,6 +110,7 @@ module Pwrake
 
     def log_task
       @time_end = Time.now
+      @clock_end = Pwrake.clock
       #
       sug_host = suggest_location()
       shell = Pwrake::Shell.current
@@ -118,7 +120,7 @@ module Pwrake
       end
       return if !@@task_logger
       #
-      elap = @time_end - @time_start
+      elap = @clock_end - @clock_start
       if has_output_file?
         RANK_STAT.add_sample(rank,elap)
       end
@@ -148,7 +150,7 @@ module Pwrake
       # preq_loc exec_host shell_id has_action executed ncore
       # file_size file_mtime file_host write_loc
       #
-      row = [ @task_id, name, @time_start, @time_end, elap,
+      row = [ @task_id, name, @time_start, @time_end, "%.6f"%elap,
               prerequisites, sug_host, preq_loc, @exec_host, @shell_id,
               (actions.empty?) ? 0 : 1,
               (@executed) ? 1 : 0,

data/lib/pwrake/version.rb

@@ -1,3 +1,3 @@
 module Pwrake
-  VERSION = "2.2.5"
+  VERSION = "2.2.6"
 end

data/lib/pwrake/worker/executor.rb

@@ -45,7 +45,7 @@ module Pwrake
       @option = option
       @out = Writer.instance
       @log = LogExecutor.instance
-      @queue = FiberQueue.new
+      @queue = FiberQueue.new(@log)
       @rd_list = []
       @dir = dir_class.new
       @dir.open
@@ -182,9 +182,6 @@ module Pwrake
           @sh_in.close
           @sh_out.close
           @sh_err.close
-          if @start_process_fiber.alive?
-            @start_process_fiber.resume # next process
-          end
         end
       end
     rescue => exc

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwrake
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Parallel Workflow engine based on Rake