fiber_scheduler 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f52317e155b7fcae9a70ec8c93471ce583e818e00bc239581f52db1943aea579
-  data.tar.gz: 592b146c29b9448f8948201b94f0f3468973b19dfc7c75b015a7a2167179824f
+  metadata.gz: 53d696318655c53901ad5236d6a2beb1ae14b915ce2f2c64f05ef1e3e40988a9
+  data.tar.gz: be844ddb1fb5010732ec84a01b5ef73256e60abe91e126d461daf4bbe5467012
 SHA512:
-  metadata.gz: 40c9a3f67136992e766b6a9424922061debfbf09d07759396c783e53cccfd4adb63d0027cce0a6fd5922427f59c3ad02e93980b3cf7b4cf8fac5e473257dd42c
-  data.tar.gz: 51d94ee5f1431bafe2921a12a20238049d51f6415010eace40407e5a373c4e35cf4500848196489b9c2534dc1dab0b8efbe3c7f780c49bcd1e9c1c6f1f6bd0c2
+  metadata.gz: e54d5897ea73e5a0dc8d753091c6700b3605458df9e101b90bff77b63e141054db8142720279d3556d9d5a02347b049ec83213462224e93f03055fac0a4af65c
+  data.tar.gz: 445b10119acd9d544e69999ea32eaa567976bc73409cd1db4919a19c881ffaab76bef770192d5ec11c41989ad6e9df3d470ec6697e8e8e430d510a595959311d

data/lib/fiber_scheduler/compatibility.rb

@@ -4,13 +4,15 @@ class FiberScheduler
       return super unless Compatibility.internal?
 
       # This is `Fiber.schedule` call inside `FiberScheduler { ... }` block.
-      if opts[:blocking]
+      type = args.first
+      case type
+      when :blocking
         Fiber.new(blocking: true) {
           Compatibility.set_internal!
           yield
         }.tap(&:resume)
 
-      elsif opts[:waiting]
+      when :waiting
         parent = Fiber.current
         finished = false # prevents races
         blocking = false # prevents #unblock-ing a fiber that never blocked
@@ -29,12 +31,25 @@ class FiberScheduler
           block(nil, nil)
         end
 
-      else
+      when :fleeting
+        # 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) {
+          Compatibility.set_internal!
+          yield
+        }.transfer
+
+      when nil
         # Don't pass *args and **opts to an unknown fiber scheduler class.
         super() do
           Compatibility.set_internal!
           yield
         end
+
+      else
+        raise "Unknown type"
       end
     end
 

data/lib/fiber_scheduler/version.rb

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

data/lib/fiber_scheduler.rb

@@ -10,7 +10,7 @@ rescue LoadError
 end
 
 module Kernel
-  def FiberScheduler(blocking: false, waiting: true, &block)
+  def FiberScheduler(type = nil, &block)
     if Fiber.scheduler.nil?
       scheduler = FiberScheduler.new
       Fiber.set_scheduler(scheduler)
@@ -28,21 +28,22 @@ module Kernel
       if scheduler.is_a?(FiberScheduler)
         # The default waiting is 'true' as that is the most intuitive behavior
         # for a nested FiberScheduler call.
-        Fiber.schedule(blocking: blocking, waiting: waiting, &block)
+        Fiber.schedule(type, &block)
 
         # Unknown fiber scheduler class; can't just pass options to
         # Fiber.schedule, handle each option separately.
       else
         scheduler.singleton_class.prepend(FiberScheduler::Compatibility)
 
-        if blocking
+        case type
+        when :blocking
           fiber = Fiber.new(blocking: true) do
             FiberScheduler::Compatibility.set_internal!
             yield
           end
           fiber.tap(&:resume)
 
-        elsif waiting
+        when :waiting
           parent = Fiber.current
           finished = false # prevents races
           blocking = false # prevents #unblock-ing a fiber that never blocked
@@ -66,12 +67,16 @@ module Kernel
             blocking = true
             scheduler.block(nil, nil)
           end
+        when :fleeting
 
-        else
+        when nil
           Fiber.schedule do
             FiberScheduler::Compatibility.set_internal!
             yield
           end
+
+        else
+          raise "Unknown type"
         end
       end
     end
@@ -170,13 +175,13 @@ class FiberScheduler
     @timeouts.timeout(duration, exception, message, &block)
   end
 
-  def fiber(blocking: false, waiting: false, &block)
+  def fiber(type = nil, &block)
     current = Fiber.current
 
-    if blocking
-      # All fibers wait on a blocking fiber, so 'waiting' option is ignored.
+    case type
+    when :blocking
       Fiber.new(blocking: true, &block).tap(&:resume)
-    elsif waiting
+    when :waiting
       finished = false # prevents races
       fiber = Fiber.new(blocking: false) do
         @count += 1
@@ -201,7 +206,14 @@ class FiberScheduler
       end
 
       fiber
-    else
+    when :fleeting
+      if current != @fiber
+        # nested Fiber.schedule
+        @nested << current
+      end
+
+      Fiber.new(blocking: false, &block).tap(&:transfer)
+    when nil
       if current != @fiber
         # nested Fiber.schedule
         @nested << current
@@ -214,6 +226,9 @@ class FiberScheduler
         @count -= 1
       end
       fiber.tap(&:transfer)
+
+    else
+      raise "Unknown type"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiber_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -28,16 +28,16 @@ dependencies:
   name: fiber_scheduler_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement