farce 0.4.1-java → 0.5.0-java

data/lib/farce/config.rb

@@ -36,6 +36,40 @@ module Farce
     # Can also be set via `FARCE_ADDITIONAL_THREAD_POOL_SIZE`. Defaults to 2.
     attr_reader :additional_thread_pool_size
 
+    # Minimum workers retained by {Farce.in_parallel} on CRuby. Defaults to 0.
+    # Configure before the first scheduler is created. Ignored on JRuby and TruffleRuby.
+    # @return [Integer]
+    attr_reader :parallel_pool_min_size
+
+    # Maximum workers used by {Farce.in_parallel} on CRuby.
+    # Defaults to nil, which uses {System.cpu_count} when the pool is created.
+    # @return [Integer, nil]
+    attr_reader :parallel_pool_max_size
+
+    # Soft task limit for each worker in {Farce.in_parallel}'s CRuby pool.
+    # Defaults to 64. Set to nil to disable the limit.
+    # @return [Integer, nil]
+    attr_reader :parallel_pool_max_inflight
+
+    # Queue wait in seconds before {Farce.in_parallel}'s CRuby pool adds a worker.
+    # Defaults to 0.005.
+    # @return [Float]
+    attr_reader :parallel_pool_grow_after
+
+    # Idle time in seconds before an extra worker in {Farce.in_parallel}'s CRuby pool retires.
+    # Defaults to 30. Set to nil to disable idle retirement.
+    # @return [Float, nil]
+    attr_reader :parallel_pool_shrink_after
+
+    # Pending-task capacity of {Farce.in_parallel}'s CRuby pool.
+    # Defaults to 1024. Set to nil for an unbounded queue.
+    # @return [Integer, nil]
+    attr_reader :parallel_pool_capacity
+
+    PARALLEL_POOL_DEFAULTS = { max_size: nil, min_size: 0, max_inflight: 64,
+                               grow_after: 0.005, shrink_after: 30, capacity: 1024 }.freeze
+    private_constant :PARALLEL_POOL_DEFAULTS
+
     # @yield [config] block to modify the configuration
     # @yieldparam config [Config] the configuration object to configure
     def initialize
@@ -44,21 +78,29 @@ module Farce
       self.fiber_scheduler       = ENV["FARCE_FIBER_SCHEDULER"] unless instance_variable_defined?(:@fiber_scheduler)
       self.main_thread_pool_size       ||= ENV.fetch("FARCE_MAIN_THREAD_POOL_SIZE", 4)
       self.additional_thread_pool_size ||= ENV.fetch("FARCE_ADDITIONAL_THREAD_POOL_SIZE", 2)
+      initialize_parallel_pool
     end
 
     # @api private
     def marshal_dump
-      [1, autoload_integrations, fiber_scheduler, main_thread_pool_size, additional_thread_pool_size, frozen?]
+      [1, autoload_integrations, fiber_scheduler, main_thread_pool_size, additional_thread_pool_size,
+       parallel_pool_options, frozen?]
     end
 
     # @api private
     def marshal_load(data)
-      autoload, scheduler, main_size, additional_size, frozen = Internal::MarshalSupport.payload(data, 5)
+      if data.is_a?(Array) && data.length == 6
+        autoload, scheduler, main_size, additional_size, frozen = Internal::MarshalSupport.payload(data, 5)
+        options = {}
+      else
+        autoload, scheduler, main_size, additional_size, options, frozen = Internal::MarshalSupport.payload(data, 6)
+      end
 
       self.autoload_integrations        = autoload
       self.fiber_scheduler              = scheduler
       self.main_thread_pool_size        = main_size
       self.additional_thread_pool_size  = additional_size
+      initialize_parallel_pool(options)
       freeze if frozen
     end
 
@@ -149,6 +191,45 @@ module Farce
       @additional_thread_pool_size = normalize_thread_pool_size(value)
     end
 
+    # Sets a non-negative minimum worker count for the shared parallel pool.
+    # It must not exceed an explicitly configured maximum.
+    def parallel_pool_min_size=(value)
+      value = normalize_parallel_pool_size(value, :min_size, minimum: 0)
+      if parallel_pool_max_size && value > parallel_pool_max_size
+        raise ArgumentError, "parallel pool min_size must not exceed max_size"
+      end
+      @parallel_pool_min_size = value
+    end
+
+    # Sets a positive maximum worker count, or nil to use the CPU count.
+    def parallel_pool_max_size=(value)
+      value = normalize_parallel_pool_size(value, :max_size, nil_allowed: true)
+      if value && parallel_pool_min_size && value < parallel_pool_min_size
+        raise ArgumentError, "parallel pool min_size must not exceed max_size"
+      end
+      @parallel_pool_max_size = value
+    end
+
+    # Sets a positive soft task limit per worker, or nil to disable it.
+    def parallel_pool_max_inflight=(value)
+      @parallel_pool_max_inflight = normalize_parallel_pool_size(value, :max_inflight, nil_allowed: true)
+    end
+
+    # Sets a finite, non-negative queue wait before growing the pool.
+    def parallel_pool_grow_after=(value)
+      @parallel_pool_grow_after = normalize_parallel_pool_duration(value, :grow_after)
+    end
+
+    # Sets a finite, non-negative idle timeout, or nil to disable retirement.
+    def parallel_pool_shrink_after=(value)
+      @parallel_pool_shrink_after = normalize_parallel_pool_duration(value, :shrink_after, nil_allowed: true)
+    end
+
+    # Sets a positive pending-task capacity, or nil for an unbounded queue.
+    def parallel_pool_capacity=(value)
+      @parallel_pool_capacity = normalize_parallel_pool_size(value, :capacity, nil_allowed: true)
+    end
+
     # Called internally once the configuration is applied.
     def freeze
       return self if frozen?
@@ -159,6 +240,35 @@ module Farce
 
     private
 
+    def initialize_parallel_pool(options = {})
+      PARALLEL_POOL_DEFAULTS.each do |name, default|
+        next if instance_variable_defined?(:"@parallel_pool_#{name}")
+        public_send(:"parallel_pool_#{name}=", options.fetch(name, default))
+      end
+    end
+
+    def parallel_pool_options
+      PARALLEL_POOL_DEFAULTS.to_h { |name, _| [name, public_send(:"parallel_pool_#{name}")] }
+    end
+
+    def normalize_parallel_pool_size(value, name, minimum: 1, nil_allowed: false)
+      return if value.nil? && nil_allowed
+      value = Integer(value, 10) if value.is_a?(String)
+      unless value.is_a?(Integer) && value >= minimum
+        raise ArgumentError, "parallel pool #{name} must be an integer >= #{minimum}"
+      end
+      value
+    end
+
+    def normalize_parallel_pool_duration(value, name, nil_allowed: false)
+      return if value.nil? && nil_allowed
+      value = Float(value)
+      raise ArgumentError unless value.finite? && value >= 0
+      value
+    rescue ArgumentError, TypeError
+      raise ArgumentError, "parallel pool #{name} must be finite and non-negative"
+    end
+
     def normalize_thread_pool_size(value)
       size = value.is_a?(String) ? Integer(value, 10) : value
       raise ArgumentError, "thread pool size must be a positive integer" unless size.is_a?(Integer) && size.positive?

data/lib/farce/counter.rb

@@ -13,22 +13,6 @@ module Farce
   #
   # On CRuby, subclasses must not add Ruby instance variables.
   #
-  # @!method initial
-  #   @return [Integer] The initial value retained by reset and copies.
-  #
-  # @!method value
-  #   @return [Integer] The current value of the counter.
-  #
-  # @!method increment(by = 1)
-  #   Increment the counter by the given amount (default is 1).
-  #   @param [Numeric, String, #to_int] by The amount, converted to an Integer.
-  #   @return [self] Returns self for chaining.
-  #
-  # @!method decrement(by = 1)
-  #   Decrement the counter by the given amount (default is 1).
-  #   @param [Numeric, String, #to_int] by The amount, converted to an Integer.
-  #   @return [self] Returns self for chaining.
-  #
   # @example Cross-Ractor counting
   #   counter = Farce::Counter.new
   #   counter.value # => 0

data/lib/farce/engine/jruby/map.rb

@@ -28,7 +28,8 @@ module Farce
         end
 
         def eql?(other)
-          result = other.is_a?(Key) && value.eql?(other.value)
+          result = other.is_a?(Key) &&
+            (BASIC_OBJECT_EQUAL_METHOD.bind_call(value, other.value) || value.eql?(other.value))
           owner = mutation_owner || (other.mutation_owner if other.is_a?(Key))
           Internal::Freeze.check(owner) if owner
           result
@@ -218,11 +219,11 @@ module Farce
       # Yield presence and value under the key reservation.
       # MAP_KEEP and MAP_DELETE are control results. Other results replace the value.
       # Return whether a change committed.
-      def modify(key) # rubocop:disable Naming/PredicateMethod
+      def modify(key, timeout: nil)
         raise LocalJumpError, "no block given" unless block_given?
         check_frozen!
         wrapped = wrap_key(key)
-        _, result = with_mutating_key_operation(wrapped, nil) do |reservation|
+        completed, result = with_mutating_key_operation(wrapped, timeout_deadline(timeout)) do |reservation|
           present, current = native_operation { [concurrent_key?(wrapped), concurrent_get(wrapped)] }
           value = yield(present, current)
           next false if MAP_KEEP.equal?(value)
@@ -235,7 +236,7 @@ module Farce
             changed!
           end
         end
-        !!result
+        completed && !!result
       end
 
       def upsert(key, initial_value, timeout: nil)
@@ -429,7 +430,8 @@ module Farce
             native_operation { concurrent_get(wrapped) }
           end
           return fallback&.call unless completed
-          ready = non_nil ? !current.nil? : !values_equal?(current, expected)
+          ready = non_nil ? !current.nil? :
+            Internal.value_changed?(current, expected, compare_values_by_identity?)
           return current if ready
           return fallback&.call unless wait_for_signal(@change_signal, generation, deadline)
         end
@@ -438,7 +440,7 @@ module Farce
       def wait_for_signal(signal, generation, deadline)
         return signal.wait(generation) unless deadline
 
-        remaining = deadline - Clock.now
+        remaining = Clock.remaining(deadline)
         return false unless remaining.positive?
         !signal.wait(generation, timeout: remaining).nil?
       end

data/lib/farce/engine/jruby/signal.rb

@@ -90,7 +90,7 @@ module Farce
             current = generation
             return current unless current == observed
 
-            remaining = deadline - Clock.now if deadline
+            remaining = Clock.remaining(deadline)
             return yield if remaining && !remaining.positive?
 
             # Java Phaser waits do not deliver Ruby cancellation until they return.
@@ -131,7 +131,7 @@ module Farce
           current = generation
           return current unless current == observed
 
-          remaining = deadline - Clock.now if deadline
+          remaining = Clock.remaining(deadline)
           return yield if remaining && !remaining.positive?
 
           scheduler.io_wait(reader, READABLE, remaining)

data/lib/farce/engine/jvm/priority_queue.rb

@@ -61,11 +61,11 @@ module Farce
         native_signal = signal if RUBY_ENGINE == "jruby" &&
           JVMContainers.identical?(JVMContainers::OBJECT_CLASS_METHOD.bind_call(signal), Signal)
         core = JVMExtension::PriorityQueue.new(COMPARATOR, SNAPSHOT, IDENTITY, EQUAL,
-          IDENTICAL, MATCH, committer, SCHEDULED, java_capacity, native_signal, track_age ? true : false)
+          IDENTICAL, MATCH, committer, SCHEDULED, java_capacity, Box.new(parsed_capacity), native_signal,
+          track_age ? true : false)
         INITIALIZATION_LOCK.synchronize do
           Thread.handle_interrupt(INTERRUPT_MASK) do
             check_initialization
-            @capacity = parsed_capacity
             @core = core
             JVMContainers.freeze_object(self)
           end
@@ -112,8 +112,18 @@ module Farce
       def empty? = size.zero?
 
       def capacity
-        storage
-        @capacity
+        storage.getCapacity.value
+      rescue JVMExtension::QueueFailure => e
+        raise_failure(e)
+      end
+
+      def capacity=(value)
+        value = normalize_capacity(value)
+        java_capacity = value ? [value, JAVA_CAPACITY_MAX].min : 0
+        storage.setCapacity(java_capacity, Box.new(value))
+        value
+      rescue JVMExtension::QueueFailure => e
+        raise_failure(e)
       end
 
       def closed?

data/lib/farce/engine/ruby/shared/parallel_scheduler.rb

@@ -4,6 +4,14 @@
 
 module Farce
   module Internal # :nodoc: all
-    ParallelScheduler = Pool.new(max_size: System.cpu_count)
+    config = FROZEN_CONFIG
+    ParallelScheduler = Pool.new(
+      min_size:     config.parallel_pool_min_size,
+      max_size:     config.parallel_pool_max_size || System.cpu_count,
+      max_inflight: config.parallel_pool_max_inflight,
+      grow_after:   config.parallel_pool_grow_after,
+      shrink_after: config.parallel_pool_shrink_after,
+      capacity:     config.parallel_pool_capacity,
+    )
   end
 end

data/lib/farce/engine/ruby/shared/ractor_selector.rb

@@ -125,10 +125,7 @@ module Farce
         command(:add, request)
         request.ready&.pop
 
-        if deadline
-          remaining = deadline - Clock.now
-          remaining = 0 if remaining.negative?
-        end
+        remaining = Clock.remaining(deadline)
 
         delivery = request.reply.pop(timeout: remaining)
         if delivery

data/lib/farce/engine/ruby/shared/weak_map.rb

@@ -134,17 +134,19 @@ module Farce
       # Yield presence and value under the entry claim.
       # MAP_KEEP and MAP_DELETE are control results. Other results replace the value.
       # Return whether a change committed.
-      def modify(key)
+      def modify(key, timeout: nil)
         raise LocalJumpError, "no block given" unless block_given?
         check_frozen!
         key = canonical_key(key)
+        deadline = timeout_deadline(timeout)
         ticket = Object.new.freeze
         sent = finished = false
         begin
-          response = await_response(deadline: nil) do
+          response = await_response(deadline:) do
             sent = true
             request(:claim, key, ticket, true)
           end
+          return false if response.equal?(TIMED_OUT)
           present, current, signal = response[1], response[2], response[3]
           owners = claim_owners
           owners[signal] = Fiber.current
@@ -306,7 +308,7 @@ module Farce
 
           signal, generation = response[1], response[2]
           reject_recursive_wait!(signal)
-          timeout = remaining_timeout(deadline)
+          timeout = Clock.remaining(deadline)
           if timeout&.zero?
             return TIMED_OUT if checked_after_timeout
             checked_after_timeout = true
@@ -332,11 +334,13 @@ module Farce
           key     = response[5] if response.first == :ok
           present = response.first == :ok && response[1]
           current = present ? response[2] : nil
-          return current if non_nil ? !current.nil? : !values_equal?(current, expected)
+
+          return current if non_nil ? !current.nil? :
+            Internal.value_changed?(current, expected, compare_values_by_identity?)
 
           signal = response.first == :ok ? response[3] : response[1]
           generation = response.first == :ok ? response[4] : response[2]
-          changed = signal.wait_until_changed(generation, timeout: remaining_timeout(deadline)) { TIMED_OUT }
+          changed = signal.wait_until_changed(generation, timeout: Clock.remaining(deadline)) { TIMED_OUT }
           if changed.equal?(TIMED_OUT)
             return fallback&.call if checked_after_timeout
             checked_after_timeout = true
@@ -381,13 +385,6 @@ module Farce
         Clock.now + timeout
       end
 
-      def remaining_timeout(deadline)
-        return unless deadline
-
-        remaining = deadline - Clock.now
-        remaining.positive? ? remaining : 0
-      end
-
       def validate_boolean(value, name)
         return if value.equal?(true) || value.equal?(false)
         raise ArgumentError, "#{name} must be true or false"

data/lib/farce/engine/shared/exchanger.rb

@@ -77,7 +77,7 @@ module Farce
       def wait_with_condition(waiter, deadline)
         @mutex.synchronize do
           until waiter.matched
-            remaining = deadline - Clock.now if deadline
+            remaining = Clock.remaining(deadline)
             return cancel(waiter) if remaining && !remaining.positive?
             waiter.condition.wait(@mutex, remaining)
           end
@@ -91,7 +91,7 @@ module Farce
             if waiter.matched
               [nil, waiter.received]
             else
-              remaining = deadline - Clock.now if deadline
+              remaining = Clock.remaining(deadline)
               remaining && !remaining.positive? ? [nil, cancel(waiter)] : [WAITING, remaining]
             end
           end

data/lib/farce/engine/shared/queue.rb

@@ -9,17 +9,56 @@ module Farce
       include Freeze::Unfreezable
 
       NIL_VALUE = Object.new.freeze
-      attr_reader :capacity
 
       def initialize(capacity: 1024, track_age: false)
         @queue     = capacity ? Thread::SizedQueue.new(capacity) : Thread::Queue.new
-        @capacity  = capacity
         @signal    = Signal.new
         @tracking  = track_age ? { lock: Mutex.new, timestamps: [], generation: 0 } : nil
-        @lifecycle = { lock: Mutex.new, hard_closed: false }
+        @lifecycle = { lock: Mutex.new, hard_closed: false, token: nil, generation: -1 }
         Freeze.publish(self)
       end
 
+      def capacity = @queue.is_a?(Thread::SizedQueue) ? @queue.max : nil
+
+      def capacity=(value)
+        value = Integer(value) unless value.nil?
+        raise ArgumentError, "capacity must be positive or nil" if value && !value.positive?
+        if value.nil? != capacity.nil?
+          raise ArgumentError, "cannot switch between bounded and unbounded queues on this Ruby engine"
+        end
+        @queue.max = value if value
+        broadcast
+        value
+      end
+
+      def interrupt(token, generation)
+        @lifecycle[:lock].synchronize do
+          return self if generation <= @lifecycle[:generation]
+          @lifecycle[:token] = token
+          @lifecycle[:generation] = generation
+        end
+        broadcast
+        self
+      end
+
+      def pop_interruptible(token, timeout)
+        timeout_at = timeout_at(timeout)
+        loop do
+          return false unless @lifecycle[:lock].synchronize { @lifecycle[:token].equal?(token) }
+          begin
+            result = tracked_pop
+            raise ThreadError if nil.equal?(result) && @queue.closed?
+            broadcast
+            return NIL_VALUE.equal?(result) ? nil : result
+          rescue ThreadError
+            ready = wait(remaining_timeout(timeout_at)) do
+              !@lifecycle[:lock].synchronize { @lifecycle[:token].equal?(token) } || size.positive?
+            end
+            return block_given? ? yield : nil unless ready
+          end
+        end
+      end
+
       def pop(timeout: nil)
         timeout_at = timeout_at(timeout)
         # Observing an empty queue is sufficient for a nonblocking miss. Avoid
@@ -223,8 +262,7 @@ module Farce
       def remaining_timeout(timeout_at)
         return unless timeout_at
         return 0 if timeout_at.zero?
-        timeout = timeout_at - Clock.now
-        timeout.positive? ? timeout : 0
+        Clock.remaining(timeout_at)
       end
 
       def broadcast = @signal.broadcast

data/lib/farce/engine/shared/ractor_selector.rb

@@ -61,7 +61,7 @@ module Farce
             result = port.select_receive
             return result if result
           end
-          remaining = deadline - Clock.now if deadline
+          remaining = Clock.remaining(deadline)
           return if remaining && !remaining.positive?
           return unless ReservationWaiting.wait(wakeup, generation, deadline)
         end

data/lib/farce/engine/shared/strict_map.rb

@@ -67,6 +67,11 @@ module Farce
         super(check_key(key), **) { |value| check_value(yield(value)) }
       end
 
+      def modify(key, **)
+        raise LocalJumpError, "no block given" unless block_given?
+        super(check_key(key), **) { |present, value| check_value(yield(present, value)) }
+      end
+
       def upsert(key, initial, **)
         raise LocalJumpError, "no block given" unless block_given?
         super(check_key(key), check_value(initial), **) { |value| check_value(yield(value)) }

data/lib/farce/engine/shared/unshared_atom.rb

@@ -129,7 +129,7 @@ module Farce
 
         loop do
           current, version = @mutex.synchronize { [@value, @version] }
-          return current unless values_equal?(current, expected)
+          return current if Internal.value_changed?(current, expected, compare_by_identity?)
 
           result = @mutex.synchronize do
             next unless @version == version

data/lib/farce/engine/shared/unshared_vector.rb

@@ -274,12 +274,12 @@ module Farce
         finish_update if completed
       end
 
-      def wait_until_changed(index, expected, timeout: nil)
-        wait_for_value(convert_index(index), expected, timeout_deadline(timeout), non_nil: false)
+      def wait_until_changed(index, expected, timeout: nil, &fallback)
+        wait_for_value(convert_index(index), expected, timeout_deadline(timeout), fallback, non_nil: false)
       end
 
       def wait_until_non_nil(index, timeout: nil)
-        wait_for_value(convert_index(index), nil, timeout_deadline(timeout), non_nil: true)
+        wait_for_value(convert_index(index), nil, timeout_deadline(timeout), nil, non_nil: true)
       end
 
       def compare_by_identity? = @compare_by_identity
@@ -341,20 +341,21 @@ module Farce
         raise FrozenError.new("can't modify frozen #{self.class}", receiver: self)
       end
 
-      def wait_for_value(index, expected, deadline, non_nil:)
+      def wait_for_value(index, expected, deadline, fallback, non_nil:)
         while true
           generation = @signal.generation
           current    = @mutex.synchronize { @values[index] }
-          ready      = non_nil ? !current.nil? : !values_equal?(current, expected)
+          ready      = non_nil ? !current.nil? :
+            Internal.value_changed?(current, expected, compare_by_identity?)
           return current if ready
-          return unless wait_for_signal(generation, deadline)
+          return fallback&.call unless wait_for_signal(generation, deadline)
         end
       end
 
       def wait_for_signal(generation, deadline)
         return @signal.wait(generation) unless deadline
 
-        remaining = deadline - Clock.now
+        remaining = Clock.remaining(deadline)
         return false unless remaining.positive?
         !@signal.wait(generation, timeout: remaining).nil?
       end

data/lib/farce/engine/shared/unshared_weak_map.rb

@@ -145,10 +145,11 @@ module Farce
       # Yield presence and value under the entry reservation.
       # MAP_KEEP and MAP_DELETE are control results. Other results replace the value.
       # Return whether a change committed.
-      def modify(key) # rubocop:disable Naming/PredicateMethod
+      def modify(key, timeout: nil)
         raise LocalJumpError, "no block given" unless block_given?
         check_frozen!
-        _, result = with_entry(key, nil, create: true, mutating: true) do |present, current, entry, index|
+        deadline = timeout_deadline(timeout)
+        completed, result = with_entry(key, deadline, create: true, mutating: true) do |present, current, entry, index|
           value = yield(present, current)
           check_frozen!
           if MAP_KEEP.equal?(value)
@@ -161,7 +162,7 @@ module Farce
             entry.store(value)
           end
         end
-        !!result
+        completed && !!result
       end
 
       def wait_until_changed(key, expected, timeout: nil, &fallback)
@@ -352,7 +353,7 @@ module Farce
           return fallback&.call if timed_out == :timed_out
 
           unless entry
-            return nil unless values_equal?(nil, expected)
+            return nil if Internal.value_changed?(nil, expected, compare_values_by_identity?)
             return fallback&.call unless signal_changed?(@index.change_signal, observed, deadline)
             next
           end
@@ -373,13 +374,14 @@ module Farce
           # lookup object. Otherwise GC could orphan the entry's change signal.
           key     = stored_key
           current = nil unless present
-          return current if non_nil ? !current.nil? : !values_equal?(current, expected)
+          return current if non_nil ? !current.nil? :
+            Internal.value_changed?(current, expected, compare_values_by_identity?)
           return fallback&.call unless entry.wait_for_change?(changed, deadline)
         end
       end
 
       def signal_changed?(signal, observed, deadline)
-        timeout = deadline - Clock.now if deadline
+        timeout = Clock.remaining(deadline)
         return false if timeout && !timeout.positive?
 
         timed_out = Object.new

data/lib/farce/engine/shared/weak_atom/base.rb

@@ -146,7 +146,7 @@ module Farce
       def with_value(timeout)
         deadline = timeout_deadline(timeout)
         result = TIMED_OUT
-        @lock.update(timeout: remaining_timeout(deadline)) do
+        @lock.update(timeout: Clock.remaining(deadline)) do
           result = yield
           nil
         end
@@ -158,11 +158,12 @@ module Farce
         loop do
           generation = @changes.value
           current    = read_value
-          return current if non_nil ? !current.nil? : !values_equal?(current, expected)
+          return current if non_nil ? !current.nil? :
+            Internal.value_changed?(current, expected, compare_by_identity?)
           # Detect recursive waits without waiting for another owner's update.
           @lock.get(timeout: 0)
-          return fallback&.call if remaining_timeout(deadline)&.zero?
-          @changes.wait_until_changed(generation, timeout: remaining_timeout(deadline))
+          return fallback&.call if Clock.remaining(deadline)&.zero?
+          @changes.wait_until_changed(generation, timeout: Clock.remaining(deadline))
         end
       end
 
@@ -177,12 +178,6 @@ module Farce
         raise ArgumentError, "timeout must be finite and non-negative" unless timeout.finite? && !timeout.negative?
         Clock.now + timeout
       end
-
-      def remaining_timeout(deadline)
-        return unless deadline
-        remaining = deadline - Clock.now
-        remaining.negative? ? 0 : remaining
-      end
     end
     private_constant :WeakAtomBase
   end

data/lib/farce/engine/shared/weak_map/cell.rb

@@ -61,7 +61,7 @@ module Farce
       end
 
       def wait_for_change?(observed, deadline)
-        timeout = deadline - Clock.now if deadline
+        timeout = Clock.remaining(deadline)
         return false if timeout && !timeout.positive?
         !!@changes.wait(observed, timeout:) { false }
       end