https://git.ruby-lang.org/ruby.git/commit/?id=9c0582704f

From 9c0582704f63f85aab112c8a9cff344fc3df62ca Mon Sep 17 00:00:00 2001
From: Lars Kanis <lars@g...>
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 +++-
 test/fiber/test_io.rb   | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/test/fiber/scheduler.rb b/test/fiber/scheduler.rb
index 2785561..740cad0 100644
--- a/test/fiber/scheduler.rb
+++ b/test/fiber/scheduler.rb
@@ -60,6 +60,7 @@ class Scheduler https://github.com/ruby/ruby/blob/trunk/test/fiber/scheduler.rb#L60
 
       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 https://github.com/ruby/ruby/blob/trunk/test/fiber/scheduler.rb#L69
 
       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
 
diff --git a/test/fiber/test_io.rb b/test/fiber/test_io.rb
index fafda7c..ce65a55 100644
--- a/test/fiber/test_io.rb
+++ b/test/fiber/test_io.rb
@@ -97,4 +97,47 @@ class TestFiberIO < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/fiber/test_io.rb#L97
 
     assert_kind_of Errno::EPIPE, error
   end
+
+  def test_tcp_accept
+    server = TCPServer.new('localhost', 0)
+
+    th = Thread.new do
+      Fiber.set_scheduler(Scheduler.new)
+
+      Fiber.schedule do
+        sender = server.accept
+        sender.wait_writable
+        sender.write "hello"
+        sender.close
+      end
+    end
+
+    recver = TCPSocket.new('localhost', server.local_address.ip_port)
+    assert "hello", recver.read
+
+    recver.close
+    server.close
+    th.join
+  end
+
+  def test_tcp_connect
+    server = TCPServer.new('localhost', 0)
+
+    th = Thread.new do
+      Fiber.set_scheduler(Scheduler.new)
+
+      Fiber.schedule do
+        sender = TCPSocket.new('localhost', server.local_address.ip_port)
+        sender.write "hello"
+        sender.close
+      end
+    end
+
+    recver = server.accept
+    assert "hello", recver.read
+
+    recver.close
+    server.close
+    th.join
+  end
 end
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/