polyphony 0.17 → 0.19

data/examples/interfaces/redis_pubsub.rb

@@ -3,7 +3,7 @@
 require 'bundler/setup'
 require 'polyphony/redis'
 
-coproc do
+spin do
   redis = Redis.new
   redis.subscribe('redis-channel') do |on|
     on.message do |channel, message|
@@ -13,7 +13,7 @@ coproc do
   end
 end
 
-coproc do
+spin 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
 
-coproc do
+spin 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
 
-coproc do
+spin do
   redis = Redis.new
   throttled_loop(1000) do
     redis.publish('events', {path: "node#{rand(X_NODES)}"}.to_json)
   end
 end
 
-coproc do
+spin do
   last_count = 0
   last_stamp = Time.now
   throttled_loop(1) do

data/examples/io/echo_client.rb

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

data/examples/io/echo_pipe.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+i, o = IO.pipe
+
+puts "Write something:"
+spin {
+  throttled_loop(1, count: 3) { o << STDIN.gets }
+  o.close
+}
+
+while data = i.readpartial(8192)
+  STDOUT << "You wrote: #{data}"
+end
+

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
-  coproc do
+  spin 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
-    coproc do
+    spin do
       cancel_scope = nil
       move_on_after(5) do |s|
         cancel_scope = s

data/examples/io/httparty.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+require 'httparty'
+
+timer = spin { throttled_loop(10) { STDOUT << '.' } }
+
+puts HTTParty.get('http://realiteq.net/?q=time')
+timer.stop

data/examples/io/httparty_multi.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+require 'httparty'
+
+url = 'http://127.0.0.1:4411/?q=time'
+results = []
+
+t0 = Time.now
+move_on_after(3) do
+  supervise do |s|
+    10.times do
+      s.spin do
+        loop do
+          STDOUT << '!'
+          if (result = HTTParty.get(url))
+            results << result
+            STDOUT << '.'
+          end
+        rescue => e
+          p e
+        end
+      end
+    end
+  end
+  puts "done"
+end
+puts "got #{results.size} (#{results.size / (Time.now - t0)}/s)"

data/examples/io/httparty_threaded.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'httparty'
+
+url = 'http://127.0.0.1:4411/?q=time'
+results = Queue.new
+
+t0 = Time.now
+threads = []
+10.times do
+  threads << Thread.new do
+    loop do
+      STDOUT << '!'
+      if (result = HTTParty.get(url))
+        results << result
+        STDOUT << '.'
+      end
+    end
+  end
+end
+
+sleep 3
+threads.each(&:kill)
+puts "done"
+puts "got #{results.size} (#{results.size / (Time.now - t0)}/s)"

data/examples/io/irb.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+require 'irb'
+
+$counter = 0
+
+timer = spin do
+  throttled_loop(10) { $counter += 1 }
+end
+
+at_exit { timer.stop }
+
+IRB.start

data/examples/io/net-http.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+require 'net/http'
+
+uri = URI('http://realiteq.net/?q=time')
+
+begin
+  puts Net::HTTP.get(uri)
+rescue => e
+  p e
+  puts "*" * 40
+  puts e.backtrace[0..4].join("\n")
+end

data/examples/io/system.rb

@@ -3,7 +3,7 @@
 require 'bundler/setup'
 require 'polyphony'
 
-timer = coproc {
+timer = spin {
   throttled_loop(5) { STDOUT << '.' }
 }
 

data/examples/io/tcpsocket.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+
+socket = TCPSocket.new('realiteq.net', 80)
+
+timer = spin { throttled_loop(20) { STDOUT << '.' } }
+
+5.times do
+  socket.send("GET /?q=time HTTP/1.1\r\nHost: realiteq.net\r\n\r\n", 0)
+  socket.recv(8192)
+  STDOUT << "*"
+end
+
+timer.stop
+socket.close
+puts

data/examples/performance/perf_multi_snooze.rb

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

data/examples/performance/perf_snooze.rb

@@ -5,26 +5,23 @@ require 'polyphony'
 
 X = 1_000_000
 
-# f = Fiber.new do
-#   loop { Fiber.yield }
-# end
+STDOUT << "Fiber.yield: "
+f = Fiber.new do
+  loop { Fiber.yield }
+end
+t0 = Time.now
+X.times { f.resume }
+dt = Time.now - t0
+puts "%d/s" % (X / dt)
+
+# STDOUT << "Kernel#sleep: "
 # t0 = Time.now
-# X.times { f.resume }
+# X.times { sleep(0) }
 # dt = Time.now - t0
-# puts "#{X / dt.to_f}/s"
+# puts "%d/s" % (X / dt)
 
-# sleep
-# coproc do
-#   t0 = Time.now
-#   X.times { sleep(0) }
-#   dt = Time.now - t0
-#   puts "#{X / dt.to_f}/s"
-# end
-
-# snooze
-coproc do
-  t0 = Time.now
-  X.times { snooze }
-  dt = Time.now - t0
-  puts "#{X / dt.to_f}/s"
-end
+STDOUT << "Kernel#snooze: "
+t0 = Time.now
+X.times { snooze }
+dt = Time.now - t0
+puts "%d/s" % (X / dt)

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

@@ -46,7 +46,7 @@ def handle_request(client, parser)
   client.write "HTTP/1.1 #{status_code}\r\n#{headers}\r\n#{data}"
 end
 
-coproc do
+spin do
   server = TCPServer.open(1234)
   puts "listening on port 1234"
 

data/ext/ev/ev.h

@@ -9,6 +9,14 @@ void EV_add_watcher_ref(VALUE obj);
 void EV_del_watcher_ref(VALUE obj);
 void EV_async_free(void *p);
 
+VALUE IO_read_watcher(VALUE io);
+VALUE IO_write_watcher(VALUE io);
+VALUE EV_IO_await(VALUE self);
+
+int io_setstrbuf(VALUE *str, long len);
+void io_set_read_length(VALUE str, long n, int shrinkable);
+VALUE io_enc_str(VALUE str, rb_io_t *fptr);
+
 #define SCHEDULE_FIBER(obj, args...) rb_funcall(obj, ID_transfer, args)
 #define YIELD_TO_REACTOR() rb_funcall(EV_reactor_fiber, ID_transfer, 0)
 
@@ -29,4 +37,4 @@ extern ID ID_R;
 extern ID ID_W;
 extern ID ID_RW;
 
-#endif /* RUBY_EV_H */
+#endif /* RUBY_EV_H */

data/ext/ev/ev_ext.c

@@ -7,6 +7,7 @@ void Init_EV_Child();
 void Init_EV_IO();
 void Init_EV_Signal();
 void Init_EV_Timer();
+void Init_Socket();
 
 void Init_ev_ext() {
   ev_set_allocator(xrealloc);
@@ -17,4 +18,6 @@ void Init_ev_ext() {
   Init_EV_IO();
   Init_EV_Signal();
   Init_EV_Timer();
-}
+
+  Init_Socket();
+}

data/ext/ev/ev_module.c

@@ -17,12 +17,14 @@ static VALUE EV_post_fork(VALUE self);
 static VALUE EV_suspend(VALUE self);
 static VALUE EV_schedule_fiber(VALUE self, VALUE fiber, VALUE value);
 
+static VALUE Fiber_safe_transfer(int argc, VALUE *argv, VALUE self);
+
 static VALUE watcher_refs;
-static VALUE next_tick_procs;
+static VALUE next_tick_items;
 
-static struct ev_timer next_tick_timer;
+static struct ev_idle next_tick_watcher;
 static int next_tick_active;
-void EV_next_tick_callback(ev_loop *ev_loop, struct ev_timer *timer, int revents);
+void EV_next_tick_callback(ev_loop *ev_loop, struct ev_idle *watcher, int revents);
 
 VALUE EV_reactor_fiber;
 VALUE EV_root_fiber;
@@ -58,6 +60,9 @@ void Init_EV() {
   rb_define_global_function("snooze", EV_snooze, 0);
   rb_define_global_function("next_tick", EV_next_tick, 0);
 
+  VALUE cFiber = rb_const_get(rb_cObject, rb_intern("Fiber"));
+  rb_define_method(cFiber, "safe_transfer", Fiber_safe_transfer, -1);
+
   ID_call                 = rb_intern("call");
   ID_caller               = rb_intern("caller");
   ID_clear                = rb_intern("clear");
@@ -80,10 +85,10 @@ void Init_EV() {
   watcher_refs = rb_hash_new();
   rb_global_variable(&watcher_refs);
 
-  next_tick_procs = rb_ary_new();
-  rb_global_variable(&next_tick_procs);
+  next_tick_items = rb_ary_new();
+  rb_global_variable(&next_tick_items);
 
-  ev_timer_init(&next_tick_timer, EV_next_tick_callback, 0., 0.);
+  ev_idle_init(&next_tick_watcher, EV_next_tick_callback);
   next_tick_active = 0;
 }
 
@@ -136,10 +141,10 @@ void EV_del_watcher_ref(VALUE obj) {
 static VALUE EV_next_tick(VALUE self) {
   VALUE proc = rb_block_proc();
   if (RTEST(proc)) {
-    rb_ary_push(next_tick_procs, proc);
+    rb_ary_push(next_tick_items, proc);
     if (!next_tick_active) {
       next_tick_active = 1;
-      ev_timer_start(EV_DEFAULT, &next_tick_timer);
+      ev_idle_start(EV_DEFAULT, &next_tick_watcher);
     }
   }
   return Qnil;
@@ -149,17 +154,17 @@ static VALUE EV_snooze(VALUE self) {
   VALUE ret;
   VALUE fiber = rb_fiber_current();
 
-  rb_ary_push(next_tick_procs, fiber);
+  rb_ary_push(next_tick_items, fiber);
   if (!next_tick_active) {
     next_tick_active = 1;
-    ev_timer_start(EV_DEFAULT, &next_tick_timer);
+    ev_idle_start(EV_DEFAULT, &next_tick_watcher);
   }
 
   ret = YIELD_TO_REACTOR();
   
   // fiber is resumed, check if resumed value is an exception
   if (RTEST(rb_obj_is_kind_of(ret, rb_eException))) {
-    rb_ary_delete(next_tick_procs, fiber);
+    rb_ary_delete(next_tick_items, fiber);
     return rb_funcall(ret, ID_raise, 1, ret);
   }
   else {
@@ -187,23 +192,23 @@ VALUE EV_next_tick_runner(VALUE proc) {
   return Qnil;
 }
 
-void EV_next_tick_callback(ev_loop *ev_loop, struct ev_timer *timer, int revents) {
-  VALUE scheduled_procs = next_tick_procs;
-  next_tick_procs = rb_ary_new();
+void EV_next_tick_callback(ev_loop *ev_loop, struct ev_idle *watcher, int revents) {
+  VALUE scheduled_items = next_tick_items;
+  next_tick_items = rb_ary_new();
 
-  for (long i = 0; i < RARRAY_LEN(scheduled_procs); i++) {
-    EV_next_tick_runner(RARRAY_AREF(scheduled_procs, i));
+  long len = RARRAY_LEN(scheduled_items);
+  for (long i = 0; i < len; i++) {
+    EV_next_tick_runner(RARRAY_AREF(scheduled_items, i));
   }
 
-  if (rb_array_len(next_tick_procs) > 0) {
-    ev_timer_start(EV_DEFAULT, &next_tick_timer);
-  } else {
+  // if no next tick items were added during callback, stop the idle watcher
+  if (rb_array_len(next_tick_items) == 0) {
     next_tick_active = 0;
+    ev_idle_stop(EV_DEFAULT, &next_tick_watcher);
   }
 }
 
 static VALUE EV_suspend(VALUE self) {
-  // make sure reactor fiber is alive
   if (!RTEST(rb_fiber_alive_p(EV_reactor_fiber))) {
     return Qnil;
   }
@@ -218,11 +223,20 @@ static VALUE EV_suspend(VALUE self) {
 static VALUE EV_schedule_fiber(VALUE self, VALUE fiber, VALUE value) {
   rb_ivar_set(fiber, ID_scheduled_value, value);
 
-  rb_ary_push(next_tick_procs, fiber);
+  rb_ary_push(next_tick_items, fiber);
   if (!next_tick_active) {
     next_tick_active = 1;
-    ev_timer_start(EV_DEFAULT, &next_tick_timer);
+    ev_idle_start(EV_DEFAULT, &next_tick_watcher);
   }
 
   return Qnil;
 }
+
+static VALUE Fiber_safe_transfer(int argc, VALUE *argv, VALUE self) {
+  VALUE arg = (argc == 0) ? Qnil : argv[0];
+  VALUE ret = rb_funcall(self, ID_transfer, 1, arg);
+
+  // fiber is resumed, check if resumed value is an exception
+  return RTEST(rb_obj_is_kind_of(ret, rb_eException)) ? 
+    rb_funcall(ret, ID_raise, 1, ret) : ret;
+}