async-limiter 1.1.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cdf40ab309d5d7b7ca00fb0dcaedb33b70a1fca2d64beda3372315e15c010cb
-  data.tar.gz: 11d3b4dfb522dd797fceccf3584d1a8cf09754242243dd9691fde4e21f3135d5
+  metadata.gz: 89371390667823819a23be2b9b32fa67835de748ed46e456e3bef72af1086f9c
+  data.tar.gz: 2cb73676f8f6d2f78d9eb7dfe5f7842076fc2121be674ce13f61ba26075633a3
 SHA512:
-  metadata.gz: b24f90a04704a5bcb01147d801b00ec58b96f22d853a7edbde6357f115fc3e903b57602609c9c2be8e622908eb75e1f6cfd21919e555616b6f6178d2380f55e7
-  data.tar.gz: 29c23c6e2868214742540be7e9aeb4678eb9f9ff9dd4625e8eab41f129db05b459f1e4a053245015876fc9086b6cadfc78159890f2493e06ca6824ab70f708c9
+  metadata.gz: 1eb18ea438a0aa21647a7630f11cdfc0318e2b1e5b9395f9476e1c05a1865e37a4a994e0fd877bca06aa62de1ce1429662fec1b8d450b8e88bd1eb1ab90ba105
+  data.tar.gz: d0fb87462427dfef33c2967a594b6df029579f3bfd8afaf1f9fe6445abff60f9d147d4838c3edf9ded900488203669f3e53c04f2bde3c09edfafcd1181078148

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.1.0"
+    VERSION = "1.5.0"
   end
 end

data/lib/async/limiter/window.rb

@@ -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
@@ -78,6 +84,14 @@ module Async
         end
 
         @window_frame_start_time = current_time
+
+        return unless block_given?
+
+        begin
+          yield
+        ensure
+          release
+        end
       end
 
       def release
@@ -137,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
@@ -165,6 +179,8 @@ module Async
       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?

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.1.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async