ori-rb 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd8326ee1d0ef86eff23c6b472b82ee72d2253e41d1367f053aeb878ed926320
-  data.tar.gz: 02b872fdd48ef913857e022f9333f5a447c59493a2dd5ccdbccee5486c479d0d
+  metadata.gz: 982c11168837e41b1cb170b200732867a648c00546ef530b5f390da2436f4c63
+  data.tar.gz: 42a74eeba76762d3ec9ed5f3dd5e379be15d941a7a04a4ee7431da732e03b3bf
 SHA512:
-  metadata.gz: 102ff1557da066713c20b08e87f29e01fff6c07978c9a384d657df6dfb2bfc4f6e95edb0f966e58b68ff44b4430232a95d23be846bba66838848792e8f3dcd86
-  data.tar.gz: 76e6f9e1e3ed9d2dfbf8078325560a4ca40dcc770c5a2ba6ec16e58ed3809203e18a15d859ead27d236f0d9439a342326b64fe31edf81ff426e1b85926ed5107
+  metadata.gz: 200f9cb47a64c132688613fffb42b5a642c288f47004821e60ee451758c4fb241e9a2136e26ac23053db33e474bb9aad082949d03f7e04f1197fdc2fe09ead11
+  data.tar.gz: 38817593a3040a762ad3fff44e18352dfa7c0367e47a3e8aa7434222ce059cedc58c113b249df39a0f93cecf4fe87189dccd25820a5d2a870b6448cebf791e17

data/lib/ori/scope.rb

@@ -54,9 +54,10 @@ module Ori
       @cancelled = false
       @closed = false
 
-      # Cross-thread wakeup mechanism for unblock
+      # Cross-thread wakeup mechanism for unblock and fiber_interrupt
       @wakeup_mutex = ::Mutex.new
       @wakeup_queue = [] #: Array[Fiber]
+      @pending_interrupts = {} #: Hash[Fiber, Exception]
       @wakeup_reader, @wakeup_writer = IO.pipe
 
       # Instead, use thread-local storage
@@ -79,6 +80,9 @@ module Ori
         process_available_work
         Fiber.yield if parent_scope && pending_work?
       end
+    rescue Interrupt => error
+      puts "Scope interrupted! Shutting down..."
+      shutdown!(error)
     ensure
       close_scope
       @parent_scope&.deregister_child_scope(self)
@@ -174,8 +178,8 @@ module Ori
         0
       end
     ensure
-      cleanup_io_wait(fiber, io, added)
-      cleanup_timeout(fiber) if timeout
+      cleanup_io_wait(fiber, io, added) if added
+      cleanup_timeout(fiber) if timeout && fiber
     end
 
     def io_select(readables, writables, exceptables, timeout)
@@ -224,7 +228,7 @@ module Ori
         Fiber.yield
       end
     ensure
-      cleanup_timeout(fiber)
+      cleanup_timeout(fiber) if fiber
     end
 
     def block(...)
@@ -246,6 +250,14 @@ module Ori
       @wakeup_writer.write_nonblock(".") rescue nil # rubocop:disable Style/RescueModifier
     end
 
+    def fiber_interrupt(fiber, exception)
+      @wakeup_mutex.synchronize do
+        @pending_interrupts[fiber] = exception
+        @wakeup_queue << fiber
+      end
+      @wakeup_writer.write_nonblock(".") rescue nil # rubocop:disable Style/RescueModifier
+    end
+
     def io_read(io, buffer, length, offset)
       return @parent_scope.io_read(io, buffer, length, offset) unless fiber_ids.key?(Fiber.current)
 
@@ -486,8 +498,39 @@ module Ori
     end
 
     def drain_wakeup_queue
-      fibers = @wakeup_mutex.synchronize { @wakeup_queue.shift(@wakeup_queue.size) }
-      fibers.each { |fiber| resume_fiber(fiber) if fiber.alive? }
+      interrupts = nil
+      fibers = @wakeup_mutex.synchronize do
+        unless @pending_interrupts.empty?
+          interrupts = @pending_interrupts.dup
+          @pending_interrupts.clear
+        end
+        @wakeup_queue.shift(@wakeup_queue.size)
+      end
+
+      fibers.each do |fiber|
+        next unless fiber.alive?
+
+        if (exception = interrupts&.delete(fiber))
+          interrupt_fiber(fiber, exception)
+        else
+          resume_fiber(fiber)
+        end
+      end
+    end
+
+    def interrupt_fiber(fiber, exception)
+      id = fiber_ids[fiber]
+      @tracer&.record(id, :interrupted, exception.message)
+
+      # Remove from wait states before cancelling
+      waiting.delete(fiber)
+      blocked.delete(fiber)
+
+      if (task = task_queue[fiber])
+        task.cancel(exception)
+      else
+        fiber.kill
+      end
     end
 
     def close_scope
@@ -691,15 +734,19 @@ module Ori
     end
 
     def cleanup_io_wait(fiber, io, added)
-      readable[io].delete(fiber) if added[:readable]
-      writable[io].delete(fiber) if added[:writable]
+      state = thread_local_state&.[](object_id)
+      return unless state
 
-      readable.delete(io) if readable[io]&.empty?
-      writable.delete(io) if writable[io]&.empty?
+      state.readable[io]&.delete(fiber) if added[:readable]
+      state.writable[io]&.delete(fiber) if added[:writable]
+
+      state.readable.delete(io) if state.readable[io]&.empty?
+      state.writable.delete(io) if state.writable[io]&.empty?
     end
 
     def cleanup_timeout(fiber)
-      waiting.delete(fiber)
+      state = thread_local_state&.[](object_id)
+      state&.waiting&.delete(fiber)
     end
 
     # Add helper method to access thread-local state

data/lib/ori/version.rb

@@ -1,5 +1,5 @@
 # typed: strict
 
 module Ori
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ori-rb
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Jahfer Husain