diff options
author | Lars Kanis <lars@greiz-reinsdorf.de> | 2021-08-25 12:03:35 +0200 |
---|---|---|
committer | Samuel Williams <samuel.williams@oriontransfer.co.nz> | 2021-08-26 21:49:12 +1200 |
commit | 9c0582704f63f85aab112c8a9cff344fc3df62ca (patch) | |
tree | 90876572f40ce8957f020d5645e0002041ed1f1a /test/fiber/scheduler.rb | |
parent | a2ad0cb7b44a0cb87bd552b312a70bc46016a95f (diff) |
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.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4777
Diffstat (limited to 'test/fiber/scheduler.rb')
-rw-r--r-- | test/fiber/scheduler.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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 |