polyphony 0.16 → 0.17

data/examples/core/thread_pool.rb

@@ -37,7 +37,7 @@ def compare_performance
       t0 = Time.now
       supervise do |s|
         X.times do
-          s.spawn Polyphony::ThreadPool.process { lengthy_op }
+          s.coproc Polyphony::ThreadPool.process { lengthy_op }
         end
       end
       thread_pool_perf = X / (Time.now - t0)
@@ -54,4 +54,4 @@ rescue Exception => e
   end
 end
 
-spawn { compare_performance }
+coproc { compare_performance }

data/examples/core/throttle.rb

@@ -3,14 +3,14 @@
 require 'bundler/setup'
 require 'polyphony'
 
-spawn {
+coproc {
   throttled_loop(3) { STDOUT << '.' }
 }
 
-spawn {
+coproc {
   throttled_loop(rate: 2) { STDOUT << '?' }
 }
 
-spawn {
+coproc {
   throttled_loop(interval: 1) { STDOUT << '*' }
 }

data/examples/fs/read.rb

@@ -26,7 +26,7 @@ def thread_pool_read_file(x, y)
   t0 = Time.now
   supervise do |s|
     y.times {
-      s.spawn { x.times { IO.read(PATH) } }
+      s.coproc { x.times { IO.read(PATH) } }
     }
   end
   puts "thread_pool_read_file: #{Time.now - t0}"

data/examples/http/happy_eyeballs.rb

@@ -20,7 +20,7 @@ def happy_eyeballs(hostname, port, max_wait_time: 0.025)
     success = supervise do |supervisor|
       targets.each_with_index do |t, idx|
         sleep(max_wait_time) if idx > 0
-        supervisor.spawn try_connect(t, supervisor)
+        supervisor.coproc try_connect(t, supervisor)
       end
     end
     if success

data/examples/http/http_client.rb

@@ -11,7 +11,7 @@ X = 10
 puts "Making #{X} requests..."
 t0 = Time.now
 supervise do |s|
-  X.times { s.spawn { get_server_time } }
+  X.times { s.coproc { get_server_time } }
 end
 elapsed = Time.now - t0
 puts "count: #{X} elapsed: #{elapsed} rate: #{X / elapsed} reqs/s"

data/examples/http/http_server.rb

@@ -4,7 +4,7 @@ require 'bundler/setup'
 require 'polyphony/http'
 
 opts = { reuse_addr: true, dont_linger: true }
-spawn {
+coproc {
   Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts) do |req|
     req.respond("Hello world!\n")
   end

data/examples/http/http_server_throttled.rb

@@ -5,7 +5,7 @@ require 'polyphony/http'
 
 $throttler = throttle(1000)
 opts = { reuse_addr: true, dont_linger: true }
-spawn {
+coproc {
   Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts) do |req|
     $throttler.call { req.respond("Hello world!\n") }
   end

data/examples/http/http_ws_server.rb

@@ -7,7 +7,7 @@ require 'polyphony/http'
 require 'polyphony/websocket'
 
 def ws_handler(conn)
-  timer = spawn {
+  timer = coproc {
     throttled_loop(1) {
       conn << Time.now.to_s
     }
@@ -29,7 +29,7 @@ opts = {
 
 HTML = IO.read(File.join(__dir__, 'ws_page.html'))
 
-spawn {
+coproc {
   server = Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts) do |req|
     req.respond(HTML, 'Content-Type' => 'text/html')
   end

data/examples/http/https_wss_server.rb

@@ -7,7 +7,7 @@ require 'localhost/authority'
 STDOUT.sync = true
 
 def ws_handler(conn)
-  timer = spawn {
+  timer = coproc {
     throttled_loop(1) {
       conn << Time.now.to_s rescue nil
     }

data/examples/interfaces/pg_client.rb

@@ -11,7 +11,7 @@ rescue => e
   puts e.backtrace.join("\n")
 end
 
-time_printer = spawn do
+time_printer = coproc do
   last = Time.now
   throttled_loop(10) do
     now = Time.now

data/examples/interfaces/pg_pool.rb

@@ -28,7 +28,7 @@ DBPOOL.preheat!
 t0 = Time.now
 count = 0
 coprocs = CONCURRENCY.times.map {
-  spawn { loop { DBPOOL.acquire { |db| get_records(db); count += 1 } } }
+  coproc { loop { DBPOOL.acquire { |db| get_records(db); count += 1 } } }
 }
 sleep 5
 puts "count: #{count} query rate: #{count / (Time.now - t0)} queries/s"

data/examples/interfaces/redis_channels.rb

@@ -16,7 +16,7 @@ class RedisChannel < Polyphony::Channel
 
   def self.start_monitor
     @channels = {}
-    @monitor = spawn do
+    @monitor = coproc do
       subscribe_connection.subscribe(CHANNEL_MASTER_TOPIC) do |on|
         on.message do |topic, message|
           message = Marshal.load(message)
@@ -47,7 +47,7 @@ class RedisChannel < Polyphony::Channel
 
   def self.watch(channel)
     @channels[channel.topic] = channel
-    spawn do
+    coproc do
       publish_connection.publish(CHANNEL_MASTER_TOPIC, Marshal.dump({
         kind: :subscribe,
         topic: channel.topic
@@ -57,7 +57,7 @@ class RedisChannel < Polyphony::Channel
 
   def self.unwatch(channel)
     @channels.delete(channel.topic)
-    spawn do
+    coproc do
       publish_connection.publish(CHANNEL_MASTER_TOPIC, Marshal.dump({
         kind: :unsubscribe,
         topic: channel.topic
@@ -99,14 +99,14 @@ end
 RedisChannel.start_monitor
 channel = RedisChannel.new('channel1')
 
-spawn do
+coproc do
   loop do
     message = channel.receive
     puts "got message: #{message}"
   end
 end
 
-spawn do
+coproc do
   move_on_after(3) do
     throttled_loop(1) do
       channel << Time.now

data/examples/interfaces/redis_pubsub.rb

@@ -3,7 +3,7 @@
 require 'bundler/setup'
 require 'polyphony/redis'
 
-spawn do
+coproc do
   redis = Redis.new
   redis.subscribe('redis-channel') do |on|
     on.message do |channel, message|
@@ -13,7 +13,7 @@ spawn do
   end
 end
 
-spawn do
+coproc do
   redis = Redis.new
   move_on_after(3) do
     throttled_loop(1) do

data/examples/interfaces/redis_pubsub_perf.rb

@@ -17,7 +17,7 @@ X_SESSIONS.times do
   }
 end
 
-spawn do
+coproc do
   redis = Redis.new
   redis.subscribe('events') do |on|
     on.message do |_, message|
@@ -40,14 +40,14 @@ def distribute_event(event)
   # puts "elapsed: #{elapsed} (#{rate}/s)" if $update_count % 100 == 0
 end
 
-spawn do
+coproc do
   redis = Redis.new
   throttled_loop(1000) do
     redis.publish('events', {path: "node#{rand(X_NODES)}"}.to_json)
   end
 end
 
-spawn do
+coproc do
   last_count = 0
   last_stamp = Time.now
   throttled_loop(1) do

data/examples/io/cat.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+f = File.open(__FILE__, 'r') do |f|
+  line_number = 1
+  while (l = f.gets)
+    puts "encoding: #{l.encoding.inspect}"
+    STDOUT.puts '%03d %s' % [line_number, l]
+    line_number += 1
+  end
+end

data/examples/io/echo_client.rb

@@ -5,11 +5,11 @@ require 'polyphony'
 
 socket = Polyphony::Net.tcp_connect('127.0.0.1', 1234)
 
-writer = spawn do
+writer = coproc do
   throttled_loop(1) { socket << "#{Time.now}\n" rescue nil }
 end
 
-reader = spawn do
+reader = coproc do
   puts "received from echo server:"
   while data = socket.readpartial(8192)
     STDOUT << data

data/examples/io/echo_server.rb

@@ -6,7 +6,7 @@ require 'polyphony'
 server = TCPServer.open(1234)
 puts "Echoing on port 1234..."
 while client = server.accept
-  spawn do
+  coproc do
     while data = client.readpartial(8192) rescue nil
       client.write("you said: ", data.chomp, "!\n")
     end

data/examples/io/echo_server_with_timeout.rb

@@ -9,7 +9,7 @@ begin
 
   loop do
     client = server.accept
-    spawn do
+    coproc do
       cancel_scope = nil
       move_on_after(5) do |s|
         cancel_scope = s

data/examples/io/echo_stdin.rb

@@ -6,7 +6,7 @@ require 'polyphony'
 puts "Write something..."
 move_on_after(5) do |scope|
   loop do
-    data = STDIN.readpartial(8192)
+    data = STDIN.gets
     scope.reset_timeout
     puts "you wrote: #{data}"
   end

data/examples/io/io_read.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+s = IO.read(__FILE__)
+puts "encoding: #{s.encoding.inspect}"
+puts s
+puts

data/examples/io/system.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+timer = coproc {
+  throttled_loop(5) { STDOUT << '.' }
+}
+
+puts system('ruby -e "sleep 1; puts :done; STDOUT.close"')
+timer.stop

data/examples/performance/perf_multi_snooze.rb

@@ -6,12 +6,12 @@ require 'polyphony'
 ITERATIONS  = 1_000
 FIBERS      = 1_000
 
-spawn do
+coproc do
   count = 0
   t0 = Time.now
   supervise do |s|
     FIBERS.times do
-      s.spawn do
+      s.coproc do
         ITERATIONS.times { snooze; count += 1 }
       end
     end

data/examples/performance/perf_snooze.rb

@@ -14,7 +14,7 @@ X = 1_000_000
 # puts "#{X / dt.to_f}/s"
 
 # sleep
-# spawn do
+# coproc do
 #   t0 = Time.now
 #   X.times { sleep(0) }
 #   dt = Time.now - t0
@@ -22,7 +22,7 @@ X = 1_000_000
 # end
 
 # snooze
-spawn do
+coproc do
   t0 = Time.now
   X.times { snooze }
   dt = Time.now - t0

data/examples/performance/thread-vs-fiber/polyphony_server.rb

@@ -46,13 +46,13 @@ def handle_request(client, parser)
   client.write "HTTP/1.1 #{status_code}\r\n#{headers}\r\n#{data}"
 end
 
-spawn do
+coproc do
   server = TCPServer.open(1234)
   puts "listening on port 1234"
 
   loop do
     client = server.accept
-    spawn handle_client(client)
+    coproc handle_client(client)
   end
 rescue Exception => e
   puts "uncaught exception: #{e.inspect}"

data/ext/ev/io.c

@@ -32,11 +32,15 @@ void EV_IO_callback(ev_loop *ev_loop, struct ev_io *io, int revents);
 
 static int EV_IO_symbol2event_mask(VALUE sym);
 
+// static VALUE IO_gets(int argc, VALUE *argv, VALUE io);
 static VALUE IO_read(int argc, VALUE *argv, VALUE io);
 static VALUE IO_readpartial(int argc, VALUE *argv, VALUE io);
 static VALUE IO_write(int argc, VALUE *argv, VALUE io);
 static VALUE IO_write_chevron(VALUE io, VALUE str);
 
+static VALUE IO_read_watcher(VALUE self);
+static VALUE IO_write_watcher(VALUE self);
+
 void Init_EV_IO() {
   mEV = rb_define_module("EV");
   cEV_IO = rb_define_class_under(mEV, "IO", rb_cData);
@@ -48,11 +52,14 @@ void Init_EV_IO() {
   rb_define_method(cEV_IO, "await", EV_IO_await, 0);
 
   VALUE cIO = rb_const_get(rb_cObject, rb_intern("IO"));
+  // rb_define_method(cIO, "gets", IO_gets, -1);
   rb_define_method(cIO, "read", IO_read, -1);
   rb_define_method(cIO, "readpartial", IO_readpartial, -1);
   rb_define_method(cIO, "write", IO_write, -1);
   rb_define_method(cIO, "write_nonblock", IO_write, -1);
   rb_define_method(cIO, "<<", IO_write_chevron, 1);
+  rb_define_method(cIO, "read_watcher", IO_read_watcher, 0);
+  rb_define_method(cIO, "write_watcher", IO_write_watcher, 0);
 }
 
 static const rb_data_type_t EV_IO_type = {
@@ -249,6 +256,23 @@ static void io_set_read_length(VALUE str, long n, int shrinkable) {
     if (shrinkable) io_shrink_read_string(str, n);
   }
 }
+
+static rb_encoding*
+io_read_encoding(rb_io_t *fptr)
+{
+    if (fptr->encs.enc) {
+	return fptr->encs.enc;
+    }
+    return rb_default_external_encoding();
+}
+
+static VALUE io_enc_str(VALUE str, rb_io_t *fptr)
+{
+    OBJ_TAINT(str);
+    rb_enc_associate(str, io_read_encoding(fptr));
+    return str;
+}
+
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
@@ -267,9 +291,10 @@ static VALUE IO_read(int argc, VALUE *argv, VALUE io) {
   VALUE str = argc >= 2 ? argv[1] : Qnil;
 
   shrinkable = io_setstrbuf(&str, len);
-  OBJ_TAINT(str);
+  // OBJ_TAINT(str);
   GetOpenFile(io, fptr);
   rb_io_check_byte_readable(fptr);
+  rb_io_set_nonblock(fptr);
 
   if (len == 0)
   	return str;
@@ -283,6 +308,7 @@ static VALUE IO_read(int argc, VALUE *argv, VALUE io) {
       int e = errno;
       if ((e == EWOULDBLOCK || e == EAGAIN)) {
         if (read_watcher == Qnil)
+          // read_watcher = IO_read_watcher(io);
           read_watcher = rb_funcall(io, ID_read_watcher, 0);
         EV_IO_await(read_watcher);
       }
@@ -301,11 +327,12 @@ static VALUE IO_read(int argc, VALUE *argv, VALUE io) {
     }
   }
 
-  io_set_read_length(str, total, shrinkable);
-
   if (total == 0)
     return Qnil;
 
+  io_set_read_length(str, total, shrinkable);
+  io_enc_str(str, fptr);
+
   return str;
 }
 
@@ -326,6 +353,7 @@ static VALUE IO_readpartial(int argc, VALUE *argv, VALUE io) {
   shrinkable = io_setstrbuf(&str, len);
   OBJ_TAINT(str);
   GetOpenFile(io, fptr);
+  rb_io_set_nonblock(fptr);
   rb_io_check_byte_readable(fptr);
 
   if (len == 0)
@@ -337,6 +365,7 @@ static VALUE IO_readpartial(int argc, VALUE *argv, VALUE io) {
       int e = errno;
       if ((e == EWOULDBLOCK || e == EAGAIN)) {
         if (read_watcher == Qnil)
+          // read_watcher = IO_read_watcher(io);
           read_watcher = rb_funcall(io, ID_read_watcher, 0);
         EV_IO_await(read_watcher);
       }
@@ -349,6 +378,7 @@ static VALUE IO_readpartial(int argc, VALUE *argv, VALUE io) {
   }
 
   io_set_read_length(str, n, shrinkable);
+  io_enc_str(str, fptr);
 
   if (n == 0)
     return Qnil;
@@ -383,6 +413,7 @@ static VALUE IO_write(int argc, VALUE *argv, VALUE io) {
         int e = errno;
         if (e == EWOULDBLOCK || e == EAGAIN) {
           if (write_watcher == Qnil)
+            // write_watcher = IO_write_watcher(io);
             write_watcher = rb_funcall(io, ID_write_watcher, 0);
           EV_IO_await(write_watcher);
         }
@@ -408,4 +439,22 @@ static VALUE IO_write(int argc, VALUE *argv, VALUE io) {
 static VALUE IO_write_chevron(VALUE io, VALUE str) {
   IO_write(1, &str, io);
   return io;
-}
+}
+
+static VALUE IO_read_watcher(VALUE self) {
+  VALUE watcher = rb_iv_get(self, "@read_watcher");
+  if (watcher == Qnil) {
+    watcher = rb_funcall(cEV_IO, rb_intern("new"), 2, self, ID2SYM(rb_intern("r")));
+    rb_iv_set(self, "@read_watcher", watcher);
+  }
+  return watcher;
+}
+
+static VALUE IO_write_watcher(VALUE self) {
+  VALUE watcher = rb_iv_get(self, "@write_watcher");
+  if (watcher == Qnil) {
+    watcher = rb_funcall(cEV_IO, rb_intern("new"), 2, self, ID2SYM(rb_intern("w")));
+    rb_iv_set(self, "@write_watcher", watcher);
+  }
+  return watcher;
+}