polyphony 0.49.1 → 0.49.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d455bffada65a186f47a33dec9a29bf81a8a025b4c536a0d3136e256a3aaa55
-  data.tar.gz: '094f9bae247c640ac2ea721625b5dd4b58ae4943186bfc015c9c830117a9dbee'
+  metadata.gz: 18278f9c013191fd5a96520a07e3b6e5c4bc088665a1b1a769b02552bd0e5448
+  data.tar.gz: 4e1e42fa5e2a6ddc6dcff7982415dd16246a0d75212aa2eb9ae7a97e030a2bdb
 SHA512:
-  metadata.gz: e8a462663b9e1bca1f99b301c8d904b5fad091851dff9cf5af785bf3a76802ddeb5904565b4a79e916b8a4b97001181a48bed7a56dadf1143dfc11d9ae7762d2
-  data.tar.gz: 68765d941201a2d74ae1e8cc20a9ea3c6fba9e68b6a552dc65a399a7ad8853a619a259ebc1dc705cdb2f3eae77adee4098de1186212755f7d87064bbaaf125f8
+  metadata.gz: 483158709045a9dc59fa75c912067c4fafbb02885e15f3fa57f482b97903a0c919abbb5ad19bea85837222a44d5ec2778f1e1421839c2e6a595a64e84f2d707d
+  data.tar.gz: c1162de70de5aa2d92804e7c4ccb3a372c5839d5600a7f68ae6f84363677a52f23923dbe8e407a84607ac4f0145736c7a5b9ada8b4956fd9c742cec182ed3a70

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.49.2
+
+- Fix hang with 100s or more child fibers when terminating
+- Fix double pending_count increment in io_uring backend
+
 ## 0.49.1
 
 - Use `TCPSocket` instead of `Socket` in `Net.tcp_connect`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.49.1)
+    polyphony (0.49.2)
 
 GEM
   remote: https://rubygems.org/

data/examples/performance/thread-vs-fiber/polyphony_server.rb

@@ -26,15 +26,13 @@ def write_response(socket)
   socket.write "HTTP/1.1 #{status_code}\r\n#{headers}\r\n#{data}"
 end
 
-server = TCPServer.open('0.0.0.0', 1234)
-puts "pid #{Process.pid} Polyphony (#{Thread.current.backend.kind}) listening on port 1234"
+server = TCPServer.open('0.0.0.0', 4411)
+puts "pid #{Process.pid} Polyphony (#{Thread.current.backend.kind}) listening on port 4411"
 
 spin_loop(interval: 10) do
   p Thread.current.fiber_scheduling_stats
 end
 
-GC.disable
-
 server.accept_loop do |c|
   spin { handle_client(c) }
 end

data/ext/polyphony/backend_io_uring.c

@@ -263,9 +263,7 @@ int io_uring_backend_defer_submit_and_await(
   // io_uring_sqe_set_flags(sqe, IOSQE_ASYNC);
   io_uring_backend_defer_submit(backend);
 
-  backend->pending_count++;
   switchpoint_result = backend_await(backend);
-  backend->pending_count--;
 
   if (!ctx->completed) {
     ctx->result = -ECANCELED;

data/lib/polyphony/extensions/fiber.rb

@@ -245,8 +245,12 @@ module Polyphony
     end
 
     def shutdown_all_children(graceful = false)
-      terminate_all_children(graceful)
-      await_all_children
+      return unless @children
+
+      @children.keys.each do |c|
+        c.terminate(graceful)
+        c.await
+      end
     end
   end
 
@@ -319,13 +323,10 @@ module Polyphony
     # the children are shut down, it is returned along with the uncaught_exception
     # flag set. Otherwise, it returns the given arguments.
     def finalize_children(result, uncaught_exception)
-      begin
-        shutdown_all_children
-      rescue Exception => e
-        result = e
-        uncaught_exception = true
-      end
+      shutdown_all_children
       [result, uncaught_exception]
+    rescue Exception => e
+      [e, true]
     end
 
     def inform_dependants(result, uncaught_exception)

data/lib/polyphony/extensions/thread.rb

@@ -41,8 +41,7 @@ class ::Thread
 
   def finalize(result)
     unless Fiber.current.children.empty?
-      Fiber.current.terminate_all_children
-      Fiber.current.await_all_children
+      Fiber.current.shutdown_all_children
     end
     @finalization_mutex.synchronize do
       @terminated = true

data/lib/polyphony/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Polyphony
-  VERSION = '0.49.1'
+  VERSION = '0.49.2'
 end

data/test/helper.rb

@@ -57,8 +57,7 @@ class MiniTest::Test
 
   def teardown
     # trace "* teardown #{self.name}"
-    Fiber.current.terminate_all_children
-    Fiber.current.await_all_children
+    Fiber.current.shutdown_all_children
     Fiber.current.instance_variable_set(:@auto_watcher, nil)
   rescue => e
     puts e

data/test/test_backend.rb

@@ -100,6 +100,31 @@ class BackendTest < MiniTest::Test
     assert_equal [:ready, 'foo', 'bar', :done], buf
   end
 
+  def test_read_loop_terminate
+    i, o = IO.pipe
+
+    buf = []
+    parent = spin do
+      f = spin do
+        buf << :ready
+        @backend.read_loop(i) { |d| buf << d }
+        buf << :done
+      end
+      suspend
+    end
+
+    # writing always causes snoozing
+    o << 'foo'
+    sleep 0.01
+    o << 'bar'
+    sleep 0.01
+
+    parent.stop
+
+    parent.await
+    assert_equal [:ready, 'foo', 'bar'], buf
+  end
+
   def test_accept_loop
     server = TCPServer.new('127.0.0.1', 1234)
 

data/test/test_fiber.rb

@@ -1038,6 +1038,21 @@ class RestartTest < MiniTest::Test
   end
 end
 
+class ChildrenTerminationTest < MiniTest::Test
+  def test_shutdown_all_children
+    f = spin do
+      1000.times { spin { suspend } }
+      suspend
+    end
+
+    snooze
+    assert_equal 1000, f.children.size
+
+    f.shutdown_all_children
+    assert_equal 0, f.children.size
+  end
+end
+
 class GracefulTerminationTest < MiniTest::Test
   def test_graceful_termination
     buffer = []

data/test/test_signal.rb

@@ -46,8 +46,7 @@ class SignalTrapTest < Minitest::Test
       end.await
     rescue Interrupt
       o.puts "3 - interrupted"
-      Fiber.current.terminate_all_children
-      Fiber.current.await_all_children
+      Fiber.current.shutdown_all_children
     ensure
       o.close
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: 0.49.1
+  version: 0.49.2
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler