perobs 4.4.0 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2c526c97aab15c09f8e8acbcb432203e7d60fef8c504df6ddb0b8f35459cca0
-  data.tar.gz: ad077bb879c041289c7a474e87645064ff84203c674640aff59b5f23923ac1b7
+  metadata.gz: 90c77003da7bd628fa753bfe35918d8c702b433ac5113ba9fc206f7afa114f6c
+  data.tar.gz: c38f786cb10a040048b7d08b75c16baf034c116a3f9648ece3af7b50e7898446
 SHA512:
-  metadata.gz: b86fc662ef8bbf623ee7da777f023a74e3db9502df18c45dcda9ce244982225aaec7e74ce25378147c807775765c57d801810ac16be01d2145227bb0642caa3b
-  data.tar.gz: d0c5a79eb60a1221bc385a1fafbc77a1aaa1e47782b3ea27ca92f5f7c539804bc00a388fdddc1ab956d7805dbdd52d055f5cdd76a8bb155ec5ada4335b7b9175
+  metadata.gz: 1fea934c359190c3b171c99e4dbffb3af58ec2f9dd755eedc0acb7db556f0e2471bd3c527a2910e5d8f17cd59b3f1ca4079436bc80bd11ea5d6efa60f55a54e9
+  data.tar.gz: db71320a9672848a3e35088e7a8b3389278c987a1bea905336e3f8bfff6daeb27564724b6f9d681d364684a57ce8593021041626615dace155e1849b0944003b

data/lib/perobs/BigArrayNode.rb

@@ -135,27 +135,29 @@ module PEROBS
       node = self
 
       # Traverse the tree to find the right node to add or replace the value.
+      idx = index
       while node do
         # Once we have reached a leaf node we can insert or replace the value.
         if node.is_leaf?
-          if index >= node.values.size
+          if idx >= node.values.size
             node.fatal "Set index (#{index}) larger than values array " +
-              "(#{node.values.size})."
+              "(#{idx} >= #{node.values.size})."
           end
-          node.values[index] = value
+          node.values[idx] = value
           return
         else
           # Descend into the right child node to add the value to.
-          cidx = node.search_child_index(index)
-          if (index -= node.offsets[cidx]) < 0
-            node.fatal "Index (#{index}) became negative"
+          cidx = node.search_child_index(idx)
+          if (idx -= node.offsets[cidx]) < 0
+            node.fatal "Idx (#{idx}) became negative while looking for " +
+              "index #{index}."
           end
           node = node.children[cidx]
         end
       end
 
       node.fatal "Could not find proper node to set the value while " +
-        "looking for index #{index}"
+        "looking for index #{index}."
     end
 
     # Insert the given value at the given index. All following values will be
@@ -811,7 +813,7 @@ module PEROBS
 
     # Print and log an error message for the node.
     def fatal(msg)
-      msg = "Fatal error in BigArray node @#{@_id}: #{msg}\n" + @tree.to_s
+      msg = "Fatal error in BigArray node @#{@_id}: #{msg}\n"
       $stderr.puts msg
       PEROBS.log.fatal msg
     end

data/lib/perobs/Cache.rb

@@ -165,10 +165,20 @@ module PEROBS
     # active, the write cache is flushed before the transaction is started.
     def begin_transaction
       if @transaction_stack.empty?
+        if @transaction_thread
+          PEROBS.log.fatal 'transaction_thread must be nil'
+        end
+        @transaction_thread = Thread.current
         # The new transaction is the top-level transaction. Flush the write
         # buffer to save the current state of all objects.
         flush
       else
+        # Nested transactions are currently only supported within the same
+        # thread. If we are in another thread, raise TransactionInOtherThread
+        # to pause the calling thread for a bit.
+        if @transaction_thread != Thread.current
+          raise TransactionInOtherThread
+        end
         # Save a copy of all objects that were modified during the enclosing
         # transaction.
         @transaction_stack.last.each do |id|
@@ -192,6 +202,7 @@ module PEROBS
         # into the backend storage.
         @transaction_stack.pop.each { |id| @transaction_objects[id]._sync }
         @transaction_objects = ::Hash.new
+        @transaction_thread = nil
       else
         # A nested transaction completed successfully. We add the list of
         # modified objects to the list of the enclosing transaction.
@@ -213,6 +224,7 @@ module PEROBS
       @transaction_stack.pop.each do |id|
         @transaction_objects[id]._restore(@transaction_stack.length)
       end
+      @transaction_thread = nil
     end
 
     # Clear all cached entries. You must call flush before calling this
@@ -224,6 +236,7 @@ module PEROBS
       @reads = ::Array.new(2 ** @bits)
       @writes = ::Array.new(2 ** @bits)
       @transaction_stack = ::Array.new
+      @transaction_thread = nil
       @transaction_objects = ::Hash.new
     end
 

data/lib/perobs/Log.rb

@@ -42,6 +42,11 @@ module PEROBS
   # are caused by user error rather than program logic errors.
   class UsageError < StandardError ; end
 
+  # This is the Exception type that will be thrown when a transaction start
+  # failed because there is an ongoing transaction from another thread in
+  # progress.
+  class TransactionInOtherThread < StandardError ; end
+
   # The ILogger class is a singleton that provides a common logging mechanism
   # to all objects. It exposes essentially the same interface as the Logger
   # class, just as a singleton and extends fatal to raise an FatalError

data/lib/perobs/Store.rb

@@ -455,7 +455,21 @@ module PEROBS
     # beginning of the transaction. The exception is passed on to the
     # enclosing scope, so you probably want to handle it accordingly.
     def transaction
-      @lock.synchronize { @cache.begin_transaction }
+      transaction_not_started = true
+      while transaction_not_started do
+        begin
+          @lock.synchronize do
+            @cache.begin_transaction
+            # If we get to this point, the transaction was successfully
+            # started. We can exit the loop.
+            transaction_not_started = false
+          end
+        rescue TransactionInOtherThread
+          # sleep up to 50ms
+          sleep(rand(50) / 1000.0)
+        end
+      end
+
       begin
         yield if block_given?
       rescue => e
@@ -547,7 +561,7 @@ module PEROBS
       # Therefor no locking is needed or even possible. The GC can kick in at
       # any time and we could be anywhere in the code. So there is a small
       # risk for a race here, but it should not have any serious consequences.
-      if @in_memory_objects[id] == ruby_object_id
+      if @in_memory_objects && @in_memory_objects[id] == ruby_object_id
         @in_memory_objects.delete(id)
         @stats[:collected_objects] += 1
       end

data/lib/perobs/version.rb

@@ -1,4 +1,4 @@
 module PEROBS
   # The version number
-  VERSION = "4.4.0"
+  VERSION = "4.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perobs
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler