fiber_scheduler 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b809dc12fe4aea6e8bc0bf88eab0405545abd124d7e088f86815f3ddc64ae9f
-  data.tar.gz: 1443f88deb315b612aefb3702bf307feefa5a32ea04cecb394bc078e27513f01
+  metadata.gz: f52317e155b7fcae9a70ec8c93471ce583e818e00bc239581f52db1943aea579
+  data.tar.gz: 592b146c29b9448f8948201b94f0f3468973b19dfc7c75b015a7a2167179824f
 SHA512:
-  metadata.gz: 4fdb35be7a59a1fba021ecbce10c496e2af16828ab2d76cd22933360322f31fcf6b7f72cfb3bca88588684f51e3445ee66573a05cb480d6b6e1bed4905a49a6e
-  data.tar.gz: 4f933bdb78178126c8d181bb52806157c13ef1b5d736d2fc202a1a5c6667eb6ce960c48f7c2123fc053454309a2188774c246cb524f52414b7d2dbc1fae9cc5d
+  metadata.gz: 40c9a3f67136992e766b6a9424922061debfbf09d07759396c783e53cccfd4adb63d0027cce0a6fd5922427f59c3ad02e93980b3cf7b4cf8fac5e473257dd42c
+  data.tar.gz: 51d94ee5f1431bafe2921a12a20238049d51f6415010eace40407e5a373c4e35cf4500848196489b9c2534dc1dab0b8efbe3c7f780c49bcd1e9c1c6f1f6bd0c2

data/lib/fiber_scheduler/compatibility.rb

@@ -0,0 +1,49 @@
+class FiberScheduler
+  module Compatibility
+    def fiber(*args, **opts, &block)
+      return super unless Compatibility.internal?
+
+      # This is `Fiber.schedule` call inside `FiberScheduler { ... }` block.
+      if opts[:blocking]
+        Fiber.new(blocking: true) {
+          Compatibility.set_internal!
+          yield
+        }.tap(&:resume)
+
+      elsif opts[:waiting]
+        parent = Fiber.current
+        finished = false # prevents races
+        blocking = false # prevents #unblock-ing a fiber that never blocked
+
+        # Don't pass *args and **opts to an unknown fiber scheduler class.
+        super() do
+          Compatibility.set_internal!
+          yield
+        ensure
+          finished = true
+          unblock(nil, parent) if blocking
+        end
+
+        unless finished
+          blocking = true
+          block(nil, nil)
+        end
+
+      else
+        # Don't pass *args and **opts to an unknown fiber scheduler class.
+        super() do
+          Compatibility.set_internal!
+          yield
+        end
+      end
+    end
+
+    def self.set_internal!
+      Thread.current[:_fiber_scheduler] = true # Sets a FIBER local var!
+    end
+
+    def self.internal?
+      Thread.current[:_fiber_scheduler]
+    end
+  end
+end

data/lib/fiber_scheduler/version.rb

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

data/lib/fiber_scheduler.rb

@@ -1,4 +1,5 @@
 require "resolv"
+require_relative "fiber_scheduler/compatibility"
 require_relative "fiber_scheduler/selector"
 require_relative "fiber_scheduler/timeouts"
 
@@ -31,33 +32,47 @@ module Kernel
 
         # Unknown fiber scheduler class; can't just pass options to
         # Fiber.schedule, handle each option separately.
-      elsif blocking
-        Fiber.new(blocking: true, &block).tap(&:resume)
-
-      elsif waiting
-        current = Fiber.current
-        finished = false # prevents races
-        Fiber.schedule do
-          block.call
-        ensure
-          # Resume waiting parent fiber
-          finished = true
-          scheduler.unblock(nil, current)
-        end
+      else
+        scheduler.singleton_class.prepend(FiberScheduler::Compatibility)
+
+        if blocking
+          fiber = Fiber.new(blocking: true) do
+            FiberScheduler::Compatibility.set_internal!
+            yield
+          end
+          fiber.tap(&:resume)
+
+        elsif waiting
+          parent = Fiber.current
+          finished = false # prevents races
+          blocking = false # prevents #unblock-ing a fiber that never blocked
+
+          Fiber.schedule do
+            FiberScheduler::Compatibility.set_internal!
+            yield
+          ensure
+            finished = true
+            scheduler.unblock(nil, parent) if blocking
+          end
 
-        if Fiber.blocking?
-          # In a blocking fiber, which is potentially also a loopo fiber so
-          # there's nothing we can transfer to. Run other fibers (or just
-          # block) until waiting fiber finishes.
-          until finished
-            scheduler.run_once
+          if Fiber.blocking?
+            # In a blocking fiber, which is potentially also a loop fiber so
+            # there's nothing we can transfer to. Run other fibers (or just
+            # block) until waiting fiber finishes.
+            until finished
+              scheduler.run_once
+            end
+          elsif !finished
+            blocking = true
+            scheduler.block(nil, nil)
           end
+
         else
-          scheduler.block(nil, nil) unless finished
+          Fiber.schedule do
+            FiberScheduler::Compatibility.set_internal!
+            yield
+          end
         end
-
-      else
-        Fiber.schedule(&block)
       end
     end
   end
@@ -181,8 +196,8 @@ class FiberScheduler
         until finished
           run_once
         end
-      else
-        @selector.transfer unless finished
+      elsif !finished
+        @selector.transfer
       end
 
       fiber

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiber_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Bruno Sutic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-13 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -72,8 +72,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/fiber/scheduler.rb
 - lib/fiber_scheduler.rb
+- lib/fiber_scheduler/compatibility.rb
 - lib/fiber_scheduler/selector.rb
 - lib/fiber_scheduler/timeout.rb
 - lib/fiber_scheduler/timeouts.rb

data/lib/fiber/scheduler.rb

@@ -1 +0,0 @@
-require_relative "../fiber_scheduler"