polyphony 0.81 → 0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef5f8ee7585e1ae6a6632099329ba35b7dc6959dba5041f4cdcbaf92caded72
-  data.tar.gz: b168b56f080029e4167e2528e66b83186a635ea4bda8dc74882dfe70639421fc
+  metadata.gz: a1e0c71b9d91e674e4ce004da08cdf6535f56e48b063b63538685eb781654df6
+  data.tar.gz: 58bf12edd0751ecc552ee01b6eb7042585061f7800f0dfa6fdc0990b87349982
 SHA512:
-  metadata.gz: aa7bd86706d5879c884b4f5bdc7a10556cbe28e6737ff89e5107589e1630028098dd815424ef357e51879a7e689cd5127ea30105eb1c36a174da7385b8f6f433
-  data.tar.gz: 3c4b35eed6900d55c5295c366803b944a6e423775ca5278f4b2600a309cb547cda12a2167ae40a4ef8e0001a1b6a8b8ea936129246f24d87b0eec59c9d31a3b4
+  metadata.gz: c35e1c2756556db5bf11012b95c7e729d7ad43f52802c61fa5467d44a6460a2f30f840bc945347e83ed24d35e559b0ca4ac9d5657c9d0c805ffb44774765f867
+  data.tar.gz: 37c34a7c2cc0b3443c0f33908f40156c223eae233ca08f564a606a7bec5c8c68189b973e6fa40fd1534bb3c9f2f3985b52fcdd33c7ea9069ba21e32e7ebc1760

data/.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     env:
-      POLYPHONY_USE_LIBEV: "1"
+      POLYPHONY_LIBEV: "1"
 
     steps:
     - name: Setup machine

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.83 2022-03-10
+
+- Implement `Polyphony::Pipe` class, `Polyphony.pipe` method (#83)
+- Add `IO.splice`, `IO.splice_to_eof` (#82)
+- Implement compression/decompression methods (#77)
+
+## 0.82 2022-03-04
+
+- Use `POLYPHONY_LIBEV` instead of `POLYPHONY_USE_LIBEV` environment variable
+- Add support for working with raw buffers (#78)
+
+## 0.81.1 2022-03-03
+
+- Fix `Backend_recv` regression
+
 ## 0.81 2022-03-03
 
 - Restore public visibility for `Polyphony::Process.kill_process`

data/Gemfile.lock

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

data/bin/test

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
-clear && POLYPHONY_USE_LIBEV=1 rake recompile && ruby test/run.rb
+clear && POLYPHONY_LIBEV=1 rake recompile && ruby test/run.rb
 clear && rake recompile && ruby test/run.rb

data/examples/core/raw_buffer_test.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+puts '* pre'
+Polyphony.backend_test(STDOUT, "Hello, world!\n")
+puts '* post'

data/examples/core/zlib_stream.rb

@@ -10,6 +10,7 @@ writer = Zlib::GzipWriter.new(w)
 writer << 'chunk'
 writer.flush
 p pos: writer.pos
-w.close
+# w.close
+writer.close
 
 p r.read

data/ext/polyphony/backend_common.c

@@ -340,33 +340,38 @@ VALUE Backend_sendv(VALUE self, VALUE io, VALUE ary, VALUE flags) {
   }
 }
 
-inline void io_verify_blocking_mode(rb_io_t *fptr, VALUE io, VALUE blocking) {
+inline void set_fd_blocking_mode(int fd, int blocking) {
   int flags;
   int is_nonblocking;
-  VALUE blocking_mode = rb_ivar_get(io, ID_ivar_blocking_mode);
-  if (blocking == blocking_mode) return;
-
-  rb_ivar_set(io, ID_ivar_blocking_mode, blocking);
 
 #ifdef _WIN32
-  if (blocking != Qtrue)
-    rb_w32_set_nonblock(fptr->fd);
+  if (!blocking) rb_w32_set_nonblock(fd);
 #elif defined(F_GETFL)
-  flags = fcntl(fptr->fd, F_GETFL);
+  flags = fcntl(fd, F_GETFL);
   if (flags == -1) return;
   is_nonblocking = flags & O_NONBLOCK;
 
-  if (blocking == Qtrue) {
+  if (blocking) {
     if (!is_nonblocking) return;
     flags &= ~O_NONBLOCK;
   } else {
     if (is_nonblocking) return;
     flags |= O_NONBLOCK;
   }
-  fcntl(fptr->fd, F_SETFL, flags);
+  fcntl(fd, F_SETFL, flags);
 #endif
 }
 
+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;
+
+  rb_ivar_set(io, ID_ivar_blocking_mode, blocking);
+  set_fd_blocking_mode(fptr->fd, blocking == Qtrue);
+}
+
 inline void backend_run_idle_tasks(struct Backend_base *base) {
   double now;
 
@@ -470,3 +475,21 @@ int backend_getaddrinfo(VALUE host, VALUE port, struct sockaddr **ai_addr) {
   *ai_addr = addrinfo_result->ai_addr;
   return addrinfo_result->ai_addrlen;
 }
+
+struct io_buffer get_io_buffer(VALUE in) {
+  if (FIXNUM_P(in)) {
+    struct raw_buffer *raw = FIX2PTR(in);
+    return (struct io_buffer){ raw->ptr, raw->len, 1 };
+  }
+  return (struct io_buffer){ RSTRING_PTR(in), RSTRING_LEN(in), 0 };
+}
+
+VALUE coerce_io_string_or_buffer(VALUE buf) {
+  switch (TYPE(buf)) {
+    case T_STRING:
+    case T_FIXNUM:
+      return buf;
+    default:
+      return StringValue(buf);
+  }
+}

data/ext/polyphony/backend_common.h

@@ -9,7 +9,6 @@
 #include "ruby.h"
 #include "ruby/io.h"
 #include "runqueue.h"
-#include "polyphony.h"
 
 struct backend_stats {
   unsigned int runqueue_size;
@@ -56,7 +55,24 @@ struct backend_stats backend_base_stats(struct Backend_base *base);
 }
 #define COND_TRACE(base, ...) if (SHOULD_TRACE(base)) { TRACE(base, __VA_ARGS__); }
 
+// raw buffers
 
+struct raw_buffer {
+  unsigned char *ptr;
+  int len;
+};
+
+struct io_buffer {
+  unsigned char *ptr;
+  int len;
+  int raw;
+};
+
+#define FIX2PTR(v) ((void *)(FIX2LONG(v)))
+#define PTR2FIX(p) LONG2FIX((long)p)
+
+struct io_buffer get_io_buffer(VALUE in);
+VALUE coerce_io_string_or_buffer(VALUE buf);
 
 #ifdef POLYPHONY_USE_PIDFD_OPEN
 int pidfd_open(pid_t pid, unsigned int flags);
@@ -98,14 +114,14 @@ VALUE backend_snooze(struct Backend_base *backend);
 
 #define READ_LOOP_YIELD_STR() { \
   io_set_read_length(str, total, shrinkable); \
-  io_enc_str(str, fptr); \
+  if (fptr) io_enc_str(str, fptr); \
   rb_yield(str); \
   READ_LOOP_PREPARE_STR(); \
 }
 
 #define READ_LOOP_PASS_STR_TO_RECEIVER(receiver, method_id) { \
   io_set_read_length(str, total, shrinkable); \
-  io_enc_str(str, fptr); \
+  if (fptr) io_enc_str(str, fptr); \
   rb_funcall_passing_block(receiver, method_id, 1, &str); \
   READ_LOOP_PREPARE_STR(); \
 }
@@ -120,6 +136,7 @@ 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 set_fd_blocking_mode(int fd, int blocking);
 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);