polyphony 0.80 → 0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf3658689c8bb7614624ad75492b16fc31401c5c8ee37cd510bb4aab1c9d1449
-  data.tar.gz: 5e2520d758db10e9dfe8022d6a85df61e1702f2e1e6560a95968e37b6f4f6e82
+  metadata.gz: aef5f8ee7585e1ae6a6632099329ba35b7dc6959dba5041f4cdcbaf92caded72
+  data.tar.gz: b168b56f080029e4167e2528e66b83186a635ea4bda8dc74882dfe70639421fc
 SHA512:
-  metadata.gz: 7bd42d8fed28064941281c0e010f86a7ff7fff56e28c8e8190c8bc5c68eebd26a8d568e03ce20120db64684a036afb8d9b8586668c59f39fadebdaba2624ba75
-  data.tar.gz: cd91d0394a0642fbb43d59cc3ba6a3100377be955f1cabeebc051f8f6159d6fb0e78fa7deedabc6bc4fabc20b12453c963b85ed9ce76002211d3423b05f51542
+  metadata.gz: aa7bd86706d5879c884b4f5bdc7a10556cbe28e6737ff89e5107589e1630028098dd815424ef357e51879a7e689cd5127ea30105eb1c36a174da7385b8f6f433
+  data.tar.gz: 3c4b35eed6900d55c5295c366803b944a6e423775ca5278f4b2600a309cb547cda12a2167ae40a4ef8e0001a1b6a8b8ea936129246f24d87b0eec59c9d31a3b4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.81 2022-03-03
+
+- Restore public visibility for `Polyphony::Process.kill_process`
+- Restore public visibility for `Polyphony::Net.setup_alpn`
+
 ## 0.80 2022-02-28
 
 - Prevent reentry into `trace_proc`

data/Gemfile.lock

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

data/ext/polyphony/backend_common.h

@@ -9,6 +9,7 @@
 #include "ruby.h"
 #include "ruby/io.h"
 #include "runqueue.h"
+#include "polyphony.h"
 
 struct backend_stats {
   unsigned int runqueue_size;

data/ext/polyphony/backend_io_uring.c

@@ -102,6 +102,24 @@ static VALUE Backend_initialize(VALUE self) {
   return self;
 }
 
+static inline struct io_buffer get_io_buffer(VALUE in) {
+  if (FIXNUM_P(in)) {
+    struct raw_buffer *raw = (struct raw_buffer *)(FIX2LONG(in));
+    return (struct io_buffer){ raw->base, raw->size, 1 };
+  }
+  return (struct io_buffer){ RSTRING_PTR(in), RSTRING_LEN(in), 0 };
+}
+
+static inline VALUE coerce_io_string_or_buffer(VALUE buf) {
+  switch (TYPE(buf)) {
+    case T_STRING:
+    case T_FIXNUM:
+      return buf;
+    default:
+      return StringValue(buf);
+  }
+}
+
 VALUE Backend_finalize(VALUE self) {
   Backend_t *backend;
   GetBackend(self, backend);
@@ -332,23 +350,37 @@ VALUE io_uring_backend_wait_fd(Backend_t *backend, int fd, int write) {
 VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof, VALUE pos) {
   Backend_t *backend;
   rb_io_t *fptr;
-  long dynamic_len = length == Qnil;
-  long buffer_size = dynamic_len ? 4096 : NUM2INT(length);
+  struct io_buffer buffer = get_io_buffer(str);
   long buf_pos = NUM2INT(pos);
-  int shrinkable;
-  char *buf;
+  int shrinkable_string = 0;
+  int expandable_buffer = 0;
   long total = 0;
   int read_to_eof = RTEST(to_eof);
   VALUE underlying_io = rb_ivar_get(io, ID_ivar_io);
 
-
-  if (str != Qnil) {
-    int current_len = RSTRING_LEN(str);
-    if (buf_pos < 0 || buf_pos > current_len) buf_pos = current_len;
+  if (buffer.raw) {
+    if (buf_pos < 0 || buf_pos > buffer.size) buf_pos = buffer.size;
+    buffer.base += buf_pos;
+    buffer.size -= buf_pos;
+  }
+  else {
+    expandable_buffer = length == Qnil;
+    long expected_read_length = expandable_buffer ? 4096 : FIX2INT(length);
+    long string_cap = rb_str_capacity(str);
+    if (buf_pos < 0 || buf_pos > buffer.size) buf_pos = buffer.size;
+
+    if (string_cap < expected_read_length + buf_pos) {
+      shrinkable_string = io_setstrbuf(&str, expected_read_length + buf_pos);
+      buffer.base = RSTRING_PTR(str) + buf_pos;
+      buffer.size = expected_read_length;
+    }
+    else {
+      buffer.base += buf_pos;
+      buffer.size = string_cap - buf_pos;
+      if (buffer.size > expected_read_length)
+        buffer.size = expected_read_length;
+    }
   }
-  else buf_pos = 0;
-  shrinkable = io_setstrbuf(&str, buf_pos + buffer_size);
-  buf = RSTRING_PTR(str) + buf_pos;
 
   GetBackend(self, backend);
   if (underlying_io != Qnil) io = underlying_io;
@@ -364,7 +396,7 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof,
     int result;
     int completed;
     
-    io_uring_prep_read(sqe, fptr->fd, buf, buffer_size - total, -1);
+    io_uring_prep_read(sqe, fptr->fd, buffer.base, buffer.size - total, -1);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
@@ -383,22 +415,28 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof,
       total += result;
       if (!read_to_eof) break;
 
-      if (total == buffer_size) {
-        if (!dynamic_len) break;
+      if (total == buffer.size) {
+        if (!expandable_buffer) break;
 
         // resize buffer
-        rb_str_resize(str, buf_pos + total);
-        rb_str_modify_expand(str, buffer_size);
-        buf = RSTRING_PTR(str) + buf_pos + total;
-        shrinkable = 0;
-        buffer_size += buffer_size;
+        rb_str_resize(str, total + buf_pos);
+        rb_str_modify_expand(str, buffer.size);
+        shrinkable_string = 0;
+        buffer.base = RSTRING_PTR(str) + total + buf_pos;
+        buffer.size = buffer.size;
+      }
+      else {
+        buffer.base += result;
+        buffer.size -= result;
+        if (!buffer.size) break;
       }
-      else buf += result;
     }
   }
 
-  io_set_read_length(str, buf_pos + total, shrinkable);
-  io_enc_str(str, fptr);
+  if (!buffer.raw) {
+    io_set_read_length(str, buf_pos + total, shrinkable_string);
+    io_enc_str(str, fptr);
+  }
 
   if (!total) return Qnil;
 
@@ -514,9 +552,9 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
   Backend_t *backend;
   rb_io_t *fptr;
   VALUE underlying_io;
-  char *buf = StringValuePtr(str);
-  long len = RSTRING_LEN(str);
-  long left = len;
+
+  struct io_buffer buffer = get_io_buffer(str);
+  long left = buffer.size;
 
   underlying_io = rb_ivar_get(io, ID_ivar_io);
   if (underlying_io != Qnil) io = underlying_io;
@@ -532,7 +570,7 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
     int result;
     int completed;
 
-    io_uring_prep_write(sqe, fptr->fd, buf, left, 0);
+    io_uring_prep_write(sqe, fptr->fd, buffer.base, left, 0);
 
     result = io_uring_backend_defer_submit_and_await(backend, sqe, ctx, &resume_value);
     completed = context_store_release(&backend->store, ctx);
@@ -546,12 +584,12 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
     if (result < 0)
       rb_syserr_fail(-result, strerror(-result));
     else {
-      buf += result;
+      buffer.base += result;
       left -= result;
     }
   }
 
-  return INT2NUM(len);
+  return INT2NUM(buffer.size);
 }
 
 VALUE Backend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {

data/ext/polyphony/polyphony.c

@@ -118,6 +118,12 @@ VALUE Polyphony_backend_write(int argc, VALUE *argv, VALUE self) {
   return Backend_write_m(argc, argv, BACKEND());
 }
 
+VALUE Polyphony_backend_test(VALUE self, VALUE io, VALUE str) {
+  struct raw_buffer buffer = { RSTRING_PTR(str), RSTRING_LEN(str) };
+  VALUE args[2] = { io, LONG2FIX((long)&buffer) };
+  return Polyphony_backend_write(2, args, self);
+}
+
 // VALUE Polyphony_backend_close(VALUE self, VALUE io) {
 //   return Backend_close(BACKEND(), io);
 // }
@@ -149,6 +155,8 @@ void Init_Polyphony() {
   // 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_singleton_method(mPolyphony, "backend_test", Polyphony_backend_test, 2);
+
   rb_define_global_function("snooze", Polyphony_snooze, 0);
   rb_define_global_function("suspend", Polyphony_suspend, 0);
 

data/ext/polyphony/polyphony.h

@@ -135,4 +135,15 @@ VALUE Thread_switch_fiber(VALUE thread);
 
 VALUE Polyphony_snooze(VALUE self);
 
+struct raw_buffer {
+  char *base;
+  int size;
+};
+
+struct io_buffer {
+  char *base;
+  int size;
+  int raw;
+};
+
 #endif /* POLYPHONY_H */

data/lib/polyphony/adapters/process.rb

@@ -24,8 +24,6 @@ module Polyphony
         kill_process(pid) unless terminated || pid.nil?
       end
 
-      private
-
       def kill_process(pid)
         cancel_after(5) do
           kill_and_await('TERM', pid)
@@ -34,6 +32,8 @@ module Polyphony
         kill_and_await(-9, pid)
       end
 
+      private
+
       def kill_and_await(sig, pid)
         ::Process.kill(sig, pid)
         Polyphony.backend_waitpid(pid)

data/lib/polyphony/net.rb

@@ -53,6 +53,21 @@ module Polyphony
         end
       end
 
+      # Sets up ALPN negotiation for the given context. The ALPN handler for the
+      # context will select the first protocol from the list given by the client
+      # that appears in the list of given protocols, according to the specified
+      # order.
+      # 
+      # @param context [SSLContext] SSL context
+      # @param protocols [Array] array of supported protocols
+      # @return [void]
+      def setup_alpn(context, protocols)
+        context.alpn_protocols = protocols
+        context.alpn_select_cb = lambda do |peer_protocols|
+          (protocols & peer_protocols).first
+        end
+      end
+
       private
 
       # Creates a listening `Socket` instance.
@@ -114,21 +129,6 @@ module Polyphony
         setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
         OpenSSL::SSL::SSLServer.new(socket, context)
       end
-
-      # Sets up ALPN negotiation for the given context. The ALPN handler for the
-      # context will select the first protocol from the list given by the client
-      # that appears in the list of given protocols, according to the specified
-      # order.
-      # 
-      # @param context [SSLContext] SSL context
-      # @param protocols [Array] array of supported protocols
-      # @return [void]
-      def setup_alpn(context, protocols)
-        context.alpn_protocols = protocols
-        context.alpn_select_cb = lambda do |peer_protocols|
-          (protocols & peer_protocols).first
-        end
-      end
     end
   end
 end

data/lib/polyphony/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.80'
+  version: '0.81'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler