rbbt-util 5.17.28 → 5.17.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b62b4d3d3b46cfcf8e631a471daf1cc574843cc8
-  data.tar.gz: 5b284a5ef7ade80f035ece5978a3cd31c5ea1d03
+  metadata.gz: b1776d45c03dd038001efb190c498041002029e2
+  data.tar.gz: 460b271b717c540d6ea68799fc0194e5ab026a16
 SHA512:
-  metadata.gz: a85420b0c5ad7ac41d5f6cd46add0d49bd1841658849acba2e06c5f4f57a3f854a93916789afbaa4794137ee4855a63e88cdf4a430cb8e5df5fcda868d8f2e39
-  data.tar.gz: f36d892b81611a5e2fffc95c50ca5fb0cb6121aca61552a74d60e9c20ede3daf1d1bb1422b8f00b8c84414773e41b534ef71747e5ddcd2391ea0a2f6d729d23f
+  metadata.gz: 0f2da706209429c3fb3901fae18c0e133bdd97d43700d23f12aa3c5d86d81233db986b08ae3187a387788eb06d847438697a259a7dbb2901a29b12cd11220245
+  data.tar.gz: 1cb89ce33d0f81232729dc2eb1ee8ea7561d6494eb5ba2a33ed161c8eca0e9b75865ee2cf9142e9309cd6d6076d3e51c3ec867469194c7d734c05b8b3217e88c

data/lib/rbbt/persist.rb

@@ -194,6 +194,7 @@ module Persist
 
     saver_thread = Thread.new(Thread.current) do |parent|
       begin
+        file.threads = []
         Thread.current["name"] = "file saver: " + path
         save_file(path, type, file, lockfile)
       rescue Aborted
@@ -205,12 +206,15 @@ module Persist
         file.abort if file.respond_to? :abort
         parent.raise $!
         raise $!
+      rescue Exception
+        Log.exception $!
+        raise $!
       end
     end
     ConcurrentStream.setup(out, :threads => saver_thread, :filename => path)
     out.callback = callback
     out.abort_callback = abort_callback
-    out.lockfile = stream.lockfile if stream.respond_to? :lockfile
+    out.lockfile = stream.lockfile if stream.respond_to? :lockfile and stream.lockfile
     out
   end
 
@@ -225,8 +229,12 @@ module Persist
 
     if stream
       if persist_options[:no_load] == :stream 
-        res = tee_stream(stream, path, type, stream.respond_to?(:callback)? stream.callback : nil, stream.respond_to?(:abort_callback)? stream.abort_callback : nil, lockfile)
-        #res.lockfile = lockfile
+        callback = stream.respond_to?(:callback)? stream.callback : nil
+        abort_callback = stream.respond_to?(:abort_callback)? stream.abort_callback : nil
+
+        res = tee_stream(stream, path, type, callback, abort_callback, lockfile)
+
+        res.lockfile = lockfile
 
         raise KeepLocked.new res 
       else
@@ -278,6 +286,7 @@ module Persist
         Misc.insist do
           if is_persisted?(path, persist_options)
             Log.low "Persist up-to-date (suddenly): #{ path } - #{Misc.fingerprint persist_options}"
+            lockfile.unlock if lockfile.locked?
             return path if persist_options[:no_load]
             return load_file(path, type) 
           end

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

@@ -50,10 +50,17 @@ module ConcurrentStream
   def join_threads
     if @threads and @threads.any?
       @threads.each do |t| 
-        t.join unless t == Thread.current
+        next if t == Thread.current
+        begin
+          #t.join if t.status == 'run'
+          t.join unless FalseClass === t.status 
+        rescue Exception
+          Log.warn "Exception joining thread in ConcurrenStream: #{filename}"
+          raise $!
+        end
       end
-      @threads = []
     end
+    @threads = []
   end
 
   def join_pids

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

@@ -20,10 +20,10 @@ module Misc
   LOCK_MUTEX = Mutex.new
   def self.lock(file, unlock = true, options = {})
     unlock, options = true, unlock if Hash === unlock
-    return yield if file.nil?
+    return yield if file.nil? and not Lockfile === options[:lock]
+
     FileUtils.mkdir_p File.dirname(File.expand_path(file)) unless File.exists?  File.dirname(File.expand_path(file))
 
-    res = nil
 
     case options[:lock]
     when Lockfile
@@ -42,6 +42,8 @@ module Misc
       lockfile.lock 
     end
 
+    res = nil
+
     begin
       res = yield lockfile
     rescue KeepLocked
@@ -50,8 +52,13 @@ module Misc
     ensure
       if unlock 
         begin
-          lockfile.unlock #if lockfile.locked?
+          if lockfile.locked?
+            lockfile.unlock 
+          else
+          end
         rescue Exception
+          Log.warn "Exception unlocking: #{lockfile.path}"
+          Log.exception $!
         end
       end
     end

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

@@ -230,49 +230,57 @@ module Misc
     Misc.lock tmp_path_lock, lock_options do
 
       if Open.exists? path and not force
+        Log.warn "Path exists in sensiblewrite, not forcing update: #{ path }"
         Misc.consume_stream content 
-        return
-      end
-
-      FileUtils.mkdir_p File.dirname(tmp_path) unless File.directory? File.dirname(tmp_path)
-      FileUtils.rm_f tmp_path if File.exists? tmp_path
-      begin
-        case
-        when block_given?
-          File.open(tmp_path, 'wb', &block)
-        when String === content
-          File.open(tmp_path, 'wb') do |f| f.write content end
-        when (IO === content or StringIO === content or File === content)
-
-          Open.write(tmp_path) do |f|
-            f.sync = true
-            while block = content.read(2048)
-              f.write block
+      else
+        FileUtils.mkdir_p File.dirname(tmp_path) unless File.directory? File.dirname(tmp_path)
+        FileUtils.rm_f tmp_path if File.exists? tmp_path
+        begin
+          case
+          when block_given?
+            File.open(tmp_path, 'wb', &block)
+          when String === content
+            File.open(tmp_path, 'wb') do |f| f.write content end
+          when (IO === content or StringIO === content or File === content)
+
+            Open.write(tmp_path) do |f|
+              f.sync = true
+              while block = content.read(2048)
+                f.write block
+              end
             end
+          else
+            File.open(tmp_path, 'wb') do |f|  end
           end
-        else
-          File.open(tmp_path, 'wb') do |f|  end
-        end
 
-        begin
-          Open.mv tmp_path, path, lock_options
+          begin
+            Open.mv tmp_path, path, lock_options
+          rescue Exception
+            raise $! unless File.exists? path
+          end
+
+          content.join if content.respond_to? :join and not content.joined?  
+
+          if Lockfile === lock_options[:lock] and lock_options[:lock].locked?
+            lock_options[:lock].unlock
+          end
+          FileUtils.touch path if File.exists? path
+        rescue Aborted
+          Log.medium "Aborted sensiblewrite -- #{ Log.reset << Log.color(:blue, path) }"
+          content.abort if content.respond_to? :abort
+          Open.rm path if File.exists? path
+        rescue Exception
+          Log.medium "Exception in sensiblewrite: #{$!.message} -- #{ Log.color :blue, path }"
+          Log.exception $!
+          content.abort if content.respond_to? :abort
+          Open.rm path if File.exists? path
+          raise $!
         rescue
-          raise $! unless File.exists? path
+          Log.exception $!
+          raise $!
+        ensure
+          FileUtils.rm_f tmp_path if File.exists? tmp_path
         end
-        content.join if content.respond_to? :join
-        FileUtils.touch path if File.exists? path
-      rescue Aborted
-        Log.medium "Aborted sensiblewrite -- #{ Log.reset << Log.color(:blue, path) }"
-        content.abort if content.respond_to? :abort
-        Open.rm path if File.exists? path
-      rescue Exception
-        Log.medium "Exception in sensiblewrite: #{$!.message} -- #{ Log.color :blue, path }"
-        Log.exception $!
-        content.abort if content.respond_to? :abort
-        Open.rm path if File.exists? path
-        raise $!
-      ensure
-        FileUtils.rm_f tmp_path if File.exists? tmp_path
       end
     end
   end
@@ -446,6 +454,8 @@ module Misc
 
   def self.save_stream(file, stream)
     out, save = Misc.tee_stream stream
+    out.filename = file
+    save.filename = file
 
     Thread.new(Thread.current) do |parent|
       begin
@@ -466,13 +476,11 @@ module Misc
     Misc.open_pipe do |sin|
       continue = true
       while continue
-        line1 = streams.first.gets unless streams.first.eof?
-        line2 = streams.last.gets unless streams.first.eof?
-        continue = false if line1.nil? and line2.nil?
-        sin.puts line1.strip if line1
-        sin.puts line2.strip if line2
-        line1 = nil
-        line2 = nil
+        lines = streams.collect{|stream| stream.eof? ? nil : stream.gets }.compact
+        lines.each do |line|
+          sin.puts line
+        end
+        continue = false if lines.empty?
       end
       streams.each do |stream| 
         stream.join if stream.respond_to? :join

data/lib/rbbt/workflow/accessor.rb

@@ -121,7 +121,7 @@ class Step
     return nil if @exec or info_file.nil?
     value = Annotated.purge value if defined? Annotated
     Open.lock(info_file, :lock => info_lock) do
-      i = info(false)
+      i = info(false).dup
       i[key] = value 
       @info_cache = i
       Misc.sensiblewrite(info_file, INFO_SERIALIAZER.dump(i), :force => true, :lock => false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.28
+  version: 5.17.29
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake