async-limiter 1.3.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b8fe52d0adb39187c467e5a9195df3fc974cdad0c66e20ca4fbb8f2331e108a
-  data.tar.gz: 65aee35742f72694b2a1c1e4d34b41ee0d6e03eedc0f82029dbac31d042a1ad1
+  metadata.gz: dc95096df427d6b99502f8eb6f17f3cc0ec70598e093fd1d8aae5db50324d668
+  data.tar.gz: 21dfb9413922d3b20f1ee3f4ac9dbfd1ecdc5c2e08d12e9760c4b347cd941c0a
 SHA512:
-  metadata.gz: 575d83be39d544535c060e113934f147e94a81f97423b3207036610edc7b8e5a230dd46301e7e20253cbd477cf1ef2ba8ead19dc610a465665c10238c5357090
-  data.tar.gz: 033f5f5b7063c908fb250198789e053c02b512e9c04e1d56fe8ac01486c93030df7dc7046cf4923cdb2f3282c8f1ad066f97ed8319f6061ba9f1a5a275b9abda
+  metadata.gz: b3c074890ffa3befca024121f8988222539991ed43a99b99ccdcf2855b7e8219151ed118a2d549b490ad4992a2801c2af7e8fb43f315978176e1dab8db9657ec
+  data.tar.gz: 44ddac8caf55fa453604e57565e66c8bccd708cd710c76f65ad13f2408daa5442e3596dde2cd45e7a5bd33ed90e034a226c30cc98f85f57196e34059f7db4a7a

data/lib/async/limiter/concurrent.rb

@@ -30,8 +30,10 @@ module Async
         end
       end
 
-      def sync(*queue_args, &block)
-        acquire(*queue_args, &block)
+      def sync(*queue_args)
+        acquire(*queue_args) do
+          yield(@parent || Task.current)
+        end
       end
 
       def acquire(*queue_args)

data/lib/async/limiter/unlimited.rb

@@ -27,8 +27,10 @@ module Async
         end
       end
 
-      def sync(*queue_args, &block)
-        acquire(*queue_args, &block)
+      def sync(*queue_args)
+        acquire(*queue_args) do
+          yield(@parent || Task.current)
+        end
       end
 
       def acquire

data/lib/async/limiter/version.rb

@@ -1,5 +1,5 @@
 module Async
   module Limiter
-    VERSION = "1.3.1"
+    VERSION = "1.5.3"
   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
@@ -56,8 +59,10 @@ module Async
         end
       end
 
-      def sync(*queue_args, &block)
-        acquire(*queue_args, &block)
+      def sync(*queue_args)
+        acquire(*queue_args) do
+          yield Task.current
+        end
       end
 
       def acquire(*queue_args)
@@ -156,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?
@@ -168,34 +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|
-            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}.")
 
-            @scheduler_task = nil
-          }
+          while @waiting.any? && !limit_blocking?
+            delay = [next_acquire_time - Clock.now, 0].max
+            task.sleep(delay) if delay.positive?
+
+            # 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-limiter
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2021-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.26'
+        version: '1.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.26'
+        version: '1.27'
 - !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 +114,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