semian 0.25.2 → 0.26.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e593c50ac71b0fe4e26c25eb90881c8490e6ac51597b1a788c03758587d399d9
-  data.tar.gz: e0df4b912b506e6efb538b5fe683428a120a4035eb7d9fe6d3b9f4f9eeb6c439
+  metadata.gz: c745b1aaf79e752138bf6cbfcff3e218022dfbaac8b3f6adba3dd9bd4091bbee
+  data.tar.gz: 03e8d192ffd5e7b86aadb3b87ad9846e4d0cc18724d67a14e72c35949a11e3f6
 SHA512:
-  metadata.gz: 30a526607092b64545700c820b3767cb8ab0b4dd003557a0accb40c563e422c76a09f9a23f64c8b80b31422e9de70e8e63a696c87000abcb717f4f508d8e72a7
-  data.tar.gz: 424a227d4565cfe851f2148eb41aa3a1e246ebe5f30bd29fef18639beccdda02259637177368357e0260e61abeb9186be339c751550a597cb5607f81ac53d419
+  metadata.gz: afa858cd11acdf8047f6dd38850419927915ff87b6dfeabd820ffa888b269aafc67415cce0a85543e3d49562b733a01ea8b22fd46c6b5fc24374236a333cf0ef
+  data.tar.gz: 9a087827f9abaefa6bdcdda853b3423e9a19fe9e0b6a35c2cea8650266857713ffeea39136560a6ed1f763940ff9f28868bcbb9e95aa84cac91764229cb2dfdb

data/lib/semian/configuration_validator.rb

@@ -7,12 +7,6 @@ module Semian
       @configuration = configuration
       @adapter = configuration[:adapter]
       @force_config_validation = force_config_validation?
-
-      unless @force_config_validation
-        Semian.logger.info(
-          "Semian is running in log-mode for configuration validation. This means that Semian will not raise an error if the configuration is invalid. This is not recommended for production environments.\n\n[IMPORTANT] PLEASE UPDATE YOUR CONFIGURATION TO USE `force_config_validation: true` TO ENABLE STRICT CONFIGURATION VALIDATION.\n---\n",
-        )
-      end
     end
 
     def validate!
@@ -29,6 +23,7 @@ module Semian
     end
 
     def raise_or_log_validation_required!(message)
+      message = "Semian Resource #{@name}: #{message}"
       if @force_config_validation
         raise ArgumentError, message
       else

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/redis_client.rb

@@ -126,6 +126,7 @@ module Semian
 
   module RedisClientPool
     include RedisClientCommon
+
     define_method(:semian_resource, Semian::Adapter.instance_method(:semian_resource))
     define_method(:clear_semian_resource, Semian::Adapter.instance_method(:clear_semian_resource))
   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.2"
+  VERSION = "0.26.6"
 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"
@@ -110,6 +111,20 @@ module Semian
   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
+
+  @reset_mutex = Mutex.new
+
   def issue_disabled_semaphores_warning
     return if defined?(@warning_issued)
 
@@ -199,9 +214,9 @@ module Semian
     # If consumer who retrieved / registered by a Semian::Adapter, keep track
     # 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)
-      consumers[name] ||= []
-      consumers[name] << WeakRef.new(consumer)
+    if consumer&.class&.include?(Semian::Adapter) && !args[:dynamic]
+      consumer_set = consumers.compute_if_absent(name) { ObjectSpace::WeakMap.new }
+      consumer_set[consumer] = true
     end
     self[name] || register(name, **args)
   end
@@ -233,14 +248,8 @@ module Semian
     resource = resources.delete(name)
     if resource
       resource.bulkhead&.unregister_worker
-      consumers_for_resource = consumers.delete(name) || []
-      consumers_for_resource.each do |consumer|
-        if consumer.weakref_alive?
-          consumer.clear_semian_resource
-        end
-      rescue WeakRef::RefError
-        next
-      end
+      consumers_for_resource = consumers.delete(name) || ObjectSpace::WeakMap.new
+      consumers_for_resource.each_key(&:clear_semian_resource)
     end
   end
 
@@ -251,29 +260,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
+      @consumers = Concurrent::Map.new
+      @resources = LRUHash.new
+    end
   end
 
   THREAD_BULKHEAD_DISABLED_VAR = :semian_bulkheads_disabled
@@ -291,6 +282,22 @@ module Semian
     thread.thread_variable_set(THREAD_BULKHEAD_DISABLED_VAR, old_value)
   end
 
+  def resources
+    return @resources if defined?(@resources) && @resources
+
+    @reset_mutex.synchronize do
+      @resources ||= LRUHash.new
+    end
+  end
+
+  def consumers
+    return @consumers if defined?(@consumers) && @consumers
+
+    @reset_mutex.synchronize do
+      @consumers ||= Concurrent::Map.new
+    end
+  end
+
   private
 
   def create_circuit_breaker(name, **options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.26.6
 platform: ruby
 authors:
 - Scott Francis
@@ -10,7 +10,21 @@ authors:
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       A Ruby C extention that is used to control access to shared resources
       across process boundaries with SysV semaphores.
@@ -78,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Bulkheading for Ruby with SysV semaphores
 test_files: []