polyphony 0.73.1 → 0.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1647a2b1735e71dd4adf19ff701a649198786c3055430a0941b93e0905cf9dc
-  data.tar.gz: d00f4541d6bab4d7852ced8c0a8e15b6756305ab1c9eab3f7931bf7a18cfd6fc
+  metadata.gz: 10f049946dc02d9cdd984cc8658687d2319e0fd85f6f2cce74aa0a887bc714cb
+  data.tar.gz: 5118859d4640aebeddb9186c43d58617e9b455a63ea97c1dc8283432db954fd1
 SHA512:
-  metadata.gz: 5ec65b272aad6089f9f5a0a208a1e2a537e306fd1fc5247bb5aa25df22ad135d37c771947287b4d4ce5e3e4d5c5d8ced4fef9bab2291a6b7300f7b22245dd70f
-  data.tar.gz: 245c18039397202618c4a70538878396048ce409f36e51ece94919cd1720020cc47e13f213020c378c4d6caa9017df1c5082cd292e5f7987f11730486a0b0c0a
+  metadata.gz: e107e21d6c42f9cd9e91521e288dfee37a6f0da4b7d8a8d311924bf88ccf732d2cc94de834dbbaa3c7a974e5bb84ce1d8d20efd68870c9f2dac9b73155d28558
+  data.tar.gz: 8e4f7005c9cbc46cd084bbe66a4e8f7145f6a4a3062ce027a70eee07c0e648f79289515591ef4b48010580b7125c403ab09e45417781346ebf6da4b2d528ec45

data/.github/workflows/test.yml

@@ -7,26 +7,29 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, ubuntu-18.04, macos-10.15]
-        ruby: [2.6, 2.7, 3.0]
+        os: [ubuntu-latest, macos-latest]
+        ruby: ['2.7', '3.0', '3.1', 'head']
 
     name: >-
       ${{matrix.os}}, ${{matrix.ruby}}
 
     runs-on: ${{matrix.os}}
+
+    env:
+      POLYPHONY_USE_LIBEV: "1"
+
     steps:
-    - uses: actions/checkout@v1
-    - uses: ruby/setup-ruby@v1
+    - name: Setup OS
+      uses: actions/checkout@v1
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
         bundler-cache: true # 'bundle install' and cache
-    - name: Install dependencies
-      run: |
-        gem install bundler
-        bundle install
-    - name: Show Linux kernel version
+        cache-version: 2
+    - name: Kernel version
       run: uname -a
     - name: Compile C-extension
-      run: POLYPHONY_USE_LIBEV=1 bundle exec rake compile
+      run: bundle exec rake compile
     - name: Run tests
       run:  bundle exec rake test

data/.github/workflows/test_io_uring.yml

@@ -0,0 +1,32 @@
+name: Tests with io_uring
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby: [2.6, 2.7, 3.0]
+
+    name: >-
+      ${{matrix.os}}, ${{matrix.ruby}}
+
+    runs-on: ${{matrix.os}}
+    steps:
+    - uses: actions/checkout@v1
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+        bundler-cache: true # 'bundle install' and cache
+    - name: Install dependencies
+      run: |
+        gem install bundler
+        bundle install
+    - name: Show Linux kernel version
+      run: uname -a
+    - name: Compile C-extension
+      run: bundle exec rake compile
+    - name: Run tests
+      run:  bundle exec rake test

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.77 2022-02-07
+
+- Fix behaviour of signal traps (#71)
+
+## 0.76 2022-02-06
+
+- Comment out `Backend_close` API (#70)
+
+## 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)
+- Override TCPSocket.open
+
 ## 0.73.1 2021-12-17
 
 - Fix Gemfile.lock

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.73.1)
+    polyphony (0.77)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
+    mime-types-data (3.2022.0105)
     minitest (5.14.4)
     minitest-reporters (1.4.2)
       ansi
@@ -29,12 +29,12 @@ GEM
     msgpack (1.4.2)
     multi_xml (0.6.0)
     parallel (1.21.0)
-    parser (3.0.3.2)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
     rake-compiler (1.1.1)
       rake
@@ -49,7 +49,7 @@ GEM
       rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.15.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     simplecov (0.17.1)
@@ -60,7 +60,10 @@ GEM
     unicode-display_width (1.8.0)
 
 PLATFORMS
-  ruby
+  universal-darwin
+  universal-freebsd
+  universal-linux
+  universal-unknown
 
 DEPENDENCIES
   httparty (= 0.17.1)
@@ -75,4 +78,4 @@ DEPENDENCIES
   simplecov (= 0.17.1)
 
 BUNDLED WITH
-   2.1.4
+   2.3.3

data/examples/core/trap1.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+pid = Process.pid
+fork do
+  sleep 1
+  Process.kill('SIGINT', pid)
+  # sleep 10
+  # Process.kill(-9, pid)
+end
+
+require 'bundler/setup'
+require 'polyphony'
+
+Thread.backend.trace_proc = proc { |*e| STDOUT.orig_write("#{e.inspect}\n") }
+trap('SIGINT') { STDOUT.orig_write("* recv SIGINT\n") }
+# trap('SIGCHLD') { STDOUT.orig_write("* recv SIGCHLD\n") }
+STDOUT.orig_write("* pre gets\n")
+# STDIN.wait_readable
+s = gets
+p s
+STDOUT.orig_write("* post gets\n")

data/examples/core/trap2.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+pid = Process.pid
+fork do
+  sleep 1
+  Process.kill('SIGINT', pid)
+  # sleep 10
+  # Process.kill(-9, pid)
+end
+
+trap('SIGINT') {}
+p :before
+result = IO.select([STDIN])
+p :after

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);
@@ -106,14 +107,14 @@ VALUE backend_base_switch_fiber(VALUE backend, struct Backend_base *base) {
 
 void backend_base_schedule_fiber(VALUE thread, VALUE backend, struct Backend_base *base, VALUE fiber, VALUE value, int prioritize) {
   int already_runnable;
+  runqueue_t *runqueue;
 
   if (rb_fiber_alive_p(fiber) != Qtrue) return;
   already_runnable = rb_ivar_get(fiber, ID_ivar_runnable) != Qnil;
 
   COND_TRACE(base, 4, SYM_fiber_schedule, fiber, value, prioritize ? Qtrue : Qfalse);
 
-  runqueue_t *runqueue = rb_ivar_get(fiber, ID_ivar_parked) == Qtrue ?
-    &base->parked_runqueue : &base->runqueue;
+  runqueue = rb_ivar_get(fiber, ID_ivar_parked) == Qtrue ? &base->parked_runqueue : &base->runqueue;
 
   (prioritize ? runqueue_unshift : runqueue_push)(runqueue, fiber, value, already_runnable);
   if (!already_runnable) {
@@ -206,6 +207,36 @@ inline VALUE io_enc_str(VALUE str, rb_io_t *fptr) {
   return str;
 }
 
+static inline void free_io_buffer(rb_io_buffer_t *buf)
+{
+  if (buf->ptr) {
+    ruby_xfree(buf->ptr);
+    buf->ptr = NULL;
+  }
+}
+
+static inline void clear_codeconv(rb_io_t *fptr) {
+  if (fptr->readconv) {
+    rb_econv_close(fptr->readconv);
+    fptr->readconv = NULL;
+  }
+  free_io_buffer(&fptr->cbuf);
+
+  if (fptr->writeconv) {
+    rb_econv_close(fptr->writeconv);
+    fptr->writeconv = NULL;
+  }
+  fptr->writeconv_initialized = 0;
+}
+
+void fptr_finalize(rb_io_t *fptr) {
+  fptr->fd = -1;
+  fptr->stdio_file = 0;
+  free_io_buffer(&fptr->rbuf);
+  free_io_buffer(&fptr->wbuf);
+  clear_codeconv(fptr);
+}
+
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
@@ -238,17 +269,22 @@ inline void rectify_io_file_pos(rb_io_t *fptr) {
 
 inline double current_time() {
   struct timespec ts;
+  double t;
+  uint64_t ns;
+  
   clock_gettime(CLOCK_MONOTONIC, &ts);
-  long long ns = ts.tv_sec;
+  ns = ts.tv_sec;
   ns = ns * 1e9 + ts.tv_nsec;
-  double t = ns;
+  t = ns;
   return t / 1e9;
 }
 
 inline uint64_t current_time_ns() {
   struct timespec ts;
+  uint64_t ns;
+
   clock_gettime(CLOCK_MONOTONIC, &ts);
-  uint64_t ns = ts.tv_sec;
+  ns = ts.tv_sec;
   return ns * 1e9 + ts.tv_nsec;
 }
 
@@ -276,6 +312,9 @@ VALUE Backend_timeout_ensure_safe(VALUE arg) {
 static VALUE empty_string = Qnil;
 
 VALUE Backend_sendv(VALUE self, VALUE io, VALUE ary, VALUE flags) {
+  VALUE joined;
+  VALUE result;
+
   switch (RARRAY_LEN(ary)) {
   case 0:
     return Qnil;
@@ -286,14 +325,16 @@ VALUE Backend_sendv(VALUE self, VALUE io, VALUE ary, VALUE flags) {
       empty_string = rb_str_new_literal("");
       rb_global_variable(&empty_string);
     }
-    VALUE joined = rb_ary_join(ary, empty_string);
-    VALUE result = Backend_send(self, io, joined, flags);
+    joined = rb_ary_join(ary, empty_string);
+    result = Backend_send(self, io, joined, flags);
     RB_GC_GUARD(joined);
     return result;
   }
 }
 
 inline void io_verify_blocking_mode(rb_io_t *fptr, VALUE io, VALUE blocking) {
+  int flags;
+  int is_nonblocking;
   VALUE blocking_mode = rb_ivar_get(io, ID_ivar_blocking_mode);
   if (blocking == blocking_mode) return;
 
@@ -303,9 +344,9 @@ inline void io_verify_blocking_mode(rb_io_t *fptr, VALUE io, VALUE blocking) {
   if (blocking != Qtrue)
     rb_w32_set_nonblock(fptr->fd);
 #elif defined(F_GETFL)
-  int flags = fcntl(fptr->fd, F_GETFL);
+  flags = fcntl(fptr->fd, F_GETFL);
   if (flags == -1) return;
-  int is_nonblocking = flags & O_NONBLOCK;
+  is_nonblocking = flags & O_NONBLOCK;
 
   if (blocking == Qtrue) {
     if (!is_nonblocking) return;
@@ -319,12 +360,14 @@ inline void io_verify_blocking_mode(rb_io_t *fptr, VALUE io, VALUE blocking) {
 }
 
 inline void backend_run_idle_tasks(struct Backend_base *base) {
+  double now;
+
   if (base->idle_proc != Qnil)
     rb_funcall(base->idle_proc, ID_call, 0);
 
   if (base->idle_gc_period == 0) return;
 
-  double now = current_time();
+  now = current_time();
   if (now - base->idle_gc_last_time < base->idle_gc_period) return;
 
   base->idle_gc_last_time = now;
@@ -373,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"));
@@ -389,4 +439,26 @@ void backend_setup_stats_symbols() {
   rb_global_variable(&SYM_switch_count);
   rb_global_variable(&SYM_poll_count);
   rb_global_variable(&SYM_pending_ops);
-}
+}
+
+int backend_getaddrinfo(VALUE host, VALUE port, struct sockaddr **ai_addr) {
+  VALUE port_string;
+  struct addrinfo hints;
+  struct addrinfo *addrinfo_result;
+  int ret;
+
+  memset(&hints, 0, sizeof(struct addrinfo));
+  hints.ai_family = AF_UNSPEC; /* allow IPv4 or IPv6 */
+  hints.ai_socktype = SOCK_STREAM;
+
+  port_string = rb_funcall(port, ID_to_s, 0);
+  ret = getaddrinfo(StringValueCStr(host), StringValueCStr(port_string), &hints, &addrinfo_result);
+  RB_GC_GUARD(port_string);
+  if (ret != 0) {
+    VALUE msg = rb_str_new2(gai_strerror(ret));
+    rb_funcall(rb_mKernel, ID_raise, 1, msg);
+    RB_GC_GUARD(msg);
+  }
+  *ai_addr = addrinfo_result->ai_addr;
+  return addrinfo_result->ai_addrlen;
+}

data/ext/polyphony/backend_common.h

@@ -1,6 +1,11 @@
 #ifndef BACKEND_COMMON_H
 #define BACKEND_COMMON_H
 
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <netdb.h>
+
 #include "ruby.h"
 #include "ruby/io.h"
 #include "runqueue.h"
@@ -68,6 +73,7 @@ void io_shrink_read_string(VALUE str, long n);
 void io_set_read_length(VALUE str, long n, int shrinkable);
 rb_encoding* io_read_encoding(rb_io_t *fptr);
 VALUE io_enc_str(VALUE str, rb_io_t *fptr);
+void fptr_finalize(rb_io_t *fptr);
 
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
@@ -106,8 +112,10 @@ 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();
+int backend_getaddrinfo(VALUE host, VALUE port, struct sockaddr **ai_addr);
 
 #endif /* BACKEND_COMMON_H */