rbbt-util 5.5.38 → 5.5.39

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDI1NTNhNzEyM2U5OTE5MThmZWZmZDczZjlkNWMyNjJiYjBjYzlkMQ==
+    M2VmNmQwZDc4Yjk1OTNkYWYzNjlkNjEyMzQ3MTc5MTNjOWQyMGU5OQ==
   data.tar.gz: !binary |-
-    MmY0OTQ5OGI3OTgwM2RhNjg5MmQ4ZDBlZGQzOWI1ZDVkYTg0MmZkNg==
+    YmJhNTBhZGQzOTg5NGQzM2RmYjBiNGEzZThiNzhjYThmZmM4MmFiOQ==
 SHA512:
   metadata.gz: !binary |-
-    MTA3MTMxNjkyMGFlYjMwZWJjZjAyZGNjNDUyNjIwZjQ1OTVhMDc2ZWU0ZDVl
-    YTAwNjNmZWRiMjMxMTRjMTgwMWRjODQzMWFmNjMzNDAyOTdlNGE1ZWQ3ZDNi
-    MWQ4YjBlOWE1ZTlhNTNkOTVlOWFhNjU0ZDgwZDRiM2JjNzkzZGE=
+    OWYzZDIwNGVjNjQ3OWExOGQwNjczNGY0ODhiNDMzMDg4NWNiNGY3MjIxY2Jh
+    NmFjMzNiMzBiZjYzODlhNzE5ODA0Y2VjNTNlOTUwZmI5Zjc5MTc1MWNhN2E3
+    NTYxYmRmZmZiNmEzNzU2ZGQ3ZmFhMjI2ODIyMTA4YzhjMGFkYmM=
   data.tar.gz: !binary |-
-    Y2M4YjI4ZTIzNTQzODE0NTliN2JmODBmNDJmYzZjZjA1OGQ5YTU0MzhlNjA1
-    OGVkZmU4Y2JhMTI1ODQ4YmVhYmNhOWE4YTc3YmQxN2I2Mzg1MDc5N2I1NDI0
-    NDJkMzUzM2NhNzAxYzFhN2RjNzg0YzVlZTE5ZjE0YjM5NDJjZmU=
+    ZWU4N2NiMWYxYTY2OWFiZGUzYmM2Y2YxZDI2N2RkMzZmZGI1YWQzYTFiZWNk
+    YzJhYjU1YjUxOWZiZWUxNzY2YTU5NTFjOTRlNDY0NTA1YjQzZTY3MjA1NmQ1
+    NWQxZTMxYjE3YmY5NjUwZGQwNjEyZWZiZTBmMzhmZTY2MGQ1YmE=

data/lib/rbbt/tsv/filter.rb

@@ -269,7 +269,7 @@ module Filtered
   end
 
   def size
-    keys.length
+    filters.empty? ? super : filters.collect{|f| f.ids.length }.min
   end
 
 end

data/lib/rbbt/util/semaphore.rb

@@ -63,17 +63,24 @@ void post_semaphore(char* name){
 
   def self.fork_each_on_semaphore(elems, size, file = nil)
     with_semaphore(size, file) do |file|
-      pids = elems.collect do |elem| 
-        Process.fork do 
-          RbbtSemaphore.wait_semaphore(file)
-          begin
-            yield elem
-          ensure
-            RbbtSemaphore.post_semaphore(file)
+      begin
+        pids = elems.collect do |elem| 
+          Process.fork do 
+            RbbtSemaphore.wait_semaphore(file)
+            begin
+              yield elem
+            ensure
+              RbbtSemaphore.post_semaphore(file)
+            end
           end
         end
+        pids.each do |pid| Process.waitpid pid end
+      rescue Exception
+        Log.error "Killing children: #{pids.sort * ", " }"
+        pids.each do |pid| begin Process.kill "INT", pid; rescue; end; RbbtSemaphore.post_semaphore(file) end
+        Log.error "Ensuring children are dead: #{pids.sort * ", " }"
+        pids.each do |pid| begin Process.waitpid pid; rescue; end; end
       end
-      pids.each do |pid| Process.waitpid pid end
     end
   end
 end if continue

metadata

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