polyphony 0.72 → 0.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2af189faeecbe2eecb367a7400005306ab74370e56c61de1d703edd40d851d92
-  data.tar.gz: c0888b10d03b9bf29f1d10a41b0050231db655c587d06035039b4c09e1c68baa
+  metadata.gz: 25015dd770af4d3b375af0625cfe9fe98becb328a0e77abb3101be2580279a7c
+  data.tar.gz: e2227ea3fa7d3ec04f5b580afdc92b9d7aacbab76b9e17dd0b86fb5e4e5b6a6f
 SHA512:
-  metadata.gz: b86fd5682ce52e635658a8d620031f8ae841ef5f7876d6239f74772d8f700054eb3bb7732488e246433a91e5ab4279479c6f18bb0d1a154172d90f351ab8149e
-  data.tar.gz: 713ba61a64ef73c5c16971bd0d678d6575b7bd37062a29348f02ec8e0578821d7ec41f826f1868cd017bede9c70d47192e19a0217469b331f17ff66afac21054
+  metadata.gz: 967f6aa30621aae39dafdb587c28e1c0ec96685fc82972adb19fb50de7adfaaa42ce861c0f941f85ad536e29b459251d22c34a6bd96f8fc89f23dd4c0ecac47a
+  data.tar.gz: b3d6884d859c4eb61ca1d8bc8d1b727a5bf66c6c1af5280896264414bf14654650a1d8bcf3a6b744d235f5dd435e9231a0e047f95a17bfb7ce1642791c347c05

data/.github/workflows/test.yml

@@ -7,25 +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: actions/setup-ruby@v1
+    - name: Setup OS
+      uses: actions/checkout@v1
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
-    - name: Install dependencies
-      run: |
-        gem install bundler
-        bundle install
-    - name: Show Linux kernel version
-      run: uname -r
+        bundler-cache: true # 'bundle install' and cache
+        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/.gitignore

@@ -58,4 +58,6 @@ lib/*.so
 _site
 .sass-cache
 
-log
+log
+
+.ruby-version

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 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
+
+## 0.73 2021-12-16
+
+- Refactor core extensions into separate files for each class
+- Improve compatibility with Ruby 3.1
+- Improve accuracy of `timer_loop`
+
 ## 0.72 2021-11-22
 
 - Add support for supervising added child fibers

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.72)
+    polyphony (0.75)
 
 GEM
   remote: https://rubygems.org/
@@ -14,12 +14,12 @@ GEM
     httparty (0.17.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    json (2.5.1)
-    localhost (1.1.8)
+    json (2.6.1)
+    localhost (1.1.9)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
+    mime-types-data (3.2022.0105)
     minitest (5.14.4)
     minitest-reporters (1.4.2)
       ansi
@@ -28,17 +28,17 @@ GEM
       ruby-progressbar
     msgpack (1.4.2)
     multi_xml (0.6.0)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    parallel (1.21.0)
+    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
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rubocop (0.85.1)
       parallel (~> 1.10)
@@ -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.8.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     simplecov (0.17.1)
@@ -57,10 +57,13 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    unicode-display_width (1.7.0)
+    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.2.26
+   2.3.3

data/docs/api-reference/exception.md

@@ -3,15 +3,19 @@ layout: page
 title: ::Exception
 parent: API Reference
 permalink: /api-reference/exception/
+source_url: https://github.com/digital-fabric/polyphony/blob/master/lib/polyphony/extensions/core.rb
+ruby_docs_url: https://rubyapi.org/3.0/o/exception
 ---
 # ::Exception
 
-[Ruby core Exception documentation](https://ruby-doc.org/core-2.7.0/Exception.html)
+[Ruby core Exception documentation](https://rubyapi.org/3.0/o/exception)
 
 The core `Exception` class is enhanced to provide a better backtrace that takes
 into account the fiber hierarchy. In addition, a `source_fiber` attribute allows
 tracking the fiber from which an uncaught exception was propagated.
 
+
+
 ## Class Methods
 
 ## Instance methods

data/examples/core/ring.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+M = 100
+N = 10000
+
+GC.disable
+
+def monotonic_clock
+  ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+end
+
+def spin_proc(next_fiber)
+  spin_loop { next_fiber << receive }
+end
+
+last = Fiber.current
+N.times { last = spin_proc(last) }
+
+snooze
+t0 = monotonic_clock
+M.times do
+  last << 'hello'
+  receive
+end
+elapsed = monotonic_clock - t0
+puts "M=#{M} N=#{N} elapsed: #{elapsed}"

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) {
@@ -202,11 +203,40 @@ inline rb_encoding* io_read_encoding(rb_io_t *fptr) {
 }
 
 inline VALUE io_enc_str(VALUE str, rb_io_t *fptr) {
-  OBJ_TAINT(str);
   rb_enc_associate(str, io_read_encoding(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);
+}
+
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
@@ -239,13 +269,25 @@ 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);
+  ns = ts.tv_sec;
+  return ns * 1e9 + ts.tv_nsec;
+}
+
 inline VALUE backend_timeout_exception(VALUE exception) {
   if (rb_obj_is_kind_of(exception, rb_cArray) == Qtrue)
     return rb_funcall(rb_ary_entry(exception, 0), ID_new, 1, rb_ary_entry(exception, 1));
@@ -270,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;
@@ -280,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;
 
@@ -297,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;
@@ -313,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;
@@ -367,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"));
@@ -383,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);
 
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
@@ -82,7 +88,6 @@ VALUE backend_snooze();
   shrinkable = io_setstrbuf(&str, len); \
   buf = RSTRING_PTR(str); \
   total = 0; \
-  OBJ_TAINT(str); \
 }
 
 #define READ_LOOP_YIELD_STR() { \
@@ -101,13 +106,16 @@ VALUE backend_snooze();
 
 void rectify_io_file_pos(rb_io_t *fptr);
 double current_time();
+uint64_t current_time_ns();
 VALUE backend_timeout_exception(VALUE exception);
 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 */