async-limiter 1.0.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d203b60d1b006ce7dc199fd37dbfeac43468324a083a02a233dbf7fe1ebc61f
-  data.tar.gz: f7cd17453e047205743648458058f30365d795514fba956dca1aa910ab34816e
+  metadata.gz: fb0c5c05d9810ad2fa9552b2ef47a8de1a3f7a6a0d3d7b5ed06966123d3aec4d
+  data.tar.gz: 30515013abce6931c53c67cbec22aab86407bd540169bcf66d39be1c97b3e6e3
 SHA512:
-  metadata.gz: 2721ba28df1d8aca742ba974ace3146d136734e9482c39429957dd0ff9022843eef5dc6bdbda9c9aa60017c019ab2011907a31a6d30d8a16f7392b2c70daf04a
-  data.tar.gz: 7ea2cbb70d1f192d947d42594711fdf37da8f86a56d624925ec3b8fdb31957248ecbb1b945f62f7c4dfc755c947ede0ec65f8035c2806fd942ebd60ab430194d
+  metadata.gz: cc2899bf484bbdc536ec30198d306357799e9f877c731b90ca47547690f95795b6ee757b3186ba73479a3b02dfb2ef75f7b6dc51ff1d24e2689284c6581aaf77
+  data.tar.gz: 1fca09443942de54eeec4c16c2b0b6612be2fd7fc1be2efba01543cd720f4c4e055cf75cb37746ffc806fd8f7fbfe68cdf35592a65d9499ec6b7beb003305cd9

data/lib/async/limiter/concurrent.rb

@@ -8,10 +8,10 @@ module Async
 
       attr_reader :limit
 
-      def initialize(limit = 1, parent: nil)
+      def initialize(limit = 1, parent: nil, queue: [])
         @count = 0
         @limit = limit
-        @waiting = []
+        @waiting = queue
         @parent = parent
 
         validate!
@@ -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.0.0"
+    VERSION = "1.4.0"
   end
 end

data/lib/async/limiter/window.rb

@@ -15,7 +15,7 @@ module Async
       attr_reader :lock
 
       def initialize(limit = 1, type: :fixed, window: 1, parent: nil,
-        burstable: true, lock: true)
+        burstable: true, lock: true, queue: [])
         @count = 0
         @input_limit = @limit = limit
         @type = type
@@ -24,7 +24,7 @@ module Async
         @burstable = burstable
         @lock = lock
 
-        @waiting = []
+        @waiting = queue
         @scheduler_task = nil
 
         @window_frame_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
@@ -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

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