ppool 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d2548c9a28db03e3abdc552d6fc3432d58dc71a
-  data.tar.gz: 5813e7a4b5c948309d05ccd4981083f282cf633e
+  metadata.gz: f09e2d6b93728af6217c3215ba81e6b9c1b38417
+  data.tar.gz: 8422bbc116f119e168191fc5dede318f8d339488
 SHA512:
-  metadata.gz: b4b18fb2de4b750e3457fff0db63a0d6bb08b4d27ccc562a0e8ed366582711bb30a14863b3b7712f01f4310471222b3e94054a00a717e1a5c743129b7fbb70a3
-  data.tar.gz: 32706e46ae2dfdb5aee17d72dd05fa5eb9edba49e506327cda65ffd14c961ebf4f483881d6a33d4fa0771edba5bbfd088a4972ff3c4a69d5bab66c69b7a68c2d
+  metadata.gz: cdb05df7fd35d02fe440ce91863bce35f7ebfc07331851bf2856302a0b96dbbe6eb1020c0cb31638c52bb2fa909e6077b5f44a5949d1ec7dcfeaafecd4ee70fe
+  data.tar.gz: cf690c45a03b79b6aaf97b75b139c8ee8d7311a56c9616fd849f5bb81e8b6a6f81a171d2a9bf9475e487bd11e95c884c025deaa2d6223d2fe437898e82c0bf94

data/bin/ppool

@@ -2,7 +2,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2016 Paul Taylor
+# Copyright (c) 2016, 2017 Paul Taylor
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -33,7 +33,8 @@ options = {
     :basic => false,
     :logdir => "./ppool-logs",
     :rmlogs => false,
-    :timespec => nil
+    :timespec => nil,
+    :average_size => nil
 }
 
 $USAGE = "Usage: ppool [options] COMMAND ARGS..."
@@ -47,6 +48,7 @@ OptionParser.new do |opts|
   opts.on('-t', '--time TIME',  'Time limit') { |v| options[:timespec] = v }
   opts.on('-b', '--basic', 'Basic (non curses) verion') { |v| options[:basic] = true}
   opts.on('-r', '--rmlogs', 'Remove logs for processes that exited successfully') { |v| options[:rmlogs] = true}
+  opts.on('-a', '--average NUM', 'Number of processes used to calculate average elapsed time') { |v| options[:average_size] = v }
   opts.on('-l', '--logdir DIR',  'Log directory') { |v| options[:logdir] = v }
 
   opts.on("-h", "--help", "Show this message") {
@@ -69,6 +71,7 @@ end
 
 size = options[:size].to_i
 delay = options[:delay].to_i
+average_size = options[:average_size].to_i
 
 begin
   time = options[:timespec] == nil ? nil : PPool.convert_time_to_secs(options[:timespec])
@@ -84,5 +87,5 @@ else
   controller = PPool::CursesProcessController.new(size, delay, command, time, logdir, options[:rmlogs])
 end
 
-PPool::ProcessPool.new(controller).run
+PPool::ProcessPool.new(controller, average_size).run
 

data/lib/ppool.rb

@@ -1,7 +1,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2016 Paul Taylor
+# Copyright (c) 2016, 2017 Paul Taylor
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -30,4 +30,5 @@ require "shell_process_controller.rb"
 require "timed_process_controller.rb"
 require "terminal_process_controller.rb"
 require "curses_process_controller.rb"
+require "time_stats.rb"
 

data/lib/process_pool.rb

@@ -26,15 +26,13 @@ module PPool
 
   class ProcessPool
 
-    def initialize(controller)
+    def initialize(controller, average_size)
       @controller = controller
+      @time_stats = TimeStats.new(average_size)
       @active_processes = 0
       @started_count = 0
       @ended_count = 0
       @errors = 0
-      @process_start_time = {}
-      @avg_elapsed_time = 0
-      @total_elapsed_time = 0
     end
 
 
@@ -55,7 +53,7 @@ module PPool
 	    @controller.run_process
 	  end
 
-          @process_start_time[pid] = Time.now
+          @time_stats.process_started(pid)
 
 	  @active_processes = @active_processes + 1
 	  @controller.process_started(pid, @active_processes)
@@ -70,14 +68,14 @@ module PPool
 	   pidStatus = Process.wait2(-1, Process::WNOHANG)
 	   if pidStatus != nil
              endedPid = pidStatus[0]
-             @total_elapsed_time = @total_elapsed_time + (Time.now - @process_start_time.delete(endedPid)) * 1000
+             @time_stats.process_ended(endedPid)
+
 	     @controller.process_ended(endedPid, pidStatus[1].exitstatus)
 	     @active_processes = @active_processes - 1 
 	     @ended_count = @ended_count + 1
 	     if pidStatus[1].exitstatus != 0 
 	       @errors = @errors + 1
 	     end
-             @avg_elapsed_time = (@total_elapsed_time / @ended_count).round()
 	   else 
 	     doneWaiting = true
 	   end
@@ -102,7 +100,7 @@ module PPool
 	  :processes_started => @started_count, 
 	  :processes_ended => @ended_count, 
 	  :errors => @errors,
-          :avg_elapsed_time => @avg_elapsed_time
+          :avg_elapsed_time => @time_stats.average_elapsed_time
        })
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ppool
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Paul Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Pool of processes running a single command