polyphony 0.74 → 0.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2948e34f11b2bcb60406fda1024cac8d93c9019edfc97a8febe083d503b56d88
-  data.tar.gz: 4bedbe795bbdb669123da5d4d671e78e6cfe3a021ddf13f2a80563a80ca92571
+  metadata.gz: 25015dd770af4d3b375af0625cfe9fe98becb328a0e77abb3101be2580279a7c
+  data.tar.gz: e2227ea3fa7d3ec04f5b580afdc92b9d7aacbab76b9e17dd0b86fb5e4e5b6a6f
 SHA512:
-  metadata.gz: 36cf3fecb1b3ad6dc7aec6a5a12b2a0db5e7e4f2fc15a201c5e6dbe692a3ebcf5d62bc8aad8febfb224c393014c40090245c47c93dec8b41bd9732b6002c9a8f
-  data.tar.gz: 8ad3f84d0af1eb5bb1535eb53128fb4f0602491e673128a873c8ef5176735ed61c6e1c53eb0b5faeb0792e299e771321a204f42d588566274f1737f16281a09e
+  metadata.gz: 967f6aa30621aae39dafdb587c28e1c0ec96685fc82972adb19fb50de7adfaaa42ce861c0f941f85ad536e29b459251d22c34a6bd96f8fc89f23dd4c0ecac47a
+  data.tar.gz: b3d6884d859c4eb61ca1d8bc8d1b727a5bf66c6c1af5280896264414bf14654650a1d8bcf3a6b744d235f5dd435e9231a0e047f95a17bfb7ce1642791c347c05

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.75 2022-02-04
+
+- Fix handling of MoveOn on main fiber of forked process
+- Ensure SSLSocket underlying socket is in nonblocking mode
+- Add `Polyphony.backend_verify_blocking_mode` API
+- Fix address resolution for hostnames with IPv6 address
+- Improve behaviour of OOB fiber
+- Include caller in `fiber_switchpoint` trace
+
 ## 0.74 2022-02-01
 
 - Add support for IPv6 (#69)

data/Gemfile.lock

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

data/ext/polyphony/backend_common.c

@@ -64,7 +64,8 @@ VALUE backend_base_switch_fiber(VALUE backend, struct Backend_base *base) {
   unsigned int idle_tasks_run_count = 0;
 
   base->switch_count++;
-  COND_TRACE(base, 2, SYM_fiber_switchpoint, current_fiber);
+  if (SHOULD_TRACE(base))
+    TRACE(base, 3, SYM_fiber_switchpoint, current_fiber, CALLER());
 
   while (1) {
     next = runqueue_shift(&base->runqueue);
@@ -415,6 +416,13 @@ VALUE Backend_stats(VALUE self) {
   return stats;
 }
 
+VALUE Backend_verify_blocking_mode(VALUE self, VALUE io, VALUE blocking) {
+  rb_io_t *fptr;
+  GetOpenFile(io, fptr);
+  io_verify_blocking_mode(fptr, io, blocking);
+  return self;
+}
+
 void backend_setup_stats_symbols() {
   SYM_runqueue_size       = ID2SYM(rb_intern("runqueue_size"));
   SYM_runqueue_length     = ID2SYM(rb_intern("runqueue_length"));

data/ext/polyphony/backend_common.h

@@ -112,6 +112,7 @@ VALUE Backend_timeout_ensure_safe(VALUE arg);
 VALUE Backend_timeout_ensure_safe(VALUE arg);
 VALUE Backend_sendv(VALUE self, VALUE io, VALUE ary, VALUE flags);
 VALUE Backend_stats(VALUE self);
+VALUE Backend_verify_blocking_mode(VALUE self, VALUE io, VALUE blocking);
 void backend_run_idle_tasks(struct Backend_base *base);
 void io_verify_blocking_mode(rb_io_t *fptr, VALUE io, VALUE blocking);
 void backend_setup_stats_symbols();

data/ext/polyphony/polyphony.c

@@ -154,6 +154,7 @@ void Init_Polyphony() {
   rb_define_singleton_method(mPolyphony, "backend_waitpid", Polyphony_backend_waitpid, 1);
   rb_define_singleton_method(mPolyphony, "backend_write", Polyphony_backend_write, -1);
   rb_define_singleton_method(mPolyphony, "backend_close", Polyphony_backend_close, 1);
+  rb_define_singleton_method(mPolyphony, "backend_verify_blocking_mode", Backend_verify_blocking_mode, 2);
 
   rb_define_global_function("snooze", Polyphony_snooze, 0);
   rb_define_global_function("suspend", Polyphony_suspend, 0);

data/ext/polyphony/polyphony.h

@@ -10,7 +10,8 @@
 // debugging
 #define OBJ_ID(obj) (NUM2LONG(rb_funcall(obj, rb_intern("object_id"), 0)))
 #define INSPECT(str, obj) { printf(str); VALUE s = rb_funcall(obj, rb_intern("inspect"), 0); printf(": %s\n", StringValueCStr(s)); }
-#define TRACE_CALLER() { VALUE c = rb_funcall(rb_mKernel, rb_intern("caller"), 0); INSPECT("caller: ", c); }
+#define CALLER() rb_funcall(rb_mKernel, rb_intern("caller"), 0)
+#define TRACE_CALLER() INSPECT("caller: ", CALLER())
 #define TRACE_C_STACK() { \
   void *entries[10]; \
   size_t size = backtrace(entries, 10); \

data/lib/polyphony/extensions/fiber.rb

@@ -250,10 +250,18 @@ module Polyphony
     def schedule_priority_oob_fiber(&block)
       f = Fiber.new do
         Fiber.current.setup_raw
-        block.call
+        result = block.call
       rescue Exception => e
         Thread.current.schedule_and_wakeup(Thread.main.main_fiber, e)
+        result = e
+      ensure
+        Thread.backend.trace(:fiber_terminate, f, result)
+        suspend
       end
+      f.oob = true
+      location = block.source_location
+      f.set_caller(["#{location.join(':')}"])
+      Thread.backend.trace(:fiber_create, f)
       Thread.current.schedule_and_wakeup(f, nil)
     end
   end
@@ -449,7 +457,7 @@ class ::Fiber
 
   extend Polyphony::FiberControlClassMethods
 
-  attr_accessor :tag, :thread, :parent
+  attr_accessor :tag, :thread, :parent, :oob
   attr_reader :result
 
   def running?
@@ -466,7 +474,11 @@ class ::Fiber
   alias_method :to_s, :inspect
 
   def location
-    @caller ? @caller[0] : '(root)'
+    if @oob
+      "#{@caller[0]} (oob)"
+    else
+      @caller ? @caller[0] : '(root)'
+    end
   end
 
   def caller
@@ -478,6 +490,10 @@ class ::Fiber
     end
   end
 
+  def set_caller(o)
+    @caller = o
+  end
+
   def main?
     @main
   end

data/lib/polyphony/extensions/openssl.rb

@@ -38,8 +38,10 @@ class ::OpenSSL::SSL::SSLSocket
 
   alias_method :orig_sysread, :sysread
   def sysread(maxlen, buf = +'')
+    # ensure socket is non blocking
+    Polyphony.backend_verify_blocking_mode(io, false)
     while true
-      case (result = read_nonblock(maxlen, buf, exception: false))
+      case (result = sysread_nonblock(maxlen, buf, exception: false))
       when :wait_readable then Polyphony.backend_wait_io(io, false)
       when :wait_writable then Polyphony.backend_wait_io(io, true)
       else return result
@@ -49,6 +51,8 @@ class ::OpenSSL::SSL::SSLSocket
 
   alias_method :orig_syswrite, :syswrite
   def syswrite(buf)
+    # ensure socket is non blocking
+    Polyphony.backend_verify_blocking_mode(io, false)
     while true
       case (result = write_nonblock(buf, exception: false))
       when :wait_readable then Polyphony.backend_wait_io(io, false)

data/lib/polyphony/extensions/socket.rb

@@ -124,12 +124,9 @@ class ::TCPSocket
     new(*args)
   end
 
-  def address_family(host)
-    host =~ /\:\:/ ? Socket::AF_INET6 : Socket::AF_INET
-  end
-
   def initialize(remote_host, remote_port, local_host = nil, local_port = nil)
-    @io = Socket.new address_family(remote_host), Socket::SOCK_STREAM
+    remote_addr = Addrinfo.tcp(remote_host, remote_port)
+    @io = Socket.new remote_addr.afamily, Socket::SOCK_STREAM
     if local_host && local_port
       addr = Addrinfo.tcp(local_host, local_port)
       @io.bind(addr)
@@ -231,13 +228,10 @@ end
 
 # Override stock TCPServer code by encapsulating a Socket instance.
 class ::TCPServer
-  def address_family(host)
-    host =~ /\:\:/ ? Socket::AF_INET6 : Socket::AF_INET
-  end
-
   def initialize(hostname = nil, port = 0)
-    @io = Socket.new address_family(hostname), Socket::SOCK_STREAM
-    @io.bind(Addrinfo.tcp(hostname, port))
+    addr = Addrinfo.tcp(hostname, port)
+    @io = Socket.new addr.afamily, Socket::SOCK_STREAM
+    @io.bind(addr)
     @io.listen(0)
   end
 

data/lib/polyphony/version.rb

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

data/lib/polyphony.rb

@@ -41,6 +41,8 @@ module Polyphony
         run_forked_block(&block)
       rescue SystemExit
         # fall through to ensure
+      rescue Polyphony::MoveOn
+        exit!
       rescue Exception => e
         STDERR << e.full_message
         exit!

data/test/helper.rb

@@ -21,10 +21,6 @@ IS_LINUX = RUBY_PLATFORM =~ /linux/
 #   Minitest::Reporters::SpecReporter.new
 # ]
 
-class ::Fiber
-  attr_writer :auto_watcher
-end
-
 module ::Kernel
   def trace(*args)
     STDOUT.orig_write(format_trace(args))
@@ -59,7 +55,6 @@ class MiniTest::Test
       puts "Children left after #{self.name}: #{Fiber.current.children.inspect}"
       exit!
     end
-    Fiber.current.instance_variable_set(:@auto_watcher, nil)
   rescue => e
     puts e
     puts e.backtrace.join("\n")

data/test/test_thread.rb

@@ -132,7 +132,7 @@ class ThreadTest < MiniTest::Test
     Thread.backend.trace_proc = proc {|*r| records << r }
     suspend
     assert_equal [
-      [:fiber_switchpoint, Fiber.current]
+      [:fiber_switchpoint, Fiber.current, ["#{__FILE__}:#{__LINE__ - 2}:in `test_that_suspend_returns_immediately_if_no_watchers'"] + caller]
     ], records
   ensure
     Thread.backend.trace_proc = nil

data/test/test_trace.rb

@@ -10,7 +10,7 @@ class TraceTest < MiniTest::Test
 
     assert_equal [
       [:fiber_schedule, Fiber.current, nil, false],
-      [:fiber_switchpoint, Fiber.current],
+      [:fiber_switchpoint, Fiber.current, ["#{__FILE__}:#{__LINE__ - 4}:in `test_tracing_enabled'"] + caller],
       [:fiber_run, Fiber.current, nil]
     ], events
   ensure
@@ -22,9 +22,15 @@ class TraceTest < MiniTest::Test
     Thread.backend.trace_proc = proc { |*e| events << e }
 
     f = spin { sleep 0; :byebye }
+    l0 = __LINE__ + 1
     suspend
     sleep 0
 
+    Thread.backend.trace_proc = nil
+    
+    # remove caller info for :fiber_switchpoint events
+    events.each {|e| e.pop if e[0] == :fiber_switchpoint }
+
     assert_equal [
       [:fiber_create, f],
       [:fiber_schedule, f, nil, false],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.74'
+  version: '0.75'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -136,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.4
-description:
+description: 
 email: sharon@noteflakes.com
 executables: []
 extensions:
@@ -412,7 +412,7 @@ metadata:
   documentation_uri: https://digital-fabric.github.io/polyphony/
   homepage_uri: https://digital-fabric.github.io/polyphony/
   changelog_uri: https://github.com/digital-fabric/polyphony/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--title"
 - polyphony
@@ -431,8 +431,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.2.32
+signing_key: 
 specification_version: 4
 summary: Fine grained concurrency for Ruby
 test_files: []