rbbt-util 5.13.0 → 5.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50b93d44cf66b527dc5cb3171ea799ad7618024f
-  data.tar.gz: f8647589d8b4c281074309db7509bd4b26e50aea
+  metadata.gz: a03adabca2810fb92c9771c98c6cee6126fec535
+  data.tar.gz: 173c80fd823140c2d7cb5443ae034fa61d89b74a
 SHA512:
-  metadata.gz: b04572a90e96cc1ac50f476df87025f459a0b36258de071179ae7f702da7799e17680a5ceb9d36ecf6e243a2008cd93f45ba7523756568cd99948580cc254356
-  data.tar.gz: ab57d3affae47af95efebbe2d2368418f4b9eae2b7dd8ab980d5d3dfaecd414dbdc0b5ce4615a6770b3d665877c4584ae13c73d7f308f878beb0979e0364d40d
+  metadata.gz: 43fa5b928dd62ddb3627d44255ec4497eba7ad61f2d16236df36e2cdb1f2243182b92ca4e11c4c279f2db6ea91d68e514530f9ff64abbc27a6ea93b2c145acf6
+  data.tar.gz: 4c9c7b955f6157b9ed7c0640454be5e92eef62c2e831bcfe1ea1fc16621d6c80c5bf48f72cf0233e8213582a06fd9ec58ac87005b1f1ef7d7f3fc21572352b84

data/lib/rbbt/util/log.rb

@@ -94,6 +94,7 @@ module Log
   end
 
   LOG_MUTEX = Mutex.new
+  LAST = "log"
   def self.log(message = nil, severity = MEDIUM, &block)
     return if severity < self.severity 
     message ||= block.call if block_given?
@@ -103,13 +104,14 @@ module Log
 
     sev_str = severity.to_s
 
-    prefix = time << "[" << color(severity) << sev_str << color(0) << "]"
+    prefix = time << "[" << color(severity) << sev_str << color(0)<<"]"
     message = "" << highlight << message << color(0) if severity >= INFO
     str = prefix << " " << message
 
     LOG_MUTEX.synchronize do
       STDERR.puts str
       logfile.puts str unless logfile.nil?
+      Log::LAST.replace "log"
     end
   end
 

data/lib/rbbt/util/log/progress.rb

@@ -2,7 +2,7 @@ require 'rbbt/util/log'
 module Log
   class ProgressBar
 
-    attr_accessor :depth, :num_reports, :desc, :io, :severity
+    attr_accessor :depth, :num_reports, :desc, :io, :severity, :history
 
     # Creates a new instance. Max is the total number of iterations of the
     # loop. The depth represents how many other loops are above this one,
@@ -38,8 +38,7 @@ module Log
           @last_report=percent
         end
       else
-        @last_report = Time.now if @last_report == -1
-        if Time.now - @last_report >= 1.0 
+        if @last_report == -1 or Time.now - @last_report >= 1.0 
           throughput
         end
       end
@@ -66,11 +65,11 @@ module Log
 
 
     def up_lines(depth)
-      "\033[#{depth + 2}F\033[2K"
+      "\033[#{depth + 1}F\033[2K"
     end
 
     def down_lines(depth)
-      "\n\033[#{depth + 3}E"
+      "\n\033[#{depth + 2}E"
     end
 
     def report_msg
@@ -91,47 +90,85 @@ module Log
       used = [used/3600, used/60 % 60, used % 60].map{|t|  "%02i" % t }.join(':')
 
       if progress == 1
-        indicator << Log.color(:green, " done ")
-
-
+        indicator << Log.color(:green, " done")
         indicator << Log.color(:blue, " #{used}")
       else
-        indicator << " done #{Log.color(:blue, percent.to_s << "%")}"
+        indicator << " #{Log.color(:blue, percent.to_s << "%")}"
 
         eta = self.eta
         eta = [eta/3600, eta/60 % 60, eta % 60].map{|t| "%02i" % t }.join(':')
 
-        indicator << " (Time left #{eta} seconds) (Started #{used} seconds ago)"
+        indicator << " #{Log.color :yellow, used} used #{Log.color :yellow, eta} left"
       end
 
     end
 
-    def throughput_msg
-      indicator = Log.color(:magenta, @desc) 
+    def thr
+      @history ||= []
+      @last_report = Time.now if @last_report == -1
       time = Time.now - @last_report
       thr = (@current / time).to_i
+
+      @history << thr
+      @history.shift if @history.length > 10
+
+      thr
+    end
+
+    def mean
+      @mean_max ||= 0
+      if @history.length > 3
+        mean = Misc.mean(@history[1..-1])
+        @mean_max = mean if mean > @mean_max
+      end
+      mean
+    end
+
+    def throughput_msg
+      thr = self.thr
+
+      mean = self.mean
+
+      indicator = Log.color(:magenta, @desc) 
       indicator << " #{ Log.color :blue, thr } per second"
+
+      indicator << " -- #{ Log.color :yellow, mean.to_i } avg. #{ Log.color :yellow, @mean_max.to_i} max." if mean
+
       indicator
     end
 
+    def print(io, str)
+      LOG_MUTEX.synchronize do
+        STDERR.print str
+        Log.logfile.puts str unless Log.logfile.nil?
+        Log::LAST.replace "progress"
+      end
+    end
     # Prints de progress report. It backs up as many lines as the meters
     # depth. Prints the progress as a line of dots, a percentage, time
     # spent, and time left. And then goes moves the cursor back to its
     # original line. Everything is printed to stderr.
     def report(io = STDERR)
-      io.print(up_lines(@depth) << report_msg << down_lines(@depth)) if severity >= Log.severity
+      if Log::LAST != "progress"
+        BARS.length.times{print(io, "\n")}
+      end
+      print(io, up_lines(@depth) << report_msg << down_lines(@depth)) if severity >= Log.severity
+      @last_report = Time.now if @last_report == -1
     end
 
     def throughput(io = STDERR)
-      io.print(up_lines(@depth) << throughput_msg << down_lines(@depth)) if severity >= Log.severity
+      if Log::LAST != "progress"
+        BARS.length.times{print(io, "\n")}
+      end
+      print(io, up_lines(@depth) << throughput_msg << down_lines(@depth)) if severity >= Log.severity
       @last_report = Time.now
       @current = 0
     end
     BAR_MUTEX = Mutex.new
     BARS = []
     def self.new_bar(max, options = {})
-      options = Misc.add_defaults options, :depth => BARS.length
       BAR_MUTEX.synchronize do
+        options = Misc.add_defaults options, :depth => BARS.length
         BARS << (bar = ProgressBar.new(max, options))
         bar
       end
@@ -148,6 +185,7 @@ module Log
           end 
           BARS.pop
         end
+        Log::LAST.replace "removeprogress"
       end
     end
 

data/lib/rbbt/util/misc/concurrent_stream.rb

@@ -104,13 +104,15 @@ module ConcurrentStream
     @callback = nil
   end
 
-  def read(*args)
+  def super(*args)
     if autojoin
       begin
         super(*args)
       rescue
+        Log.exception $!
         self.abort
         self.join 
+        raise $!
       ensure
         self.join if self.closed? or self.eof? 
       end

data/lib/rbbt/util/open.rb

@@ -379,6 +379,7 @@ module Open
       rescue
         io.abort if io.respond_to? :abort
         io.join if io.respond_to? :join
+        raise $!
       ensure
         io.join if io.respond_to? :join
       end
@@ -439,8 +440,8 @@ module Open
       begin
         File.open(file, mode) do |f| 
           f.flock(File::LOCK_EX)
-          while not content.eof?
-            f.write content.gets
+          while block = content.read(2014)
+            f.write block
           end
           f.flock(File::LOCK_UN)
         end

data/lib/rbbt/workflow/accessor.rb

@@ -46,6 +46,8 @@ class Step
         begin
           return @info_cache if @info_cache and File.mtime(info_file) < @info_cache_time
         rescue Exception
+          Log.exception $!
+          raise $!
         end
 
         begin
@@ -64,8 +66,8 @@ class Step
       end
     rescue Exception
       Log.debug{"Error loading info file: " + info_file}
+      #self.abort_pid
       Open.write(info_file, INFO_SERIALIAZER.dump({:status => :error, :messages => ["Info file lost"]}))
-      self.abort
       raise $!
     end
   end

data/lib/rbbt/workflow/step/run.rb

@@ -344,7 +344,11 @@ class Step
 
   def join
 
-    join_stream
+    until done? or result or error? or aborted? or streaming?
+      sleep 1
+    end
+
+    join_stream if status == :streaming
 
     return self if not Open.exists? info_file
 
@@ -356,9 +360,8 @@ class Step
     end
 
     begin
-      if pid.nil?
+      if pid.nil? or Process.pid == pid
         dependencies.each{|dep| dep.join }
-        self
       else
         begin
           Log.debug{"Waiting for pid: #{pid}"}
@@ -368,11 +371,10 @@ class Step
         end if Misc.pid_exists? pid
         pid = nil
         dependencies.each{|dep| dep.join }
-        self
       end
+      self
     ensure
       set_info :joined, true
     end
-    self
   end
 end

data/share/rbbt_commands/benchmark/throughput

@@ -23,20 +23,8 @@ max = 0
 avg = 0
 all = []
 scale = 5
+bar = Log::ProgressBar.new_bar nil
+
 while line = STDIN.gets
-  count += 1
-  last ||= Time.now
-  if Time.now - last >= 1.0 / scale
-    Log.clear_line
-    puts "Reading #{ Log.color :blue, count*scale } per second. Max #{ Log.color :blue, max*scale }. Average #{Log.color :blue, avg*scale}"
-    max = count > max ? count : max
-    last = Time.now
-    all << count
-    avg = Misc.mean(all).to_i if all.length > 3
-    count = 0
-  end
+  bar.tick
 end
-
-all << count
-
-puts "Total #{Log.color :blue, Misc.sum(all).to_i} in #{Log.color :blue, (Time.now - start).to_i} seconds -- #{Log.color :green, (Misc.sum(all).to_f / (Time.now - start)).to_i } per second. Max #{Log.color :blue, max*scale}. Average #{Log.color :green, avg*scale}"

data/test/rbbt/util/log/test_progress.rb

@@ -2,22 +2,26 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../../..', 'test_he
 require 'rbbt/util/log/progress'
 
 class TestProgress < Test::Unit::TestCase
-  def _test_bar
+  def test_bar
     t1 = Thread.new do
-      Log::ProgressBar.with_bar(20) do |bar|
+      Log::ProgressBar.with_bar(20, :desc => "Bar 1") do |bar|
         20.times do
           bar.tick
           sleep 0.3
         end
+        Log.debug "Done progress"
+        assert_equal 100, bar.percent
       end
     end
 
     t2 = Thread.new do
-      Log::ProgressBar.with_bar(20) do |bar|
+      Log::ProgressBar.with_bar(20, :desc => "Bar 2") do |bar|
         20.times do
           bar.tick
           sleep 0.2
         end
+        Log.debug "Done progress"
+        assert_equal 100, bar.percent
       end
     end
     t1.join
@@ -26,20 +30,24 @@ class TestProgress < Test::Unit::TestCase
 
   def test_bar_no_size
     t1 = Thread.new do
-      Log::ProgressBar.with_bar(nil) do |bar|
+      Log::ProgressBar.with_bar(nil, :desc => "Bar 1") do |bar|
         20.times do
           bar.tick
           sleep 0.3
         end
+        Log.debug "Done progress"
+        assert bar.history.length > 0
       end
     end
 
     t2 = Thread.new do
-      Log::ProgressBar.with_bar(nil) do |bar|
+      Log::ProgressBar.with_bar(nil, :desc => "Bar 2") do |bar|
         20.times do
           bar.tick
           sleep 0.2
         end
+        Log.debug "Done progress"
+        assert bar.history.length > 0
       end
     end
     t1.join

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.13.0
+  version: 5.13.1
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake