async-limiter 1.2.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 974ccf48a69e44da7a7ae3d5908d68376ba026cfe8f72430aeda1fdb8b95966e
-  data.tar.gz: bf910237393a4fcd04e91fa1160d1d4d44993f5de73bc1c8e86b31ba6c98db7b
+  metadata.gz: fb03fc864de09582936ff16e60cd9a214020f66606ae489b09c673f5076d37e6
+  data.tar.gz: 6ec875d4dd7afa21bdde41d12b61f51b4898e93b644d2d90abea339c64810ae7
 SHA512:
-  metadata.gz: e1bf656e0d8f82bf460f64d657ad17ab9fedda4f06b335036448312e81c30e3cb9c438642aef86a704c25401563361a39f5b7258eb8ec7123bc10f719459db90
-  data.tar.gz: a367575c970cf6e40723f53bbc776cf70fe88488d36dddb755b21c625dcc133ad84c812fbc8aa54ee0cdc202ddc50f96cc76a75c8e78f4ad18017459f2b5ed4a
+  metadata.gz: cde5a1bf23dadac86d333e8a43d6379df264ddd45684ea16aeba0b59f0c3141f9170bb70b37139a3868391c28fcb8a8e48f63399356a9fbacabd89fc369d39c7
+  data.tar.gz: 7b5b82b3141d057099b2f8fee90ce1d15ef56492106f44a751df64ad2a881098a4f43437d381d8f8753bbc4d9386c2a044d97a0542c4090320f9d91a7068c6e0

data/lib/async/limiter/concurrent.rb

@@ -21,8 +21,8 @@ module Async
         limit_blocking?
       end
 
-      def async(parent: (@parent || Task.current), **options)
-        acquire
+      def async(*queue_args, parent: (@parent || Task.current), **options)
+        acquire(*queue_args)
         parent.async(**options) do |task|
           yield task
         ensure
@@ -30,9 +30,23 @@ module Async
         end
       end
 
-      def acquire
-        wait
+      def sync(*queue_args)
+        acquire(*queue_args) do
+          yield(@parent || Task.current)
+        end
+      end
+
+      def acquire(*queue_args)
+        wait(*queue_args)
         @count += 1
+
+        return unless block_given?
+
+        begin
+          yield
+        ensure
+          release
+        end
       end
 
       def release
@@ -53,11 +67,11 @@ module Async
         @count >= @limit
       end
 
-      def wait
+      def wait(*queue_args)
         fiber = Fiber.current
 
         if blocking?
-          @waiting << fiber
+          @waiting.push(fiber, *queue_args) # queue_args used for custom queues
           Task.yield while blocking?
         end
       rescue Exception # rubocop:disable Lint/RescueException

data/lib/async/limiter/unlimited.rb

@@ -27,8 +27,22 @@ module Async
         end
       end
 
+      def sync(*queue_args)
+        acquire(*queue_args) do
+          yield(@parent || Task.current)
+        end
+      end
+
       def acquire
         @count += 1
+
+        return unless block_given?
+
+        begin
+          yield
+        ensure
+          release
+        end
       end
 
       def release

data/lib/async/limiter/version.rb

@@ -1,5 +1,5 @@
 module Async
   module Limiter
-    VERSION = "1.2.0"
+    VERSION = "1.5.1"
   end
 end

data/lib/async/limiter/window.rb

@@ -25,7 +25,7 @@ module Async
         @lock = lock
 
         @waiting = queue
-        @scheduler_task = nil
+        @scheduler = nil
 
         @window_frame_start_time = NULL_TIME
         @window_start_time = NULL_TIME
@@ -47,8 +47,8 @@ module Async
         limit_blocking? || window_blocking? || window_frame_blocking?
       end
 
-      def async(parent: (@parent || Task.current), **options)
-        acquire
+      def async(*queue_args, parent: (@parent || Task.current), **options)
+        acquire(*queue_args)
         parent.async(**options) do |task|
           yield task
         ensure
@@ -56,8 +56,14 @@ module Async
         end
       end
 
-      def acquire
-        wait
+      def sync(*queue_args)
+        acquire(*queue_args) do
+          yield(@parent || Task.current)
+        end
+      end
+
+      def acquire(*queue_args)
+        wait(*queue_args)
         @count += 1
 
         current_time = Clock.now
@@ -145,13 +151,13 @@ module Async
         @window_frame_start_time + window_frame <= Clock.now
       end
 
-      def wait
+      def wait(*queue_args)
         fiber = Fiber.current
 
         # @waiting.any? check prevents fibers resumed via scheduler from
         # slipping in operations before other waiting fibers get resumed.
         if blocking? || @waiting.any?
-          @waiting << fiber
+          @waiting.push(fiber, *queue_args) # queue_args used for custom queues
           schedule if schedule?
           loop do
             Task.yield # run this line at least once
@@ -164,34 +170,36 @@ 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|
+        @scheduler ||=
+          parent.async(transient: true) { |task|
+            task.annotate("scheduling tasks for #{self.class}.")
+
             while @waiting.any? && !limit_blocking?
-              delay = [next_acquire_time - Async::Clock.now, 0].max
+              delay = [next_acquire_time - Clock.now, 0].max
               task.sleep(delay) if delay.positive?
               resume_waiting
             end
 
-            @scheduler_task = nil
+            @scheduler = nil
           }
       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

data/lib/async/limiter/window/continuous.rb

@@ -4,14 +4,15 @@ module Async
   module Limiter
     class Window
       class Continuous < Window
-        def initialize(limit = 1, window: 1, parent: nil, lock: true)
+        def initialize(limit = 1, window: 1, parent: nil, lock: true, queue: [])
           super(
             limit,
             type: :sliding, # type doesn't matter, but sliding is less work
             burstable: false,
             window: window,
             parent: parent,
-            lock: lock
+            lock: lock,
+            queue: queue
           )
         end
       end

data/lib/async/limiter/window/fixed.rb

@@ -4,14 +4,15 @@ module Async
   module Limiter
     class Window
       class Fixed < Window
-        def initialize(limit = 1, window: 1, parent: nil, lock: true)
+        def initialize(limit = 1, window: 1, parent: nil, lock: true, queue: [])
           super(
             limit,
             type: :fixed,
             burstable: true,
             window: window,
             parent: parent,
-            lock: lock
+            lock: lock,
+            queue: queue
           )
         end
       end

data/lib/async/limiter/window/sliding.rb

@@ -4,14 +4,15 @@ module Async
   module Limiter
     class Window
       class Sliding < Window
-        def initialize(limit = 1, window: 1, parent: nil, lock: true)
+        def initialize(limit = 1, window: 1, parent: nil, lock: true, queue: [])
           super(
             limit,
             type: :sliding,
             burstable: true,
             window: window,
             parent: parent,
-            lock: lock
+            lock: lock,
+            queue: queue
           )
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-limiter
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-11-20 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: []