polyphony 0.22 → 0.23

data/examples/fs/read.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'polyphony/fs'
 
 def raw_read_file(x)

data/examples/http/http2_raw.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'http/2'
 
 # Response = import '../../lib/polyphony/http/client/response'

data/examples/http/http_get.rb

@@ -2,7 +2,7 @@
 
 require 'bundler/setup'
 require 'polyphony/http'
-require 'polyphony/auto_run'
+require 'polyphony'
 
 Exception.__disable_sanitized_backtrace__ = true
 

data/examples/http/http_server.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'polyphony/http'
 
 opts = {
@@ -25,3 +25,4 @@ end
 
 puts "pid: #{Process.pid}"
 puts 'Listening on port 1234...'
+suspend

data/examples/http/http_server_graceful.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'polyphony/http'
 
 opts = {
@@ -23,3 +23,5 @@ end
 puts "pid: #{Process.pid}"
 puts 'Send HUP to stop gracefully'
 puts 'Listening on port 1234...'
+
+suspend

data/examples/http/http_ws_server.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-STDOUT.sync = true
-
 require 'bundler/setup'
 require 'polyphony/http'
 require 'polyphony/websocket'

data/examples/http/https_wss_server.rb

@@ -4,8 +4,6 @@ require 'bundler/setup'
 require 'polyphony/http'
 require 'localhost/authority'
 
-STDOUT.sync = true
-
 def ws_handler(conn)
   timer = spin do
     throttled_loop(1) do

data/examples/http/websocket_secure_server.rb

@@ -4,8 +4,6 @@ require 'bundler/setup'
 require 'polyphony/http'
 require 'localhost/authority'
 
-STDOUT.sync = true
-
 def ws_handler(conn)
   while (msg = conn.recv)
     conn << "you said: #{msg}"

data/examples/http/websocket_server.rb

@@ -3,8 +3,6 @@
 require 'bundler/setup'
 require 'polyphony/http'
 
-STDOUT.sync = true
-
 def ws_handler(conn)
   while (msg = conn.recv)
     conn << "you said: #{msg}"

data/examples/interfaces/redis_channels.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'polyphony/redis'
 
 class RedisChannel < Polyphony::Channel
@@ -119,3 +119,5 @@ spin do
   channel.close
   RedisChannel.stop_monitor
 end
+
+suspend

data/examples/interfaces/redis_pubsub.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'polyphony/redis'
 
 spin do
@@ -23,3 +23,5 @@ spin do
   end
   redis.publish('redis-channel', 'exit')
 end
+
+suspend

data/examples/interfaces/redis_pubsub_perf.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'polyphony/redis'
 require 'json'
 
@@ -65,3 +65,5 @@ trap(:int) do
   puts 'bye...'
   exit!
 end
+
+suspend

data/examples/io/backticks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 
 timer = spin do
   throttled_loop(5) { STDOUT << '.' }

data/examples/io/cat.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 
 File.open(__FILE__, 'r') do |f|
   line_number = 1

data/examples/io/echo_client.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'polyphony/extensions/backtrace'
 
 socket = Polyphony::Net.tcp_connect('127.0.0.1', 1234)

data/examples/io/echo_client_from_stdin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'polyphony/extensions/backtrace'
 
 socket = Polyphony::Net.tcp_connect('127.0.0.1', 1234)
@@ -18,3 +18,5 @@ spin do
   end
   writer.interrupt
 end
+
+suspend

data/examples/io/echo_pipe.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 
 i, o = IO.pipe
 

data/examples/io/echo_server.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 
 server = TCPServer.open('127.0.0.1', 1234)
 puts "Pid: #{Process.pid}"

data/examples/io/echo_server_with_timeout.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 
 begin
   server = Polyphony::Net.tcp_listen(

data/examples/io/echo_stdin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 
 puts 'Write something...'
 move_on_after(5) do |scope|

data/examples/io/httparty_multi.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'httparty'
 
 url = 'http://127.0.0.1:4411/?q=time'

data/examples/io/io_read.rb

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

data/examples/io/irb.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'irb'
 
 $counter = 0

data/examples/io/net-http.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'net/http'
 
 uri = URI('http://realiteq.net/?q=time')

data/examples/io/open.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'irb'
 
 stdin = IO.open(STDIN.to_i)

data/examples/io/system.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 
 timer = spin do
   throttled_loop(5) { STDOUT << '.' }

data/examples/io/tcpserver.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 
 server = TCPServer.new('127.0.0.1', 1234)
 

data/examples/io/tcpsocket.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 require 'polyphony/extensions/backtrace'
 
 socket = TCPSocket.new('google.com', 80)

data/examples/performance/multi_snooze.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 
 def bm(fibers, iterations)
   count = 0

data/examples/performance/snooze.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'polyphony/auto_run'
+require 'polyphony'
 
 X = 1_000_000
 
-STDOUT << 'Fiber.yield:   '
+STDOUT << 'Fiber.yield:      '
 f = Fiber.new do
   loop { Fiber.yield }
 end
@@ -14,16 +14,24 @@ X.times { f.resume }
 dt = Time.now - t0
 puts format('%d/s', (X / dt))
 
-# STDOUT << "Kernel#sleep: "
-# t0 = Time.now
-# X.times { sleep(0) }
-# dt = Time.now - t0
-# puts "%d/s" % (X / dt)
-
-trap('SIGINT') { exit! }
+STDOUT << 'Fiber.transfer:   '
+main = Fiber.current
+f = Fiber.new do
+  loop { main.transfer }
+end
+t0 = Time.now
+X.times { f.transfer }
+dt = Time.now - t0
+puts format('%d/s', (X / dt))
 
-STDOUT << 'Kernel#snooze: '
+STDOUT << 'Kernel#snooze:    '
 t0 = Time.now
 X.times { snooze }
 dt = Time.now - t0
 puts format('%d/s', (X / dt))
+
+STDOUT << 'Kernel#sleep:     '
+t0 = Time.now
+X.times { sleep(0) }
+dt = Time.now - t0
+puts "%d/s" % (X / dt)

data/ext/gyro/async.c

@@ -4,6 +4,7 @@ struct Gyro_Async {
   struct  ev_async ev_async;
   int     active;
   VALUE   fiber;
+  VALUE   value;
 };
 
 static VALUE cGyro_Async = Qnil;
@@ -17,7 +18,7 @@ static size_t Gyro_Async_size(const void *ptr);
 /* Methods */
 static VALUE Gyro_Async_initialize(VALUE self);
 
-static VALUE Gyro_Async_signal(VALUE self);
+static VALUE Gyro_Async_signal(int argc, VALUE *argv, VALUE self);
 static VALUE Gyro_Async_await(VALUE self);
 
 void Gyro_Async_callback(struct ev_loop *ev_loop, struct ev_async *async, int revents);
@@ -28,7 +29,7 @@ void Init_Gyro_Async() {
   rb_define_alloc_func(cGyro_Async, Gyro_Async_allocate);
 
   rb_define_method(cGyro_Async, "initialize", Gyro_Async_initialize, 0);
-  rb_define_method(cGyro_Async, "signal!", Gyro_Async_signal, 0);
+  rb_define_method(cGyro_Async, "signal!", Gyro_Async_signal, -1);
   rb_define_method(cGyro_Async, "await", Gyro_Async_await, 0);
 }
 
@@ -49,6 +50,9 @@ static void Gyro_Async_mark(void *ptr) {
   if (async->fiber != Qnil) {
     rb_gc_mark(async->fiber);
   }
+  if (async->value != Qnil) {
+    rb_gc_mark(async->value);
+  }
 }
 
 static void Gyro_Async_free(void *ptr) {
@@ -69,6 +73,7 @@ static VALUE Gyro_Async_initialize(VALUE self) {
   GetGyro_Async(self, async);
 
   async->fiber = Qnil;
+  async->value = Qnil;
   async->active = 0;
 
   ev_async_init(&async->ev_async, Gyro_Async_callback);
@@ -83,16 +88,17 @@ void Gyro_Async_callback(struct ev_loop *ev_loop, struct ev_async *ev_async, int
   async->active = 0;
 
   if (async->fiber != Qnil) {
-    VALUE fiber = async->fiber;
+    Gyro_schedule_fiber(async->fiber, async->value);
     async->fiber = Qnil;
-    Gyro_schedule_fiber(fiber, Qnil);
+    async->value = Qnil;
   }
 }
 
-static VALUE Gyro_Async_signal(VALUE self) {
+static VALUE Gyro_Async_signal(int argc, VALUE *argv, VALUE self) {
   struct Gyro_Async *async;
   GetGyro_Async(self, async);
 
+  async->value = (argc == 1) ? argv[0] : Qnil;
   ev_async_send(EV_DEFAULT, &async->ev_async);
 
   return Qnil;
@@ -110,18 +116,19 @@ static VALUE Gyro_Async_await(VALUE self) {
     ev_async_start(EV_DEFAULT, &async->ev_async);
   }
 
-  ret = Gyro_yield();
+  ret = Gyro_await();
 
   // fiber is resumed
-  async->fiber = Qnil;
   if (RTEST(rb_obj_is_kind_of(ret, rb_eException))) {
     if (async->active) {
       async->active = 0;
       ev_async_stop(EV_DEFAULT, &async->ev_async);
+      async->fiber = Qnil;
+      async->value = Qnil;
     }
-    return rb_funcall(ret, ID_raise, 1, ret);
+    return rb_funcall(rb_mKernel, ID_raise, 1, ret);
   }
   else {
-    return Qnil;
+    return ret;
   }
 }