polyphony 0.92 → 0.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73f54eb3c5d34b89d6f24b7e66ba330e6d5345fb94a59f5f6c29efa9d6f6c695
-  data.tar.gz: 03ceb137c92d641d90daea57fc40eeababc86996c0f50df5e4c5246b79e134fc
+  metadata.gz: bb7ee7e43bec0bfffbcff8c78cdcdcc7d93f4283014bd9caebfcd94c3da6b96f
+  data.tar.gz: add731011308495bc5ec0f4f5bc1f7152cfaa1dddd0f53f8027b4a64ea0ba08f
 SHA512:
-  metadata.gz: cd04383a8ec148ac7c8d79d9d2ba3cd3d53c4eeb459a0bf91d8aa6b5e97523a7a414dac8ca79d81f0182f6be3db741f7eac0d6eb4f9f405f568fea61c0b5ce5e
-  data.tar.gz: bd4fe45c1bc1a014f0c395580f2975e7273f621f43979fa6a59cefd64388ce371631846b29e30589928071532ddebfa5e0c4cbbb9c2fb57bd384648b092d1621
+  metadata.gz: 108f69257c57caab18780bad60dbd6bed240dd8a45e05e54e54cbb4b90d31382c10c8f25d3c8bb92f8753e134054782eb4b9d47e79ec79da8938ac4c3d14f4a6
+  data.tar.gz: be78ce7748655d18014074fbb95bedecccab8af94b53e7a2db797cdb503a4f67c25a81b9e9b9154d6e1187efbc3c5fd1b4454e604ad068d51a0c3f411ee7c8ea

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.93 2022-04-05
+
+- Add support for IO::Buffer in Ruby 3.1 (#80)
+
 ## 0.92 2022-04-04
 
 - Fix plice on non-Linux OS

data/Gemfile.lock

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

data/Rakefile

@@ -12,7 +12,7 @@ task :recompile => [:clean, :compile]
 task :default => [:compile, :test]
 
 task :test do
-  exec 'ruby test/run.rb'
+  exec 'ruby test/run.rb --verbose'
 end
 
 task :stress_test do

data/ext/polyphony/backend_common.c

@@ -4,6 +4,9 @@
 #include "ruby/io.h"
 #include "polyphony.h"
 #include "backend_common.h"
+#ifdef HAVE_RUBY_IO_BUFFER_H
+#include "ruby/io/buffer.h"
+#endif
 
 inline void backend_base_initialize(struct Backend_base *base) {
   runqueue_initialize(&base->runqueue);
@@ -476,11 +479,24 @@ int backend_getaddrinfo(VALUE host, VALUE port, struct sockaddr **ai_addr) {
   return addrinfo_result->ai_addrlen;
 }
 
-struct io_buffer get_io_buffer(VALUE in) {
+struct io_buffer get_io_buffer(VALUE in, int rw) {
   if (FIXNUM_P(in)) {
     struct raw_buffer *raw = FIX2PTR(in);
     return (struct io_buffer){ raw->ptr, raw->len, 1 };
   }
+
+  #ifdef HAVE_RUBY_IO_BUFFER_H
+  if (rb_obj_is_kind_of(in, rb_cIOBuffer) == Qtrue) {
+    void *ptr;
+    size_t len;
+    if (rw)
+      rb_io_buffer_get_bytes_for_reading(in, (const void **)&ptr, &len);
+    else
+      rb_io_buffer_get_bytes_for_writing(in, &ptr, &len);
+    return (struct io_buffer){ ptr, len, 1 };
+  }
+  #endif
+
   return (struct io_buffer){ (unsigned char *)RSTRING_PTR(in), RSTRING_LEN(in), 0 };
 }
 

data/ext/polyphony/backend_common.h

@@ -71,7 +71,7 @@ struct io_buffer {
 #define FIX2PTR(v) ((void *)(FIX2LONG(v)))
 #define PTR2FIX(p) LONG2FIX((long)p)
 
-struct io_buffer get_io_buffer(VALUE in);
+struct io_buffer get_io_buffer(VALUE in, int rw);
 VALUE coerce_io_string_or_buffer(VALUE buf);
 
 #ifdef POLYPHONY_USE_PIDFD_OPEN

data/ext/polyphony/backend_io_uring.c

@@ -363,7 +363,7 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof,
   Backend_t *backend;
   int fd;
   rb_io_t *fptr;
-  struct io_buffer buffer = get_io_buffer(str);
+  struct io_buffer buffer = get_io_buffer(str, 0);
   long buf_pos = FIX2INT(pos);
   int shrinkable_string = 0;
   int expandable_buffer = 0;
@@ -552,7 +552,7 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
   int fd;
   rb_io_t *fptr;
 
-  struct io_buffer buffer = get_io_buffer(str);
+  struct io_buffer buffer = get_io_buffer(str, 1);
   long left = buffer.len;
 
   GetBackend(self, backend);
@@ -668,7 +668,7 @@ VALUE Backend_recv(VALUE self, VALUE io, VALUE str, VALUE length, VALUE pos) {
   Backend_t *backend;
   int fd;
   rb_io_t *fptr;
-  struct io_buffer buffer = get_io_buffer(str);
+  struct io_buffer buffer = get_io_buffer(str, 0);
   long buf_pos = FIX2INT(pos);
   int shrinkable_string = 0;
   int expandable_buffer = 0;
@@ -836,7 +836,7 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
   int fd;
   rb_io_t *fptr;
 
-  struct io_buffer buffer = get_io_buffer(str);
+  struct io_buffer buffer = get_io_buffer(str, 1);
   long left = buffer.len;
   int flags_int = FIX2INT(flags);
 
@@ -1075,7 +1075,7 @@ VALUE double_splice_cleanup(struct double_splice_ctx *ctx) {
 }
 
 VALUE Backend_double_splice(VALUE self, VALUE src, VALUE dest) {
-  struct double_splice_ctx ctx = { NULL, src, dest, 0, 0 };
+  struct double_splice_ctx ctx = { NULL, src, dest, {0, 0} };
   GetBackend(self, ctx.backend);
   if (pipe(ctx.pipefd) == -1) rb_syserr_fail(errno, strerror(errno));
 

data/ext/polyphony/backend_libev.c

@@ -290,7 +290,7 @@ VALUE Backend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof,
   int fd;
   rb_io_t *fptr;
 
-  struct io_buffer buffer = get_io_buffer(str);
+  struct io_buffer buffer = get_io_buffer(str, 0);
   long buf_pos = FIX2INT(pos);
   int shrinkable_string = 0;
   int expandable_buffer = 0;
@@ -486,7 +486,7 @@ VALUE Backend_write(VALUE self, VALUE io, VALUE str) {
   rb_io_t *fptr;
   VALUE switchpoint_result = Qnil;
 
-  struct io_buffer buffer = get_io_buffer(str);
+  struct io_buffer buffer = get_io_buffer(str, 1);
   long left = buffer.len;
 
   GetBackend(self, backend);
@@ -761,7 +761,7 @@ VALUE Backend_send(VALUE self, VALUE io, VALUE str, VALUE flags) {
   rb_io_t *fptr;
   VALUE switchpoint_result = Qnil;
 
-  struct io_buffer buffer = get_io_buffer(str);
+  struct io_buffer buffer = get_io_buffer(str, 1);
   long left = buffer.len;
   int flags_int = FIX2INT(flags);
 

data/ext/polyphony/extconf.rb

@@ -61,6 +61,8 @@ else
   $defs << '-DEV_USE_PORT'         if have_type('port_event_t', 'port.h')
   $defs << '-DHAVE_SYS_RESOURCE_H' if have_header('sys/resource.h')
 
+  $defs << "-DEV_STANDALONE" # prevent libev from assuming "config.h" exists
+
   $CFLAGS << " -Wno-comment"
   $CFLAGS << " -Wno-unused-result"
   $CFLAGS << " -Wno-dangling-else"
@@ -75,4 +77,6 @@ if RUBY_VERSION >= '3.1'
   have_func('rb_fiber_transfer', 'ruby.h')
 end
 
+have_header('ruby/io/buffer.h')
+
 create_makefile 'polyphony_ext'

data/lib/polyphony/version.rb

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

data/test/test_backend.rb

@@ -404,6 +404,23 @@ class BackendTest < MiniTest::Test
     sleep 0.01
     assert_equal 2, counter
   end
+
+  def test_read_write_with_io_buffer
+    skip "Works only on Ruby >= 3.1" if RUBY_VERSION < '3.1'
+
+    msg = 'Hello world'
+    i, o = IO.pipe
+    read_buffer = IO::Buffer.new(64)
+    f = spin { @backend.read(i, read_buffer, 64, true, 0) }
+    write_buffer = IO::Buffer.new(msg.bytesize)
+    write_buffer.set_string(msg, 0)
+    @backend.write(o, write_buffer)
+    o.close
+    return_value = f.await
+
+    assert_equal msg.bytesize, return_value
+    assert_equal msg, read_buffer.get_string(0, msg.bytesize)
+  end
 end
 
 class BackendChainTest < MiniTest::Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.92'
+  version: '0.93'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-04-05 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:
@@ -645,7 +645,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
@@ -664,8 +664,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Fine grained concurrency for Ruby
 test_files: []