async-limiter 1.5.0 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89371390667823819a23be2b9b32fa67835de748ed46e456e3bef72af1086f9c
-  data.tar.gz: 2cb73676f8f6d2f78d9eb7dfe5f7842076fc2121be674ce13f61ba26075633a3
+  metadata.gz: 69bd1687c9db3ae2672a5b2fb4458d127eb3521d5fc1db244f4ec7c773f32b39
+  data.tar.gz: 88b8a481dc2ad96e0b49aed1e80ddaa5871b0f8e36cd06526bf9854b32a1c23c
 SHA512:
-  metadata.gz: 1eb18ea438a0aa21647a7630f11cdfc0318e2b1e5b9395f9476e1c05a1865e37a4a994e0fd877bca06aa62de1ce1429662fec1b8d450b8e88bd1eb1ab90ba105
-  data.tar.gz: d0fb87462427dfef33c2967a594b6df029579f3bfd8afaf1f9fe6445abff60f9d147d4838c3edf9ded900488203669f3e53c04f2bde3c09edfafcd1181078148
+  metadata.gz: 4a656389da97b0990f90efa4dfbef3e58d01183969018a60b77b85704c014342d55eec954d00b3cf1870ccda8430843036ffcd49bc8449dba82a9b1c4f09d240
+  data.tar.gz: e63c0d3882fe2c3ad08648295bfe58a861f3ebaf1e0321ab2e6685dab5ec1a25e4184773206278497b2b94e15f67223f268dfdc16e1fb69f8a3db3b99919105c

data/lib/async/limiter/version.rb

@@ -1,5 +1,5 @@
 module Async
   module Limiter
-    VERSION = "1.5.0"
+    VERSION = "1.5.4"
   end
 end

data/lib/async/limiter/window.rb

@@ -1,4 +1,5 @@
 require "async/clock"
+require "async/notification"
 require "async/task"
 require_relative "constants"
 
@@ -25,7 +26,9 @@ module Async
         @lock = lock
 
         @waiting = queue
-        @scheduler_task = nil
+        @scheduler = nil
+        @yield_wait = false
+        @yield_notification = Notification.new
 
         @window_frame_start_time = NULL_TIME
         @window_start_time = NULL_TIME
@@ -58,7 +61,7 @@ module Async
 
       def sync(*queue_args)
         acquire(*queue_args) do
-          yield(@parent || Task.current)
+          yield Task.current
         end
       end
 
@@ -158,7 +161,14 @@ module Async
         # slipping in operations before other waiting fibers get resumed.
         if blocking? || @waiting.any?
           @waiting.push(fiber, *queue_args) # queue_args used for custom queues
+          @yield_wait = true
           schedule if schedule?
+
+          # Non-blocking signal, prevents race condition where scheduler would
+          # start resuming waiting fibers before below 'Task.yield' was reached.
+          @yield_notification.signal
+          @yield_wait = false # we're out of the woods
+
           loop do
             Task.yield # run this line at least once
             break unless blocking?
@@ -170,36 +180,43 @@ module Async
       end
 
       def schedule?
-        @scheduler_task.nil? &&
+        @scheduler.nil? &&
           @waiting.any? &&
           !limit_blocking?
       end
 
       # Schedule resuming waiting tasks.
       def schedule(parent: @parent || Task.current)
-        @scheduler_task ||=
-          parent.async { |task|
-            task.annotate("scheduling tasks for #{self.class}.")
-
-            while @waiting.any? && !limit_blocking?
-              delay = [next_acquire_time - Async::Clock.now, 0].max
-              task.sleep(delay) if delay.positive?
-              resume_waiting
-            end
+        return @scheduler if @scheduler
+
+        parent.async(transient: true) do |task|
+          @scheduler = task
+          task.annotate("scheduling tasks for #{self.class}.")
+
+          while @waiting.any? && !limit_blocking?
+            delay = [next_acquire_time - Clock.now, 0].max
+            task.sleep(delay) if delay.positive?
 
-            @scheduler_task = nil
-          }
+            # Waits for the task that started the scheduler to yield.
+            # See #wait for more details.
+            @yield_wait && @yield_notification&.wait
+
+            resume_waiting
+          end
+        ensure
+          @scheduler = nil
+        end
       end
 
       def reschedule?
-        @scheduler_task &&
+        @scheduler &&
           @waiting.any? &&
           !limit_blocking?
       end
 
       def reschedule
-        @scheduler_task.stop
-        @scheduler_task = nil
+        @scheduler.stop
+        @scheduler = nil
 
         schedule
       end

metadata

@@ -1,85 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: async-limiter
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.4
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-16 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.27'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.26'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.27'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.26'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 description:
 email: code@brunosutic.com
 executables: []
@@ -114,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Async limiters