rbbt-util 5.26.170 → 5.26.171

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec58135152ab8da64225ec6ee2c82630300f745e9a97da8bfbce6d1286792f28
-  data.tar.gz: 7ddc25495f7f37536aac591c645095acd176f36dcb68c7e2f24f53d8a8ad7354
+  metadata.gz: b30207a19261c11a2613c091fde28604cc9186a6fafec8f74b33ecbb4e9cbac9
+  data.tar.gz: 3822e3009d4955690eff0e5554756cf6b1e898e1e9235814630f37a7e3192cfd
 SHA512:
-  metadata.gz: 11bd33815e5d784ef4c2fe8dca4580a6896a76aaa14fd7e67251ceb193e46472e25d292e5fec23116a39afe15c3951b83cd9696a3050b669c60ee7af6fd759bd
-  data.tar.gz: 87d3e4dfbf4286c8303b9bedd83462c5cb6f276802fd54068c9628a64bcff5d4a6cbde520de9495763f4cf008acc8465b1d4df1cc2955bdfe99c34cd42c9ae40
+  metadata.gz: 187d8e5dd75a5bfc750e93e6f8d41b4bf813ab800bb33b6aefd07695fc5d3d7531b904cb049b72f56cd06089d651d090152a8e7adfe3e0642182bf229d3b5ee9
+  data.tar.gz: 383c16854ec7772f32ced9fc0a57708b626b3db59cce5b41cee7ae909418f96f0058eba3e488db167a68d760bc8b85f252998f7aa9fb577ba9aec45d461c5d8f

data/lib/rbbt/persist/tsv/adapter.rb

@@ -52,26 +52,35 @@ module Persist
       out(key)
     end
 
+    def lock
+      lock_filename = Persist.persistence_path(persistence_path, {:dir => TSV.lock_dir})
+      Misc.lock(lock_filename) do
+        yield
+      end
+    end
+
     def write_and_read
-      lock_filename = Persist.persistence_path(persistence_path + '.write', {:dir => TSV.lock_dir})
+      #lock_filename = Persist.persistence_path(persistence_path, {:dir => TSV.lock_dir})
       #mutex.synchronize do
-      Misc.lock(lock_filename) do
-        write if closed? or not write?
-        res = begin
-                yield
-              ensure
-                read
-              end
-        res
+      #Misc.lock(lock_filename) do
+      lock do
+        write true if closed? or not write?
+        begin
+          yield
+        ensure
+          read
+        end
       end
       #end
+      #end
     end
 
     def write_and_close
-      lock_filename = Persist.persistence_path(persistence_path + '.write', {:dir => TSV.lock_dir})
+      #lock_filename = Persist.persistence_path(persistence_path + '.write', {:dir => TSV.lock_dir})
       #mutex.synchronize do
-      Misc.lock(lock_filename, true) do
-        write if closed? || ! write?
+      #Misc.lock(lock_filename, true) do
+      lock do
+        write true if closed? || ! write?
         res = begin
                 yield
               rescue Exception
@@ -81,18 +90,20 @@ module Persist
                 close
               end
         res
-      #end
       end
+      #end
+      #end
     end
 
     def read_and_close
-      read if closed? || ! read?
-      res = begin
-              yield
-            ensure
-              close
-            end
-      res
+      lock do
+        read true if closed? || ! read?
+        begin
+          yield
+        ensure
+          close
+        end
+      end
     end
 
 

data/lib/rbbt/tsv/filter.rb

@@ -73,9 +73,9 @@ module Filtered
 
     def save(ids)
       if persistence
-        persistence.write
-        persistence[self.key] = ids
-        persistence.read
+        persistence.write_and_close do
+          persistence[self.key] = ids
+        end
       else
         if @list.nil?
           @list = ids
@@ -103,7 +103,9 @@ module Filtered
         list
       else
         return nil if not persistence.include?(self.key)
-        persistence[self.key]
+        persistence.write_and_close do
+          persistence[self.key]
+        end
       end
     end
 
@@ -130,10 +132,13 @@ module Filtered
     def clean
       add_unsaved
       if persistence and persistence.include? self.key
-        restore = ! persistence.write?
-        persistence.write unless persistence.write?
-        persistence.delete self.key
-        persistence.read if restore
+        persistence.write_and_close do
+          persistence.delete self.key
+        end
+        #restore = ! persistence.write?
+        #persistence.write unless persistence.write?
+        #persistence.delete self.key
+        #persistence.read if restore
       else
         @list = nil
       end
@@ -142,7 +147,9 @@ module Filtered
     def reset
       add_unsaved
       if persistence
-        persistence.clear
+        persistence.write_and_close do
+          persistence.clear
+        end
       else
         @list = nil
       end

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

@@ -507,6 +507,7 @@ class Step
         ret = RbbtSemaphore.wait_semaphore(semaphore)
         raise SemaphoreInterrupted if ret == -1
       end
+
       begin
         begin
           @forked = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.26.170
+  version: 5.26.171
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake