rbbt-util 5.13.14 → 5.13.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5399e9cd15518ddd19400ba2cf089758cb0e60d2
-  data.tar.gz: 8adfd1f1ec5293cfcd1aa4749ed8ba84aba078c4
+  metadata.gz: 1433dd5623914600b8afbbea35540e0d63878d80
+  data.tar.gz: 97f4771293edb91ef2148112cb9205e53beb80ed
 SHA512:
-  metadata.gz: 132f5a6172cd496d7cadc66affcfc73251fc35b73f1cf458521d08726f766597957d095d029ddc6f3a14cb6f880599ba6576a6c91fbee2fcda7bbde8919c1ca9
-  data.tar.gz: 3cd484b4a5cdf42edae4d19698f8ee780812785d033ccac47b26e9f326fbe5413c977f922344d59a1b715ed703fdfe48a0cce494f312c2f7047281532afedbc5
+  metadata.gz: 579ae60be7d927a9074f246d163c6afa13495d6f1d499577c7d3e11ee6c516ada13d1b5c877f5d937a59f4d2f7f720a6820d53f2e7eacd4788af26ff28c14644
+  data.tar.gz: 2a6b66e90b23530d6563322539f27c1634f5483bcd245177154a466b68596c5c5e7821deec972a609d21b524f9c6d2c4ac71fc212cbbad0c4de349de2a3ea851

data/lib/rbbt/util/semaphore.rb

@@ -22,7 +22,7 @@ module RbbtSemaphore
 
     builder.c_singleton <<-EOF
 void create_semaphore(char* name, int value){
-  sem_open(name, O_CREAT, S_IRWXU, value);
+  sem_open(name, O_CREAT, S_IRWXU|S_IRWXG|S_IRWXO, value);
 }
     EOF
     builder.c_singleton <<-EOF
@@ -34,7 +34,7 @@ void delete_semaphore(char* name){
     builder.c_singleton <<-EOF
 void wait_semaphore(char* name){
   sem_t* sem;
-  sem = sem_open(name, O_EXCL);
+  sem = sem_open(name, 0);
   sem_wait(sem);
   sem_close(sem);
 }
@@ -43,29 +43,35 @@ void wait_semaphore(char* name){
     builder.c_singleton <<-EOF
 void post_semaphore(char* name){
   sem_t* sem;
-  sem = sem_open(name, O_EXCL);
+  sem = sem_open(name, 0);
   sem_post(sem);
   sem_close(sem);
 }
     EOF
   end
 
+  SEM_MUTEX = Mutex.new
   def self.synchronize(sem)
-    RbbtSemaphore.wait_semaphore(sem)
+    SEM_MUTEX.synchronize do
+      RbbtSemaphore.wait_semaphore(sem)
+    end
     begin
       yield
     ensure
-      RbbtSemaphore.post_semaphore(sem)
+      SEM_MUTEX.synchronize do
+        RbbtSemaphore.post_semaphore(sem)
+      end
     end
   end
 
   def self.with_semaphore(size, file = nil)
-    file = Misc.digest(rand.to_s) if file.nil?
+    file = "/" << Misc.digest(rand(1000000000000).to_s) if file.nil?
     file.gsub!('/', '_')
     begin
       RbbtSemaphore.create_semaphore(file, size)
       yield file
     ensure
+      Log.error "Removing semaphore #{ file }"
       RbbtSemaphore.delete_semaphore(file)
     end
   end

data/share/rbbt_commands/tsv/info

@@ -44,6 +44,7 @@ else
 
   puts "File: #{ file }"
   puts "Type: #{header.type}"
+  puts "Namespace: #{header.namespace}"
   puts "Key: #{Log.color :yellow, header.key_field}"
   puts "Fields: "
   if header.fields.nil?

data/test/rbbt/util/test_semaphore.rb

@@ -2,7 +2,26 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../..', 'test_helpe
 require 'rbbt/util/semaphore'
 
 class TestRbbtSemaphore < Test::Unit::TestCase
-  def test_thread
+  def test_process
+    RbbtSemaphore.with_semaphore(10) do |s|
+      pids = []
+      100.times do 
+        pids << Process.fork do
+          100.times do
+            RbbtSemaphore.wait_semaphore(s)
+            sleep 0.001
+            puts '.'
+            RbbtSemaphore.post_semaphore(s)
+          end
+        end
+      end
+      pids.each do |pid|
+        Process.waitpid pid
+      end
+    end
+  end
+
+  def _test_thread
     times = 50
     TmpFile.with_file do |dir|
       Path.setup(dir)

metadata

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