semian 0.25.3 → 0.25.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6daa64288b6b4677a2abc6f4e547aa72c0cd47696b1b47fd0d7a2116b5a5cc0
-  data.tar.gz: 6fee5050c2d5d3720b22be523303bf23247ecb720361228abf7d1d15f9ed3c65
+  metadata.gz: 7a367c10d728005041ed53354fcd0277fb2b77165abbc908624e8f25428ac3a3
+  data.tar.gz: f41150be77f1125251a6440de9c3b999d23fb599f520f79829d90b243c33d339
 SHA512:
-  metadata.gz: 7bf4baa41c3a9ccfacc8406b15f2bd85c39138593be9318f0712da906f8c816dc94b90d5097603d94b9f341fc8923b8d61854dad5f5197dfcda2dc2050a9d83c
-  data.tar.gz: 55c9dcf87364ca17819475fbcd183f17ad8aadd3b8f32e80ce8cb3bc15a9459a02435c709f7ab057dba1eefb0c6c8e622d87acccc96dec0c493147c05fac5d12
+  metadata.gz: eca3ce48c96d84633d07a0612b15e23ee4e0694344ca135b19425fe6021a825c8685966ea295b02de58378af3c5e9f0e6d818229f3b3830e3b5fc7c8a9fb232c
+  data.tar.gz: ffa1c7ab62ec4e31a2657e9159fbb048bd439437cf5f30fa2eae0366f4aa196596f106212fba2a3739a4301952962a78baebc32882fd8fd0b2ad5bc4ab7dbf9f

data/lib/semian/adapter.rb

@@ -49,8 +49,7 @@ module Semian
       last_error = nil unless last_error.is_a?(Exception) # Net::HTTPServerError is not an exception
       raise self.class::CircuitOpenError.new(semian_identifier, message), cause: last_error
     rescue ::Semian::BaseError => error
-      message = "Semian Resource #{semian_identifier}: #{error.message}"
-      raise self.class::ResourceBusyError.new(semian_identifier, message)
+      raise self.class::ResourceBusyError.new(semian_identifier, error.message)
     rescue *resource_exceptions => error
       error.semian_identifier = semian_identifier if error.respond_to?(:semian_identifier=)
       raise

data/lib/semian/circuit_breaker.rb

@@ -39,7 +39,7 @@ module Semian
     def acquire(resource = nil, &block)
       transition_to_half_open if transition_to_half_open?
 
-      raise OpenCircuitError, "Circuit breaker is open for resource: #{@name}" unless request_allowed?
+      raise OpenCircuitError unless request_allowed?
 
       result = nil
       begin

data/lib/semian/instrumentable.rb

@@ -1,14 +1,22 @@
 # frozen_string_literal: true
 
+require "concurrent-ruby"
+
 module Semian
   module Instrumentable
+    SUBSCRIBERS = Concurrent::Map.new
+
     def subscribe(name = rand, &block)
-      subscribers[name] = block
+      SUBSCRIBERS[name] = block
       name
     end
 
     def unsubscribe(name)
-      subscribers.delete(name)
+      SUBSCRIBERS.delete(name)
+    end
+
+    def subscribers
+      SUBSCRIBERS
     end
 
     # Args:
@@ -18,13 +26,7 @@ module Semian
     #   adapter (string)
     #   payload (optional)
     def notify(*args)
-      subscribers.values.each { |subscriber| subscriber.call(*args) }
-    end
-
-    private
-
-    def subscribers
-      @subscribers ||= {}
+      SUBSCRIBERS.values.each { |subscriber| subscriber.call(*args) }
     end
   end
 end

data/lib/semian/simple_integer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "thread"
+require "concurrent"
 
 module Semian
   module Simple
@@ -26,14 +27,29 @@ module Semian
   end
 
   module ThreadSafe
-    class Integer < Simple::Integer
-      def initialize(*)
-        super
-        @lock = Mutex.new
+    class Integer
+      def initialize
+        @atom = Concurrent::AtomicFixnum.new(0)
+      end
+
+      def value
+        @atom.value
       end
 
-      def increment(*)
-        @lock.synchronize { super }
+      def value=(new_value)
+        @atom.value = new_value
+      end
+
+      def increment(val = 1)
+        @atom.increment(val)
+      end
+
+      def reset
+        @atom.value = 0
+      end
+
+      def destroy
+        reset
       end
     end
   end

data/lib/semian/simple_sliding_window.rb

@@ -1,69 +1,62 @@
 # frozen_string_literal: true
 
 require "thread"
+require "concurrent"
 
 module Semian
-  module Simple
-    class SlidingWindow # :nodoc:
-      extend Forwardable
+  module SlidingWindowBehavior
+    extend Forwardable
 
-      def_delegators :@window, :size, :last, :empty?
-      attr_reader :max_size
+    def_delegators :@window, :size, :last, :empty?
+    attr_reader :max_size
 
-      # A sliding window is a structure that stores the most @max_size recent timestamps
-      # like this: if @max_size = 4, current time is 10, @window =[5,7,9,10].
-      # Another push of (11) at 11 sec would make @window [7,9,10,11], shifting off 5.
+    # A sliding window is a structure that stores the most @max_size recent timestamps
+    # like this: if @max_size = 4, current time is 10, @window =[5,7,9,10].
+    # Another push of (11) at 11 sec would make @window [7,9,10,11], shifting off 5.
 
-      def initialize(max_size:)
-        @max_size = max_size
-        @window = []
-      end
+    def reject!(&block)
+      @window.reject!(&block)
+      self
+    end
 
-      def reject!(&block)
-        @window.reject!(&block)
-      end
+    def push(value)
+      resize_to(@max_size - 1) # make room
+      @window << value
+      self
+    end
+    alias_method :<<, :push
 
-      def push(value)
-        resize_to(@max_size - 1) # make room
-        @window << value
-        self
-      end
-      alias_method :<<, :push
+    def clear
+      @window.clear
+      self
+    end
+    alias_method :destroy, :clear
 
-      def clear
-        @window.clear
-        self
-      end
-      alias_method :destroy, :clear
+    private
+
+    def resize_to(size)
+      @window = @window.last(size) if @window.size >= size
+    end
+  end
 
-      private
+  module Simple
+    class SlidingWindow # :nodoc:
+      include SlidingWindowBehavior
 
-      def resize_to(size)
-        @window = @window.last(size) if @window.size >= size
+      def initialize(max_size:)
+        @max_size = max_size
+        @window = []
       end
     end
   end
 
   module ThreadSafe
-    class SlidingWindow < Simple::SlidingWindow
-      def initialize(**)
-        super
-        @lock = Mutex.new
-      end
-
-      # #size, #last, and #clear are not wrapped in a mutex. For the first two,
-      # the worst-case is a thread-switch at a timing where they'd receive an
-      # out-of-date value--which could happen with a mutex as well.
-      #
-      # As for clear, it's an all or nothing operation. Doesn't matter if we
-      # have the lock or not.
-
-      def reject!(*)
-        @lock.synchronize { super }
-      end
+    class SlidingWindow
+      include SlidingWindowBehavior
 
-      def push(*)
-        @lock.synchronize { super }
+      def initialize(max_size:)
+        @max_size = max_size
+        @window = Concurrent::Array.new
       end
     end
   end

data/lib/semian/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Semian
-  VERSION = "0.25.3"
+  VERSION = "0.25.5"
 end

data/lib/semian.rb

@@ -4,6 +4,7 @@ require "forwardable"
 require "logger"
 require "weakref"
 require "thread"
+require "concurrent-ruby"
 
 require "semian/version"
 require "semian/instrumentable"
@@ -103,13 +104,30 @@ module Semian
   OpenCircuitError = Class.new(BaseError)
   SemaphoreMissingError = Class.new(BaseError)
 
-  attr_accessor :maximum_lru_size, :minimum_lru_time, :default_permissions, :namespace, :default_force_config_validation
+  attr_accessor :maximum_lru_size, :minimum_lru_time, :default_permissions, :namespace, :default_force_config_validation, :resources, :consumers
 
   self.maximum_lru_size = 500
   self.minimum_lru_time = 300 # 300 seconds / 5 minutes
   self.default_permissions = 0660
   self.default_force_config_validation = false
 
+  # We only allow disabling thread-safety for parts of the code that are on the hot path.
+  # Since locking there could have a significant impact. Everything else is enforced thread safety
+  def thread_safe?
+    return @thread_safe if defined?(@thread_safe)
+
+    @thread_safe = true
+  end
+
+  def thread_safe=(thread_safe)
+    @thread_safe = thread_safe
+  end
+
+  self.resources = LRUHash.new
+  self.consumers = Concurrent::Map.new
+
+  @reset_mutex = Mutex.new
+
   def issue_disabled_semaphores_warning
     return if defined?(@warning_issued)
 
@@ -200,7 +218,7 @@ module Semian
     # of who the consumer was so that we can clear the resource reference if needed.
     consumer = args.delete(:consumer)
     if consumer&.class&.include?(Semian::Adapter) && !args[:dynamic]
-      consumer_set = (consumers[name] ||= ObjectSpace::WeakMap.new)
+      consumer_set = consumers.compute_if_absent(name) { ObjectSpace::WeakMap.new }
       consumer_set[consumer] = true
     end
     self[name] || register(name, **args)
@@ -233,7 +251,7 @@ module Semian
     resource = resources.delete(name)
     if resource
       resource.bulkhead&.unregister_worker
-      consumers_for_resource = consumers.delete(name) || {}
+      consumers_for_resource = consumers.delete(name) || ObjectSpace::WeakMap.new
       consumers_for_resource.each_key(&:clear_semian_resource)
     end
   end
@@ -245,29 +263,11 @@ module Semian
     end
   end
 
-  # Retrieves a hash of all registered resources.
-  def resources
-    @resources ||= LRUHash.new
-  end
-
-  # Retrieves a hash of all registered resource consumers.
-  def consumers
-    @consumers ||= {}
-  end
-
   def reset!
-    @consumers = {}
-    @resources = LRUHash.new
-  end
-
-  def thread_safe?
-    return @thread_safe if defined?(@thread_safe)
-
-    @thread_safe = true
-  end
-
-  def thread_safe=(thread_safe)
-    @thread_safe = thread_safe
+    @reset_mutex.synchronize do
+      self.consumers = Concurrent::Map.new
+      self.resources = LRUHash.new
+    end
   end
 
   THREAD_BULKHEAD_DISABLED_VAR = :semian_bulkheads_disabled

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.25.3
+  version: 0.25.5
 platform: ruby
 authors:
 - Scott Francis