fiber_scheduler 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53d696318655c53901ad5236d6a2beb1ae14b915ce2f2c64f05ef1e3e40988a9
-  data.tar.gz: be844ddb1fb5010732ec84a01b5ef73256e60abe91e126d461daf4bbe5467012
+  metadata.gz: e6bff2da15e7d0b5295c4e97e86c55377ce126173aeeb8ef81cade98f2a3bd1b
+  data.tar.gz: aac48ee81381541a770722eb369c7d8f90415caba4f796e7c830b35cb53fd10b
 SHA512:
-  metadata.gz: e54d5897ea73e5a0dc8d753091c6700b3605458df9e101b90bff77b63e141054db8142720279d3556d9d5a02347b049ec83213462224e93f03055fac0a4af65c
-  data.tar.gz: 445b10119acd9d544e69999ea32eaa567976bc73409cd1db4919a19c881ffaab76bef770192d5ec11c41989ad6e9df3d470ec6697e8e8e430d510a595959311d
+  metadata.gz: 5b83d8d5a5f1a7503de979bdd7f60025b9ada9d63d98166a61516c3da82ec6b1e1a385579acc5c05764cc0ac838671757e53ee980180c5bf38625bc2b7f157ea
+  data.tar.gz: 1c2026341f79c0d98131f04c8d51b3be410b2fef6d732e8181a2024e149f08c02bebd5a9bc8272956396dd182451395c84a36b088f811f17b7deb96eb7983830

data/lib/fiber_scheduler/compatibility.rb

@@ -1,5 +1,7 @@
 class FiberScheduler
   module Compatibility
+    Close = Class.new(RuntimeError)
+
     def fiber(*args, **opts, &block)
       return super unless Compatibility.internal?
 
@@ -18,7 +20,7 @@ class FiberScheduler
         blocking = false # prevents #unblock-ing a fiber that never blocked
 
         # Don't pass *args and **opts to an unknown fiber scheduler class.
-        super() do
+        fiber = super() do
           Compatibility.set_internal!
           yield
         ensure
@@ -31,15 +33,23 @@ class FiberScheduler
           block(nil, nil)
         end
 
+        fiber
+
       when :fleeting
-        # Transfer to current fiber some time - after a fleeting fiber yields.
+        # Transfer to current fiber some time after a fleeting fiber yields.
         unblock(nil, Fiber.current)
         # Alternative to #unblock: Fiber.scheduler.push(Fiber.current)
 
-        Fiber.new(blocking: false) {
+        fiber = Fiber.new(blocking: false) do
           Compatibility.set_internal!
           yield
-        }.transfer
+        rescue Close
+          # Fiber scheduler is closing.
+        ensure
+          _fleeting.delete(Fiber.current)
+        end
+        _fleeting[fiber] = nil
+        fiber.tap(&:transfer)
 
       when nil
         # Don't pass *args and **opts to an unknown fiber scheduler class.
@@ -53,6 +63,28 @@ class FiberScheduler
       end
     end
 
+    # #close and #_fleeting handle a complexity in Async::Scheduler#close, more
+    # specifically this line:
+    # https://github.com/socketry/async/blob/456df488d801572821eaf5ec2fda10e3b9744a5f/lib/async/scheduler.rb#L55
+    def close
+      super
+    rescue
+      if _fleeting.empty?
+        Kernel.raise
+      else
+        # #dup is used because #_fleeting is modified during iteration.
+        _fleeting.dup.each do |fiber, _|
+          fiber.raise(Close)
+        end
+
+        super # retry
+      end
+    end
+
+    def _fleeting
+      @_fleeting ||= {}
+    end
+
     def self.set_internal!
       Thread.current[:_fiber_scheduler] = true # Sets a FIBER local var!
     end

data/lib/fiber_scheduler/version.rb

@@ -1,3 +1,3 @@
 class FiberScheduler
-  VERSION = "0.11.0".freeze
+  VERSION = "0.12.0".freeze
 end

data/lib/fiber_scheduler.rb

@@ -12,12 +12,10 @@ end
 module Kernel
   def FiberScheduler(type = nil, &block)
     if Fiber.scheduler.nil?
-      scheduler = FiberScheduler.new
-      Fiber.set_scheduler(scheduler)
+      Fiber.set_scheduler(FiberScheduler.new)
 
       begin
         yield
-        scheduler.close
       ensure
         Fiber.set_scheduler(nil)
       end
@@ -48,7 +46,7 @@ module Kernel
           finished = false # prevents races
           blocking = false # prevents #unblock-ing a fiber that never blocked
 
-          Fiber.schedule do
+          fiber = Fiber.schedule do
             FiberScheduler::Compatibility.set_internal!
             yield
           ensure
@@ -67,7 +65,22 @@ module Kernel
             blocking = true
             scheduler.block(nil, nil)
           end
+
+          fiber
+
         when :fleeting
+          scheduler.unblock(nil, Fiber.current)
+
+          fiber = Fiber.new(blocking: false) do
+            FiberScheduler::Compatibility.set_internal!
+            yield
+          rescue FiberScheduler::Compatibility::Close
+            # Fiber scheduler is closing.
+          ensure
+            scheduler._fleeting.delete(Fiber.current)
+          end
+          scheduler._fleeting[fiber] = nil
+          fiber.tap(&:transfer)
 
         when nil
           Fiber.schedule do
@@ -181,6 +194,7 @@ class FiberScheduler
     case type
     when :blocking
       Fiber.new(blocking: true, &block).tap(&:resume)
+
     when :waiting
       finished = false # prevents races
       fiber = Fiber.new(blocking: false) do
@@ -206,6 +220,7 @@ class FiberScheduler
       end
 
       fiber
+
     when :fleeting
       if current != @fiber
         # nested Fiber.schedule
@@ -213,6 +228,7 @@ class FiberScheduler
       end
 
       Fiber.new(blocking: false, &block).tap(&:transfer)
+
     when nil
       if current != @fiber
         # nested Fiber.schedule

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fiber_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Bruno Sutic
@@ -28,16 +28,16 @@ dependencies:
   name: fiber_scheduler_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement