From 9c0582704f63f85aab112c8a9cff344fc3df62ca Mon Sep 17 00:00:00 2001 From: Lars Kanis Date: Wed, 25 Aug 2021 12:03:35 +0200 Subject: Fix example fiber scheduler reg. writable events There were two issues: 1. When an IO object is waiting for writablility only (as in test_tcp_accept) the selected hash is empty. Therefore selected[fiber] returns nil but needs to default to 0 in order to be or'ed with IO::WRITABLE. 2. When an IO object is waiting for read- or writability (as in test_tcp_connect), but only one of these two events arrive, the Fiber and IO object need to be removed from the other `@readable` or `@writable` list. --- test/fiber/scheduler.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test/fiber/scheduler.rb') diff --git a/test/fiber/scheduler.rb b/test/fiber/scheduler.rb index 2785561000..740cad02c2 100644 --- a/test/fiber/scheduler.rb +++ b/test/fiber/scheduler.rb @@ -60,6 +60,7 @@ class Scheduler readable&.each do |io| if fiber = @readable.delete(io) + @writable.delete(io) if @writable[io] == fiber selected[fiber] = IO::READABLE elsif io == @urgent.first @urgent.first.read_nonblock(1024) @@ -68,7 +69,8 @@ class Scheduler writable&.each do |io| if fiber = @writable.delete(io) - selected[fiber] |= IO::WRITABLE + @readable.delete(io) if @readable[io] == fiber + selected[fiber] = selected.fetch(fiber, 0) | IO::WRITABLE end end -- cgit v1.2.3