rbbt-util 5.13.16 → 5.13.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d09efb393223264f0666f1c2d4c01829eb666d76
-  data.tar.gz: 3a3ef628377b1740be128ddbe8c61d46c10c1989
+  metadata.gz: 9ddf635c66e349edec5db389d7ea12e100698632
+  data.tar.gz: f4c5a82a06ab483a523fdbff17febbf055fbfd19
 SHA512:
-  metadata.gz: e2a23e920540b9c9ea7f5f75906ada4555523030ca4fa109a92156e54564403e505336356f09f60f5ad7adf208187d3d891c14fa448646e6f980d42eb63d3f88
-  data.tar.gz: ed086ed760f8fb7bf7e32e990892b5dfc23a2d5f8c24c0a44b483fe57a49ee095d1f51dd29495caaefa7d4a02eb7709ad6a9dbf2e24292eadb3d2d37ef587173
+  metadata.gz: d3b949791ad76faa6d56a9c2a33aaa4e0bb0b89bc125f162cd608711ca0b99449deb6e1c57652ecb926c2075b63ba686f9b314f2f2b7a0fd5614dcfc9867d359
+  data.tar.gz: 11aa669bba9855942de35bf4695521627005a35d2eaa0f1fa833751dca409715d16a81dafec21a098e155d4ca8dd7ba4c889c64a40664a6913dfe0260aec1f1f

data/lib/rbbt/tsv/parallel/traverse.rb

@@ -311,6 +311,7 @@ module TSV
         raise $!
       ensure
         q.join
+        q.clean
       end
     rescue Interrupt, Aborted
       Log.medium "Aborted traversal in CPUs for #{stream_name(obj) || Misc.fingerprint(obj)}: #{$!.backtrace*","}"

data/lib/rbbt/util/concurrency/processes/socket.rb

@@ -9,9 +9,10 @@ class RbbtProcessQueue
     def initialize
       @sread, @swrite = Misc.pipe
 
-      key = rand(100000000).to_s;
+      key = "/" << rand(100000000).to_s;
       @write_sem = key + '.in'
       @read_sem = key + '.out'
+      Log.warn "Creating socket semaphores: #{key}"
       RbbtSemaphore.create_semaphore(@write_sem,1)
       RbbtSemaphore.create_semaphore(@read_sem,1)
     end
@@ -19,6 +20,7 @@ class RbbtProcessQueue
     def clean
       @sread.close unless @sread.closed?
       @swrite.close unless @swrite.closed?
+      Log.warn "Destroying socket semaphores: #{key}"
       RbbtSemaphore.delete_semaphore(@write_sem)
       RbbtSemaphore.delete_semaphore(@read_sem)
     end

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

@@ -7,7 +7,7 @@ module Misc
 
     dup_array = options.delete :dup_array
 
-    if Annotated === field or (Entity.respond_to?(:formats) and Entity.formats.include? field)
+    if Entity === field or (Entity.respond_to?(:formats) and Entity.formats.include? field)
       params = options.dup
 
       params[:format] ||= params.delete "format"

data/lib/rbbt/util/semaphore.rb

@@ -52,15 +52,11 @@ void post_semaphore(char* name){
 
   SEM_MUTEX = Mutex.new
   def self.synchronize(sem)
-    SEM_MUTEX.synchronize do
-      RbbtSemaphore.wait_semaphore(sem)
-    end
+    RbbtSemaphore.wait_semaphore(sem)
     begin
       yield
     ensure
-      SEM_MUTEX.synchronize do
-        RbbtSemaphore.post_semaphore(sem)
-      end
+      RbbtSemaphore.post_semaphore(sem)
     end
   end
 
@@ -68,6 +64,7 @@ void post_semaphore(char* name){
     file = "/" << Misc.digest(rand(1000000000000).to_s) if file.nil?
     file.gsub!('/', '_')
     begin
+      Log.warn "Creating semaphore (#{ size }): #{file}"
       RbbtSemaphore.create_semaphore(file, size)
       yield file
     ensure

data/lib/rbbt/workflow/accessor.rb

@@ -44,7 +44,7 @@ class Step
     begin
       @info_mutex.synchronize do
         begin
-          return @info_cache if @info_cache and File.mtime(info_file) < @info_cache_time
+          return @info_cache if @info_cache and File.mtime(info_file) > @info_cache_time
         rescue Exception
           raise $!
         end
@@ -65,7 +65,6 @@ 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"]}))
       raise $!
     end
@@ -100,7 +99,12 @@ class Step
   end
 
   def status
-    info[:status]
+    begin
+      info[:status]
+    rescue Exception
+      Log.error "Exception reading status: #{$!.message}" 
+      :error
+    end
   end
 
   def status=(status)
@@ -239,11 +243,11 @@ class Step
   end
 
   def error?
-    info[:status] == :error
+    status == :error
   end
 
   def aborted?
-    @aborted || info[:status] == :aborted
+    @aborted || status == :aborted
   end
 
   # {{{ INFO

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.13.16
+  version: 5.13.17
 platform: ruby
 authors:
 - Miguel Vazquez