polyphony 0.87 → 0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 938f929b8373ea094ae045c5acc830f6b848a5018bc5604eab280c740e72f56f
-  data.tar.gz: e0806785ca3b5ea6101640b8bbfba9ece96f5c614e13267e07a1f15c33efeb1f
+  metadata.gz: d1b4a68e893c4cdca8e308cf3297fbf2549f70c0a7038f7c492f5c7c0a6ca6b4
+  data.tar.gz: 65a1cd1b10fa1a29c37c24972c0a47c324f744ff0ddba6e67464000da2a2707e
 SHA512:
-  metadata.gz: db4f627ab9fd78899711f8eb12c359e038835ada7d43e494cf0377a2a7f6795746a1e877987f32934e94700cb536c27b58e53d7a5cf77161863a4d26c55abcb5
-  data.tar.gz: f7ac358243a16baa8e83923cf46ac7d8ce422a9e0faeea28faa3e0dd523b6b666180fcf1f5182e86c534ced64cfe680895bcdf7bdc9f16e77b641940f439d992
+  metadata.gz: 316969779f3e2ce5a055c886ee89448b1908e57dcfb06775f5aa01491e895b450cfdaa3ec3d1f72f3a59017326dd7c3478b21e85cb7914a8bf2c17544bd47de7
+  data.tar.gz: 0a5badc5927cac1b111a13dd65eac242e2c2a7436dbf9a42e2376c4b321d042e27012e7d6b3906bf1d434d62a85bbfa8651700f2d4585475cbf89bc52de64569

data/.github/workflows/test_io_uring.yml

@@ -8,15 +8,19 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        ruby: [2.6, 2.7, 3.0]
+        ruby: ['2.7', '3.0', '3.1', 'head']
 
     name: >-
       ${{matrix.os}}, ${{matrix.ruby}}
 
     runs-on: ${{matrix.os}}
     steps:
-    - uses: actions/checkout@v1
-    - uses: ruby/setup-ruby@v1
+    - name: Checkout repository and submodules
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
         bundler-cache: true # 'bundle install' and cache
@@ -29,4 +33,4 @@ jobs:
     - name: Compile C-extension
       run: bundle exec rake compile
     - name: Run tests
-      run:  bundle exec rake test
+      run:  bundle exec ruby test/run.rb --verbose --name test_sleep

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.91 2022-03-23
+
+- Add pipe examples
+- Implement `Backend#double_splice_to_eof` (io_ring only)
+- Improve safety of tracing
+
+## 0.90 2022-03-21
+
+- Fix possible compilation error on Ruby 2.7.5 (#79)
+
+## 0.89 2022-03-21
+
+- Implement compression/decompression to/from strings (#86)
+
+## 0.88 2022-03-18
+
+- Improve IO stream compression utilities (release GVL, cleanup on exception)
+
 ## 0.87 2022-03-17
 
 - Fix compilation on non-Linux OSes

data/Gemfile.lock

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

data/examples/pipes/echo_server.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+def handle_client(conn)
+  spin do
+    buffer = Polyphony.pipe
+    spin { IO.splice_to_eof(conn, buffer) }
+    IO.splice_to_eof(buffer, conn)
+  end
+rescue SystemCallError
+  # ignore
+end
+
+puts "Serving echo on port 1234..."
+TCPServer.new('127.0.0.1', 1234).accept_loop { |c| handle_client(c) }

data/examples/pipes/gunzip.rb

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

data/examples/pipes/gzip.rb

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

data/examples/pipes/gzip_http_server.rb

@@ -0,0 +1,49 @@
+# 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
+
+      raw_buffer = Polyphony.pipe
+      gzip_buffer = Polyphony.pipe
+      
+      # splice request body to buffer
+      spin do
+        parser.splice_body_to(raw_buffer)
+        raw_buffer.close
+      end
+
+      # zip data from buffer into gzip buffer
+      spin do
+        IO.gzip(raw_buffer, gzip_buffer)
+        gzip_buffer.close
+      end
+
+      # send headers and splice response from gzip buffer
+      conn << "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n"
+      IO.http1_splice_chunked(gzip_buffer, conn, 65535)
+    end
+  rescue H1P::Error
+    puts 'Got invalid request, closing connection...'
+  ensure
+    conn.close
+  end
+end
+
+puts "Serving echo on port 1234..."
+TCPServer.new('127.0.0.1', 1234).accept_loop { |c| handle_client(c) }
+

data/examples/pipes/tcp_proxy.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+DESTINATION = ['127.0.0.1', 1234]
+
+def handle_client(conn)
+  spin do
+    dest = TCPSocket.new(*DESTINATION)
+    w_buffer = Polyphony.pipe
+    r_buffer = Polyphony.pipe
+    
+    spin { IO.splice_to_eof(conn, w_buffer) }
+    spin { IO.splice_to_eof(w_buffer, dest) }
+
+    spin { IO.splice_to_eof(dest, r_buffer) }
+    spin { IO.splice_to_eof(r_buffer, conn) }
+
+    Fiber.current.await_all_children
+  end
+rescue SystemCallError
+  dest.close rescue nil
+  # ignore
+end
+
+puts "Serving TCP proxy on port 4321..."
+TCPServer.new('127.0.0.1', 4321).accept_loop { |c| handle_client(c) }

data/examples/pipes/tee.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+chunk_size = 1 << 16
+file_path = ARGV[0]
+
+File.open(file_path, 'w+') do |f|
+  loop do
+    len = IO.tee(STDIN, STDOUT, chunk_size)
+    break if len == 0
+    IO.splice(STDIN, f, len)
+  end
+end

data/ext/polyphony/backend_common.c

@@ -140,7 +140,9 @@ inline void backend_base_unpark_fiber(struct Backend_base *base, VALUE fiber) {
 inline void backend_trace(struct Backend_base *base, int argc, VALUE *argv) {
   if (base->trace_proc == Qnil || base->in_trace_proc) return;
 
+  base->in_trace_proc = 1;
   rb_funcallv(base->trace_proc, ID_call, argc, argv);
+  base->in_trace_proc = 0;
 }
 
 #ifdef POLYPHONY_USE_PIDFD_OPEN
@@ -363,8 +365,6 @@ inline void set_fd_blocking_mode(int fd, int blocking) {
 }
 
 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;
 
@@ -418,13 +418,13 @@ VALUE Backend_stats(VALUE self) {
   struct backend_stats backend_stats = backend_get_stats(self);
 
   VALUE stats = rb_hash_new();
-  rb_hash_aset(stats, SYM_runqueue_size, INT2NUM(backend_stats.runqueue_size));
-  rb_hash_aset(stats, SYM_runqueue_length, INT2NUM(backend_stats.runqueue_length));
-  rb_hash_aset(stats, SYM_runqueue_max_length, INT2NUM(backend_stats.runqueue_max_length));
-  rb_hash_aset(stats, SYM_op_count, INT2NUM(backend_stats.op_count));
-  rb_hash_aset(stats, SYM_switch_count, INT2NUM(backend_stats.switch_count));
-  rb_hash_aset(stats, SYM_poll_count, INT2NUM(backend_stats.poll_count));
-  rb_hash_aset(stats, SYM_pending_ops, INT2NUM(backend_stats.pending_ops));
+  rb_hash_aset(stats, SYM_runqueue_size, INT2FIX(backend_stats.runqueue_size));
+  rb_hash_aset(stats, SYM_runqueue_length, INT2FIX(backend_stats.runqueue_length));
+  rb_hash_aset(stats, SYM_runqueue_max_length, INT2FIX(backend_stats.runqueue_max_length));
+  rb_hash_aset(stats, SYM_op_count, INT2FIX(backend_stats.op_count));
+  rb_hash_aset(stats, SYM_switch_count, INT2FIX(backend_stats.switch_count));
+  rb_hash_aset(stats, SYM_poll_count, INT2FIX(backend_stats.poll_count));
+  rb_hash_aset(stats, SYM_pending_ops, INT2FIX(backend_stats.pending_ops));
   RB_GC_GUARD(stats);
   return stats;
 }
@@ -481,7 +481,7 @@ struct io_buffer get_io_buffer(VALUE 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 };
+  return (struct io_buffer){ (unsigned char *)RSTRING_PTR(in), RSTRING_LEN(in), 0 };
 }
 
 VALUE coerce_io_string_or_buffer(VALUE buf) {