polyphony 0.93 → 0.94

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb7ee7e43bec0bfffbcff8c78cdcdcc7d93f4283014bd9caebfcd94c3da6b96f
-  data.tar.gz: add731011308495bc5ec0f4f5bc1f7152cfaa1dddd0f53f8027b4a64ea0ba08f
+  metadata.gz: 02f56fa13c8397d86a0ceae20dd253461809397e8ad9eb5827a04650f3dc5020
+  data.tar.gz: f956d6e226e4a2b4239dc367abe9b4c1de89173df1b9968748f0da730b88410d
 SHA512:
-  metadata.gz: 108f69257c57caab18780bad60dbd6bed240dd8a45e05e54e54cbb4b90d31382c10c8f25d3c8bb92f8753e134054782eb4b9d47e79ec79da8938ac4c3d14f4a6
-  data.tar.gz: be78ce7748655d18014074fbb95bedecccab8af94b53e7a2db797cdb503a4f67c25a81b9e9b9154d6e1187efbc3c5fd1b4454e604ad068d51a0c3f411ee7c8ea
+  metadata.gz: 262b6272e6f2cdc86c09eca16b60e31713139ef37b7203c77e858d0c991a5754ee842311caac9ee76e09ce71a1f473e18f102f0ce460e903f31acb0317b6a0b5
+  data.tar.gz: d628e38d39ee4bbbeb1f5f9e7b5ba9d2e406911be1cb9af809a310f9cdb0315beb417e41462b68ed58e23e2c94435a5702192fd5946d5c51a9d4ae392ee50872

data/Gemfile.lock

@@ -14,7 +14,7 @@ GEM
     httparty (0.17.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    json (2.6.1)
+    json (2.6.2)
     localhost (1.1.9)
     method_source (1.0.0)
     mime-types (3.4.1)
@@ -28,8 +28,8 @@ GEM
       ruby-progressbar
     msgpack (1.4.2)
     multi_xml (0.6.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -38,7 +38,7 @@ GEM
     rake (13.0.6)
     rake-compiler (1.1.1)
       rake
-    regexp_parser (2.2.0)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
     rubocop (0.85.1)
       parallel (~> 1.10)
@@ -49,8 +49,8 @@ GEM
       rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     simplecov (0.17.1)
       docile (~> 1.1)
@@ -60,11 +60,7 @@ GEM
     unicode-display_width (1.8.0)
 
 PLATFORMS
-  ruby
-  universal-darwin
-  universal-freebsd
-  universal-linux
-  universal-unknown
+  x86_64-linux
 
 DEPENDENCIES
   httparty (= 0.17.1)
@@ -79,4 +75,4 @@ DEPENDENCIES
   simplecov (= 0.17.1)
 
 BUNDLED WITH
-   2.3.3
+   2.3.7

data/examples/pipes/echo_server.rb

@@ -17,4 +17,4 @@ def handle_client(conn)
 end
 
 puts "Serving echo on port 1234..."
-TCPServer.new('127.0.0.1', 1234).accept_loop { |c| handle_client(c) }
+TCPServer.new('0.0.0.0', 1234).accept_loop { |c| handle_client(c) }

data/examples/pipes/http_server.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  gem 'h1p'
+  gem 'polyphony', path: '.'
+end
+
+require 'polyphony'
+require 'h1p'
+
+def handle_client(conn)
+  spin do
+    parser = H1P::Parser.new(conn, :server)
+    
+    while true # assuming persistent connection
+      headers = parser.parse_headers
+      break unless headers
+
+      parser.read_body unless parser.complete?
+
+      conn << "HTTP/1.1 200 OK\r\nContent-Length: 14\r\n\r\nHello, world!\n"
+    end
+  rescue H1P::Error
+    puts 'Got invalid request, closing connection...'
+  ensure
+    conn.close
+  end
+end
+
+puts "Serving HTTP on port 1234..."
+TCPServer.new('0.0.0.0', 1234).accept_loop { |c| handle_client(c) }

data/ext/polyphony/backend_common.c

@@ -479,10 +479,10 @@ int backend_getaddrinfo(VALUE host, VALUE port, struct sockaddr **ai_addr) {
   return addrinfo_result->ai_addrlen;
 }
 
-struct io_buffer get_io_buffer(VALUE in, int rw) {
+inline struct backend_buffer_spec backend_get_buffer_spec(VALUE in, int rw) {
   if (FIXNUM_P(in)) {
-    struct raw_buffer *raw = FIX2PTR(in);
-    return (struct io_buffer){ raw->ptr, raw->len, 1 };
+    struct buffer_spec *spec = FIX2PTR(in);
+    return (struct backend_buffer_spec){ spec->ptr, spec->len, 1 };
   }
 
   #ifdef HAVE_RUBY_IO_BUFFER_H
@@ -493,11 +493,56 @@ struct io_buffer get_io_buffer(VALUE in, int 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 };
+    return (struct backend_buffer_spec){ ptr, len, 1 };
   }
   #endif
 
-  return (struct io_buffer){ (unsigned char *)RSTRING_PTR(in), RSTRING_LEN(in), 0 };
+  return (struct backend_buffer_spec){ (unsigned char *)RSTRING_PTR(in), RSTRING_LEN(in), 0 };
+}
+
+inline void backend_prepare_read_buffer(VALUE buffer, VALUE length, struct backend_buffer_spec *buffer_spec, int pos) {
+  buffer_spec->pos = pos;
+  buffer_spec->expandable = 0;
+  buffer_spec->shrinkable = 0;
+  if (buffer_spec->raw) {
+    if (buffer_spec->pos < 0 || buffer_spec->pos > buffer_spec->len)
+      buffer_spec->pos = buffer_spec->len;
+    buffer_spec->ptr += buffer_spec->pos;
+    buffer_spec->len -= buffer_spec->pos;
+  }
+  else {
+    buffer_spec->expandable = length == Qnil;
+    long expected_read_length = buffer_spec->expandable ? 4096 : FIX2INT(length);
+    long string_cap = rb_str_capacity(buffer);
+    if (buffer_spec->pos < 0 || buffer_spec->pos > buffer_spec->len)
+      buffer_spec->pos = buffer_spec->len;
+
+    if (string_cap < expected_read_length + buffer_spec->pos) {
+      buffer_spec->shrinkable = io_setstrbuf(&buffer, expected_read_length + buffer_spec->pos);
+      buffer_spec->ptr = (unsigned char *)RSTRING_PTR(buffer) + buffer_spec->pos;
+      buffer_spec->len = expected_read_length;
+    }
+    else {
+      buffer_spec->ptr += buffer_spec->pos;
+      buffer_spec->len = string_cap - buffer_spec->pos;
+      if (buffer_spec->len > expected_read_length)
+        buffer_spec->len = expected_read_length;
+    }
+  }
+}
+
+inline void backend_grow_string_buffer(VALUE buffer, struct backend_buffer_spec *buffer_spec, int total) {
+  // resize buffer to double its capacity
+  rb_str_resize(buffer, total + buffer_spec->pos);
+  rb_str_modify_expand(buffer, rb_str_capacity(buffer));
+  buffer_spec->shrinkable = 0;
+  buffer_spec->ptr = (unsigned char *)RSTRING_PTR(buffer) + total + buffer_spec->pos;
+  buffer_spec->len = rb_str_capacity(buffer) - total - buffer_spec->pos;
+}
+
+inline void backend_finalize_string_buffer(VALUE buffer, struct backend_buffer_spec *buffer_spec, int total, rb_io_t *fptr) {
+  io_set_read_length(buffer, buffer_spec->pos + total, buffer_spec->shrinkable);
+  if (fptr) io_enc_str(buffer, fptr);
 }
 
 VALUE coerce_io_string_or_buffer(VALUE buf) {

data/ext/polyphony/backend_common.h

@@ -55,23 +55,31 @@ struct backend_stats backend_base_stats(struct Backend_base *base);
 }
 #define COND_TRACE(base, ...) if (SHOULD_TRACE(base)) { TRACE(base, __VA_ARGS__); }
 
-// raw buffers
+// buffers
 
-struct raw_buffer {
+struct buffer_spec {
   unsigned char *ptr;
   int len;
 };
 
-struct io_buffer {
+struct backend_buffer_spec {
   unsigned char *ptr;
   int len;
   int raw;
+  int pos;
+  int expandable:1;
+  int shrinkable:1;
+  int reserved:30;
 };
 
 #define FIX2PTR(v) ((void *)(FIX2LONG(v)))
 #define PTR2FIX(p) LONG2FIX((long)p)
 
-struct io_buffer get_io_buffer(VALUE in, int rw);
+struct backend_buffer_spec backend_get_buffer_spec(VALUE in, int rw);
+void backend_prepare_read_buffer(VALUE buffer, VALUE length, struct backend_buffer_spec *buffer_spec, int pos);
+void backend_grow_string_buffer(VALUE buffer, struct backend_buffer_spec *buffer_spec, int total);
+void backend_finalize_string_buffer(VALUE buffer, struct backend_buffer_spec *buffer_spec, int total, rb_io_t *fptr);
+
 VALUE coerce_io_string_or_buffer(VALUE buf);
 
 #ifdef POLYPHONY_USE_PIDFD_OPEN
@@ -106,23 +114,23 @@ VALUE backend_snooze(struct Backend_base *backend);
 
 // macros for doing read loops
 #define READ_LOOP_PREPARE_STR() { \
-  str = Qnil; \
-  shrinkable = io_setstrbuf(&str, len); \
-  buf = RSTRING_PTR(str); \
+  buffer = Qnil; \
+  shrinkable = io_setstrbuf(&buffer, len); \
+  ptr = RSTRING_PTR(buffer); \
   total = 0; \
 }
 
 #define READ_LOOP_YIELD_STR() { \
-  io_set_read_length(str, total, shrinkable); \
-  if (fptr) io_enc_str(str, fptr); \
-  rb_yield(str); \
+  io_set_read_length(buffer, total, shrinkable); \
+  if (fptr) io_enc_str(buffer, fptr); \
+  rb_yield(buffer); \
   READ_LOOP_PREPARE_STR(); \
 }
 
 #define READ_LOOP_PASS_STR_TO_RECEIVER(receiver, method_id) { \
-  io_set_read_length(str, total, shrinkable); \
-  if (fptr) io_enc_str(str, fptr); \
-  rb_funcall_passing_block(receiver, method_id, 1, &str); \
+  io_set_read_length(buffer, total, shrinkable); \
+  if (fptr) io_enc_str(buffer, fptr); \
+  rb_funcall_passing_block(receiver, method_id, 1, &buffer); \
   READ_LOOP_PREPARE_STR(); \
 }