polyphony 0.86 → 0.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b87dae4e2c17055e8206c820a4281774cdf3127195173948c97df4eb09a2bd13
-  data.tar.gz: 2e7bd958ec7435569423398069223eda41e9c2d89f580627bc22e9054276dd1c
+  metadata.gz: 938f929b8373ea094ae045c5acc830f6b848a5018bc5604eab280c740e72f56f
+  data.tar.gz: e0806785ca3b5ea6101640b8bbfba9ece96f5c614e13267e07a1f15c33efeb1f
 SHA512:
-  metadata.gz: 48f6489939da965463735c83acb4372263eb44b48b5a16da1e704a15e3af971a5d43abd7da5e44f2455b40d880413c6fa8159794e663176c83a11eddebdebc7d
-  data.tar.gz: 3ada5f9041041e91b6b2a7f31ec609352752317e87c51df090517c9e2b556d9ef69ef8842babd15f25b2257c4226431520ff15df505748cb38bb4a1d5a19063c
+  metadata.gz: db4f627ab9fd78899711f8eb12c359e038835ada7d43e494cf0377a2a7f6795746a1e877987f32934e94700cb536c27b58e53d7a5cf77161863a4d26c55abcb5
+  data.tar.gz: f7ac358243a16baa8e83923cf46ac7d8ce422a9e0faeea28faa3e0dd523b6b666180fcf1f5182e86c534ced64cfe680895bcdf7bdc9f16e77b641940f439d992

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.87 2022-03-17
+
+- Fix compilation on non-Linux OSes
+
 ## 0.86 2022-03-14
 
 - Fix gemspec

data/Gemfile.lock

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

data/examples/io/http1_splice_chunked.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+require 'polyphony'
+
+IO.http1_splice_chunked(STDIN, STDOUT, 16384)

data/examples/io/static_web_server.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+
+require 'polyphony'
+require 'h1p'
+
+server = Polyphony::Net.tcp_listen('localhost', 1234,
+  reuse_addr: true, reuse_port: true, dont_linger: true
+)
+puts 'Serving HTTP on port 1234'
+
+def respond_default(conn)
+  conn << "HTTP/1.1 204\r\n\r\n"
+end
+
+def respond_splice(conn, path)
+  f = File.open(path, 'r') do |f|
+    conn << "HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\n\r\n"
+    IO.http1_splice_chunked(f, conn, 16384)
+  end
+rescue => e
+  p e
+  # conn << "HTTP/1.1 500\r\nContent-Length: 0\r\n\r\n"
+end
+
+def handle_client(conn)
+  parser = H1P::Parser.new(conn, :server)
+  while true
+    headers = parser.parse_headers
+    break unless headers
+
+    case headers[':path']
+    when /^\/splice\/(.+)$/
+      respond_splice(conn, $1)
+    else
+      respond_default(conn)
+    end
+  end
+rescue Errno::ECONNRESET
+  # ignore
+end
+
+server.accept_loop do |conn|
+  handle_client(conn)
+end

data/ext/polyphony/backend_libev.c

@@ -1645,6 +1645,9 @@ void Init_Backend() {
 
   rb_define_method(cBackend, "splice", Backend_splice, 3);
   rb_define_method(cBackend, "splice_to_eof", Backend_splice_to_eof, 3);
+  #ifdef POLYPHONY_LINUX
+  rb_define_method(cBackend, "tee", Backend_tee, 3);
+  #endif
 
   rb_define_method(cBackend, "timeout", Backend_timeout, -1);
   rb_define_method(cBackend, "timer_loop", Backend_timer_loop, 1);

data/ext/polyphony/io_extensions.c

@@ -526,12 +526,44 @@ VALUE IO_inflate(VALUE self, VALUE src, VALUE dest) {
   return INT2FIX(ctx.out_total);
 }
 
+VALUE IO_http1_splice_chunked(VALUE self, VALUE src, VALUE dest, VALUE maxlen) {
+  enum write_method method = detect_write_method(dest);
+  VALUE backend = BACKEND();
+  VALUE pipe = rb_funcall(cPipe, ID_new, 0);
+  unsigned char out[128];
+  struct raw_buffer buffer = { out, 0 };
+
+  while (1) {
+    int len = FIX2INT(Backend_splice(backend, src, pipe, maxlen));
+    if (!len) break;
+
+    // write chunk header
+    buffer.len += sprintf(buffer.ptr + buffer.len, "%x\r\n", len);
+    write_from_raw_buffer(backend, dest, method, &buffer);
+    buffer.len = 0;
+    while (len) {
+      int spliced = FIX2INT(Backend_splice(backend, pipe, dest, INT2FIX(len)));
+      len -= spliced;
+    }
+    buffer.len += sprintf(buffer.ptr + buffer.len, "\r\n");
+  }
+  buffer.len += sprintf(buffer.ptr + buffer.len, "0\r\n\r\n");
+  write_from_raw_buffer(backend, dest, method, &buffer);
+
+  Pipe_close(pipe);
+  RB_GC_GUARD(pipe);
+
+  return self;
+}
+
 void Init_IOExtensions() {
   rb_define_singleton_method(rb_cIO, "gzip", IO_gzip, -1);
   rb_define_singleton_method(rb_cIO, "gunzip", IO_gunzip, -1);
   rb_define_singleton_method(rb_cIO, "deflate", IO_deflate, 2);
   rb_define_singleton_method(rb_cIO, "inflate", IO_inflate, 2);
 
+  rb_define_singleton_method(rb_cIO, "http1_splice_chunked", IO_http1_splice_chunked, 3);
+
   ID_at           = rb_intern("at");
   ID_read_method  = rb_intern("__read_method__");
   ID_readpartial  = rb_intern("readpartial");

data/ext/polyphony/polyphony.c

@@ -94,9 +94,11 @@ VALUE Polyphony_backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE c
   return Backend_splice_to_eof(BACKEND(), src, dest, chunksize);
 }
 
+#ifdef POLYPHONY_LINUX
 VALUE Polyphony_backend_tee(VALUE self, VALUE src, VALUE dest, VALUE chunksize) {
   return Backend_tee(BACKEND(), src, dest, chunksize);
 }
+#endif
 
 VALUE Polyphony_backend_timeout(int argc,VALUE *argv, VALUE self) {
   return Backend_timeout(argc, argv, BACKEND());
@@ -190,7 +192,11 @@ void Init_Polyphony() {
   rb_define_singleton_method(mPolyphony, "backend_sleep", Polyphony_backend_sleep, 1);
   rb_define_singleton_method(mPolyphony, "backend_splice", Polyphony_backend_splice, 3);
   rb_define_singleton_method(mPolyphony, "backend_splice_to_eof", Polyphony_backend_splice_to_eof, 3);
+ 
+  #ifdef POLYPHONY_LINUX
   rb_define_singleton_method(mPolyphony, "backend_tee", Polyphony_backend_tee, 3);
+  #endif
+  
   rb_define_singleton_method(mPolyphony, "backend_timeout", Polyphony_backend_timeout, -1);
   rb_define_singleton_method(mPolyphony, "backend_timer_loop", Polyphony_backend_timer_loop, 1);
   rb_define_singleton_method(mPolyphony, "backend_wait_event", Polyphony_backend_wait_event, 1);

data/ext/polyphony/polyphony.h

@@ -90,6 +90,7 @@ int Runqueue_should_poll_nonblocking(VALUE self);
 
 void Pipe_verify_blocking_mode(VALUE self, VALUE blocking);
 int Pipe_get_fd(VALUE self, int write_mode);
+VALUE Pipe_close(VALUE self);
 
 #ifdef POLYPHONY_BACKEND_LIBEV
 #define Backend_recv_loop Backend_read_loop
@@ -112,7 +113,11 @@ VALUE Backend_sendv(VALUE self, VALUE io, VALUE ary, VALUE flags);
 VALUE Backend_sleep(VALUE self, VALUE duration);
 VALUE Backend_splice(VALUE self, VALUE src, VALUE dest, VALUE maxlen);
 VALUE Backend_splice_to_eof(VALUE self, VALUE src, VALUE dest, VALUE chunksize);
+
+#ifdef POLYPHONY_LINUX
 VALUE Backend_tee(VALUE self, VALUE src, VALUE dest, VALUE maxlen);
+#endif
+
 VALUE Backend_timeout(int argc,VALUE *argv, VALUE self);
 VALUE Backend_timer_loop(VALUE self, VALUE interval);
 VALUE Backend_wait_event(VALUE self, VALUE raise);

data/lib/polyphony/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.86'
+  version: '0.87'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -262,6 +262,7 @@ files:
 - examples/io/echo_stdin.rb
 - examples/io/gzip.rb
 - examples/io/happy-eyeballs.rb
+- examples/io/http1_splice_chunked.rb
 - examples/io/httparty.rb
 - examples/io/https_server.rb
 - examples/io/irb.rb
@@ -274,6 +275,7 @@ files:
 - examples/io/reline.rb
 - examples/io/splice_chunks.rb
 - examples/io/splice_echo_server.rb
+- examples/io/static_web_server.rb
 - examples/io/stdio.rb
 - examples/io/system.rb
 - examples/io/tcp_proxy.rb