polyphony 0.45.0 → 0.45.1

data/examples/io/{xx-echo_client.rb → echo_client.rb}

@@ -15,7 +15,7 @@ end
 
 reader = spin do
   puts 'received from echo server:'
-  while (data = socket.readpartial(8192))
+  socket.read_loop do |data|
     STDOUT << data
   end
 end

data/examples/io/{xx-echo_client_from_stdin.rb → echo_client_from_stdin.rb}

@@ -11,8 +11,8 @@ writer = spin do
   end
 end
 
-spin do
-  while (data = socket.readpartial(8192))
+reader = spin do
+  socket.read_loop do |data|
     STDOUT << 'received: ' + data
   end
   writer.interrupt

data/examples/io/{xx-echo_pipe.rb → echo_pipe.rb}

@@ -11,6 +11,6 @@ spin do
   o.close
 end
 
-while (data = i.readpartial(8192))
+i.read_loop do |data|
   STDOUT << "You said: #{data}"
 end

data/examples/io/{xx-echo_server_with_timeout.rb → echo_server_with_timeout.rb}

@@ -17,7 +17,7 @@ begin
         scope.when_cancelled do
           client.write "Disconnecting due to inactivity\n"
         end
-        while (data = client.readpartial(8192))
+        client.read_loop do |data|
           scope.reset_timeout
           client.write "You said: #{data}"
         end

data/examples/io/{xx-httparty.rb → httparty.rb}

@@ -16,23 +16,14 @@ end
 zones = %w{
   Europe/London Europe/Paris Europe/Bucharest America/New_York Asia/Bangkok
 }
-# zones.each do |tzone|
-#   spin do
-#     time = get_time(tzone)
-#     puts "Time in #{tzone}: #{time}"
-#   end
-# end
-
-# suspend
 
 def get_times(zones)
-  Polyphony::Supervisor.new do |s|
-    zones.each do |tzone|
-      s.spin { [tzone, get_time(tzone)] }
-    end
+  fibers = zones.map do |tzone|
+    spin { [tzone, get_time(tzone)] }
   end
+  Fiber.await(*fibers)
 end
 
-get_times(zones).await.each do |tzone, time|
+get_times(zones).each do |tzone, time|
   puts "Time in #{tzone}: #{time}"
 end

data/examples/io/{xx-system.rb → system.rb}

@@ -7,5 +7,5 @@ timer = spin do
   throttled_loop(5) { STDOUT << '.' }
 end
 
-puts system('ruby -e "sleep 1; puts :done; STDOUT.close"')
+puts system('ruby -e "puts :sleeping; STDOUT.flush; sleep 1; puts :done"')
 timer.stop

data/examples/io/tunnel.rb

@@ -3,6 +3,11 @@
 require 'bundler/setup'
 require 'polyphony'
 
+if ARGV.size < 2
+  puts "Usage: ruby examples/tunnel.rb <port1> <port2>"
+  exit
+end
+
 Ports = ARGV[0..1]
 EndPoints = []
 
@@ -24,7 +29,7 @@ def endpoint_loop(idx, peer_idx)
     conn.binmode
     EndPoints[idx] = conn
     log "Client connected on port #{port} (#{conn.remote_address.inspect})"
-    while data = conn.readpartial(8192)
+    conn.read_loop do |data|
       peer = EndPoints[peer_idx]
       if peer
         peer << data

data/examples/performance/fiber_transfer.rb

@@ -6,7 +6,8 @@ class Fiber
   attr_accessor :next
 end
 
-# This program shows how the performance 
+# This program shows how the performance of Fiber.transfer degrades as the fiber
+# count increases
 
 def run(num_fibers)
   count = 0

data/examples/performance/fs_read.rb

@@ -2,7 +2,7 @@
 
 require 'bundler/setup'
 require 'polyphony'
-require 'polyphony/fs'
+require 'polyphony/adapters/fs'
 
 def raw_read_file(x)
   t0 = Time.now
@@ -14,7 +14,7 @@ def threaded_read_file(x, y)
   t0 = Time.now
   threads = []
   y.times do
-    threads << Thread.new { x.times { IO.orig_read(PATH) } }
+    threads << Thread.new { x.times { IO.orig_read(__FILE__) } }
   end
   threads.each(&:join)
   puts "threaded_read_file: #{Time.now - t0}"
@@ -22,11 +22,10 @@ end
 
 def thread_pool_read_file(x, y)
   t0 = Time.now
-  supervise do |s|
-    y.times do
-      s.spin { x.times { IO.read(PATH) } }
-    end
+  y.times do
+    spin { x.times { IO.read(__FILE__) } }
   end
+  Fiber.current.await_all_children
   puts "thread_pool_read_file: #{Time.now - t0}"
 end
 

data/examples/{io/xx-switch.rb → performance/switch.rb}

@@ -12,4 +12,5 @@ end
 t0 = Time.now
 X.times { f.transfer }
 dt = Time.now - t0
-puts "#{X / dt.to_f}/s"
+puts "#{X / dt.to_f}/s"
+puts fs.size

data/examples/performance/thread-vs-fiber/{xx-httparty_multi.rb → httparty_multi.rb}

@@ -21,11 +21,10 @@ end
 t0 = Time.now
 results = []
 move_on_after(3) do
-  supervise do |s|
-    10.times do
-      s.spin { get_time(results) }
-    end
+  10.times do
+    spin { get_time(results) }
   end
+  supervise
   puts 'done'
 end
 

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

@@ -24,7 +24,7 @@ def handle_client(socket)
   parser.on_message_complete = proc do |env|
     reqs << Object.new # parser
   end
-  while (data = socket.readpartial(8192)) do
+  socket.read_loop do |data|
     parser << data
     while (req = reqs.shift)
       handle_request(socket, req)

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

@@ -13,7 +13,7 @@ def handle_client(socket)
   parser.on_message_complete = proc do |env|
     reqs << Object.new # parser
   end
-  while (data = socket.readpartial(8192)) do
+  socket.read_loop |data|
     parser << data
     while (req = reqs.shift)
       handle_request(socket, req)

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

@@ -11,11 +11,7 @@ def handle_client(client)
       headers = "Content-Length: #{data.bytesize}\r\n"
       client.write "HTTP/1.1 #{status_code}\r\n#{headers}\r\n#{data}"
     end
-    loop do
-      while data = client.readpartial(8192) rescue nil
-        parser << data
-      end
-    end
+    client.read_loop { |data| parser << data }
     client.close
   end
 end

data/examples/performance/thread_pool_perf.rb

@@ -10,7 +10,7 @@ def lengthy_op
   # Digest::SHA256.digest(IO.read('doc/Promise.html'))
 end
 
-X = 100
+X = 10000
 
 def compare_performance
   t0 = Time.now
@@ -35,20 +35,19 @@ def compare_performance
 
     acc = 0
     count = 0
-    10.times do |_i|
+    1.times do |_i|
       t0 = Time.now
-      supervise do |s|
-        X.times do
-          s.spin { Polyphony::ThreadPool.process { lengthy_op } }
-        end
+      X.times do
+        spin { Polyphony::ThreadPool.process { lengthy_op } }
       end
+      Fiber.current.await_all_children
       thread_pool_perf = X / (Time.now - t0)
       acc += thread_pool_perf
       count += 1
     end
     avg_perf = acc / count
     puts format(
-      'avg thread pool performance: %g (X %0.2f)',
+      'spin X thread pool performance: %g (X %0.2f)',
       avg_perf,
       avg_perf / native_perf
     )

data/ext/polyphony/backend.h

@@ -7,7 +7,6 @@
 
 // VALUE LibevBackend_accept(VALUE self, VALUE sock);
 // VALUE LibevBackend_accept_loop(VALUE self, VALUE sock);
-// VALUE libev_backend_await(VALUE self);
 // VALUE LibevBackend_connect(VALUE self, VALUE sock, VALUE host, VALUE port);
 // VALUE LibevBackend_finalize(VALUE self);
 // VALUE LibevBackend_post_fork(VALUE self);

data/ext/polyphony/libev_backend.c

@@ -31,7 +31,7 @@ static const rb_data_type_t LibevBackend_type = {
 
 static VALUE LibevBackend_allocate(VALUE klass) {
   LibevBackend_t *backend = ALLOC(LibevBackend_t);
-  
+
   return TypedData_Wrap_Struct(klass, &LibevBackend_type, backend);
 }
 
@@ -93,7 +93,7 @@ VALUE LibevBackend_ref(VALUE self) {
   GetLibevBackend(self, backend);
 
   backend->ref_count++;
-  return self;  
+  return self;
 }
 
 VALUE LibevBackend_unref(VALUE self) {
@@ -101,7 +101,7 @@ VALUE LibevBackend_unref(VALUE self) {
   GetLibevBackend(self, backend);
 
   backend->ref_count--;
-  return self;  
+  return self;
 }
 
 int LibevBackend_ref_count(VALUE self) {
@@ -139,7 +139,7 @@ VALUE LibevBackend_poll(VALUE self, VALUE nowait, VALUE current_fiber, VALUE que
   }
 
   backend->run_no_wait_count = 0;
-  
+
   COND_TRACE(2, SYM_fiber_ev_loop_enter, current_fiber);
   backend->running = 1;
   ev_run(backend->ev_loop, is_nowait ? EVRUN_NOWAIT : EVRUN_ONCE);
@@ -253,25 +253,32 @@ inline VALUE libev_await(LibevBackend_t *backend) {
   return ret;
 }
 
-VALUE libev_backend_await(VALUE self) {
-  LibevBackend_t *backend;
-  GetLibevBackend(self, backend);
-  return libev_await(backend);
-}
-
-VALUE libev_io_wait(LibevBackend_t *backend, struct libev_io *watcher, rb_io_t *fptr, int flags) {
+VALUE libev_wait_fd_with_watcher(LibevBackend_t *backend, int fd, struct libev_io *watcher, int events) {
   VALUE switchpoint_result;
 
   if (watcher->fiber == Qnil) {
     watcher->fiber = rb_fiber_current();
-    ev_io_init(&watcher->io, LibevBackend_io_callback, fptr->fd, flags);
+    ev_io_init(&watcher->io, LibevBackend_io_callback, fd, events);
   }
   ev_io_start(backend->ev_loop, &watcher->io);
+
   switchpoint_result = libev_await(backend);
+
   ev_io_stop(backend->ev_loop, &watcher->io);
+  RB_GC_GUARD(switchpoint_result);
+  return switchpoint_result;
+}
+
+VALUE libev_wait_fd(LibevBackend_t *backend, int fd, int events, int raise_exception) {
+  struct libev_io watcher;
+  VALUE switchpoint_result = Qnil;
+  watcher.fiber = Qnil;
+
+  switchpoint_result = libev_wait_fd_with_watcher(backend, fd, &watcher, events);
 
+  if (raise_exception) TEST_RESUME_EXCEPTION(switchpoint_result);
   RB_GC_GUARD(switchpoint_result);
-  return switchpoint_result;  
+  return switchpoint_result;
 }
 
 VALUE libev_snooze() {
@@ -288,20 +295,19 @@ ID ID_ivar_is_nonblocking;
 // benchmarks (with a "hello world" HTTP server) show throughput is improved
 // by 10-13%.
 inline void io_set_nonblock(rb_io_t *fptr, VALUE io) {
+  VALUE is_nonblocking = rb_ivar_get(io, ID_ivar_is_nonblocking);
+  if (is_nonblocking == Qtrue) return;
+
+  rb_ivar_set(io, ID_ivar_is_nonblocking, Qtrue);
+
 #ifdef _WIN32
-  return rb_w32_set_nonblock(fptr->fd);
+  rb_w32_set_nonblock(fptr->fd);
 #elif defined(F_GETFL)
-  VALUE is_nonblocking = rb_ivar_get(io, ID_ivar_is_nonblocking);
-  if (is_nonblocking == Qnil) {
-    rb_ivar_set(io, ID_ivar_is_nonblocking, Qtrue);
-    int oflags = fcntl(fptr->fd, F_GETFL);
-    if (oflags == -1) return;
-    if (oflags & O_NONBLOCK) return;
-    oflags |= O_NONBLOCK;
-    fcntl(fptr->fd, F_SETFL, oflags);
-  }
+  int oflags = fcntl(fptr->fd, F_GETFL);
+  if ((oflags == -1) && (oflags & O_NONBLOCK)) return;
+  oflags |= O_NONBLOCK;
+  fcntl(fptr->fd, F_SETFL, oflags);
 #endif
-  return;
 }
 
 VALUE LibevBackend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_eof) {
@@ -323,7 +329,7 @@ VALUE LibevBackend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_
   rb_io_check_byte_readable(fptr);
   io_set_nonblock(fptr, io);
   watcher.fiber = Qnil;
-  
+
   OBJ_TAINT(str);
 
   // Apparently after reopening a closed file, the file position is not reset,
@@ -340,12 +346,14 @@ VALUE LibevBackend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_
     if (n < 0) {
       int e = errno;
       if (e != EWOULDBLOCK && e != EAGAIN) rb_syserr_fail(e, strerror(e));
-      
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_READ);
+
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_READ);
+
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
       switchpoint_result = libev_snooze();
+
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
 
       if (n == 0) break; // EOF
@@ -354,7 +362,7 @@ VALUE LibevBackend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_
 
       if (total == len) {
         if (!dynamic_len) break;
-      
+
         rb_str_resize(str, total);
         rb_str_modify_expand(str, len);
         buf = RSTRING_PTR(str) + total;
@@ -364,11 +372,12 @@ VALUE LibevBackend_read(VALUE self, VALUE io, VALUE str, VALUE length, VALUE to_
       else buf += n;
     }
   }
-  if (total == 0) return Qnil;
 
   io_set_read_length(str, total, shrinkable);
   io_enc_str(str, fptr);
-  
+
+  if (total == 0) return Qnil;
+
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
 
@@ -429,22 +438,17 @@ VALUE LibevBackend_read_loop(VALUE self, VALUE io) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
 
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_READ);
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_READ);
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
       switchpoint_result = libev_snooze();
-      if (TEST_EXCEPTION(switchpoint_result)) goto error;
 
-      if (n == 0) break; // EOF      
+      if (TEST_EXCEPTION(switchpoint_result)) goto error;
 
+      if (n == 0) break; // EOF
       total = n;
       YIELD_STR();
-      Fiber_make_runnable(rb_fiber_current(), Qnil);
-      switchpoint_result = Thread_switch_fiber(rb_thread_current());
-      if (TEST_EXCEPTION(switchpoint_result)) {
-        goto error;
-      }
     }
   }
 
@@ -479,7 +483,9 @@ VALUE LibevBackend_write(VALUE self, VALUE io, VALUE str) {
     if (n < 0) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_WRITE);
+
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_WRITE);
+
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
@@ -490,6 +496,7 @@ VALUE LibevBackend_write(VALUE self, VALUE io, VALUE str) {
 
   if (watcher.fiber == Qnil) {
     switchpoint_result = libev_snooze();
+
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
 
@@ -535,7 +542,8 @@ VALUE LibevBackend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
 
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_WRITE);
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_WRITE);
+
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
@@ -558,6 +566,7 @@ VALUE LibevBackend_writev(VALUE self, VALUE io, int argc, VALUE *argv) {
   }
   if (watcher.fiber == Qnil) {
     switchpoint_result = libev_snooze();
+
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
 
@@ -575,10 +584,10 @@ VALUE LibevBackend_write_m(int argc, VALUE *argv, VALUE self) {
   if (argc < 2)
     // TODO: raise ArgumentError
     rb_raise(rb_eRuntimeError, "(wrong number of arguments (expected 2 or more))");
-  
+
   return (argc == 2) ?
     LibevBackend_write(self, argv[0], argv[1]) :
-    LibevBackend_writev(self, argv[0], argc - 1, argv + 1);                    
+    LibevBackend_writev(self, argv[0], argc - 1, argv + 1);
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -604,13 +613,15 @@ VALUE LibevBackend_accept(VALUE self, VALUE sock) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
 
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_READ);
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_READ);
+
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
       VALUE socket;
       rb_io_t *fp;
       switchpoint_result = libev_snooze();
+
       if (TEST_EXCEPTION(switchpoint_result)) {
         close(fd); // close fd since we're raising an exception
         goto error;
@@ -624,7 +635,7 @@ VALUE LibevBackend_accept(VALUE self, VALUE sock) {
       rb_io_ascii8bit_binmode(socket);
       io_set_nonblock(fp, socket);
       rb_io_synchronized(fp);
-      
+
       // if (rsock_do_not_reverse_lookup) {
 	    //   fp->mode |= FMODE_NOREVLOOKUP;
       // }
@@ -660,17 +671,19 @@ VALUE LibevBackend_accept_loop(VALUE self, VALUE sock) {
       int e = errno;
       if ((e != EWOULDBLOCK && e != EAGAIN)) rb_syserr_fail(e, strerror(e));
 
-      switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_READ);
+      switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_READ);
+
       if (TEST_EXCEPTION(switchpoint_result)) goto error;
     }
     else {
       rb_io_t *fp;
       switchpoint_result = libev_snooze();
+
       if (TEST_EXCEPTION(switchpoint_result)) {
         close(fd); // close fd since we're raising an exception
         goto error;
       }
-    
+
       socket = rb_obj_alloc(cTCPSocket);
       MakeOpenFile(socket, fp);
       rb_update_max_fd(fd);
@@ -708,7 +721,7 @@ VALUE LibevBackend_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
   io_set_nonblock(fptr, sock);
   watcher.fiber = Qnil;
 
-  addr.sin_family = AF_INET; 
+  addr.sin_family = AF_INET;
   addr.sin_addr.s_addr = inet_addr(host_buf);
   addr.sin_port = htons(NUM2INT(port));
 
@@ -716,11 +729,14 @@ VALUE LibevBackend_connect(VALUE self, VALUE sock, VALUE host, VALUE port) {
   if (result < 0) {
     int e = errno;
     if (e != EINPROGRESS) rb_syserr_fail(e, strerror(e));
-    switchpoint_result = libev_io_wait(backend, &watcher, fptr, EV_WRITE);
+
+    switchpoint_result = libev_wait_fd_with_watcher(backend, fptr->fd, &watcher, EV_WRITE);
+
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
   else {
     switchpoint_result = libev_snooze();
+
     if (TEST_EXCEPTION(switchpoint_result)) goto error;
   }
   RB_GC_GUARD(switchpoint_result);
@@ -729,21 +745,6 @@ error:
   return RAISE_EXCEPTION(switchpoint_result);
 }
 
-VALUE libev_wait_fd(LibevBackend_t *backend, int fd, int events, int raise_exception) {
-  struct libev_io watcher;
-  VALUE switchpoint_result = Qnil;
-  
-  watcher.fiber = rb_fiber_current();
-  ev_io_init(&watcher.io, LibevBackend_io_callback, fd, events);
-  ev_io_start(backend->ev_loop, &watcher.io);
-  switchpoint_result = libev_await(backend);
-  ev_io_stop(backend->ev_loop, &watcher.io);
-  
-  if (raise_exception) TEST_RESUME_EXCEPTION(switchpoint_result);
-  RB_GC_GUARD(switchpoint_result);
-  return switchpoint_result;
-}
-
 VALUE LibevBackend_wait_io(VALUE self, VALUE io, VALUE write) {
   LibevBackend_t *backend;
   rb_io_t *fptr;
@@ -752,7 +753,7 @@ VALUE LibevBackend_wait_io(VALUE self, VALUE io, VALUE write) {
   if (underlying_io != Qnil) io = underlying_io;
   GetLibevBackend(self, backend);
   GetOpenFile(io, fptr);
-  
+
   return libev_wait_fd(backend, fptr->fd, events, 1);
 }
 
@@ -780,7 +781,6 @@ VALUE LibevBackend_sleep(VALUE self, VALUE duration) {
   switchpoint_result = libev_await(backend);
 
   ev_timer_stop(backend->ev_loop, &watcher.timer);
-
   TEST_RESUME_EXCEPTION(switchpoint_result);
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
@@ -811,10 +811,10 @@ VALUE LibevBackend_waitpid(VALUE self, VALUE pid) {
   watcher.fiber = rb_fiber_current();
   ev_child_init(&watcher.child, LibevBackend_child_callback, NUM2INT(pid), 0);
   ev_child_start(backend->ev_loop, &watcher.child);
-  
+
   switchpoint_result = libev_await(backend);
-  ev_child_stop(backend->ev_loop, &watcher.child);
 
+  ev_child_stop(backend->ev_loop, &watcher.child);
   TEST_RESUME_EXCEPTION(switchpoint_result);
   RB_GC_GUARD(watcher.fiber);
   RB_GC_GUARD(switchpoint_result);
@@ -838,9 +838,10 @@ VALUE LibevBackend_wait_event(VALUE self, VALUE raise) {
 
   ev_async_init(&async, LibevBackend_async_callback);
   ev_async_start(backend->ev_loop, &async);
+
   switchpoint_result = libev_await(backend);
-  ev_async_stop(backend->ev_loop, &async);
 
+  ev_async_stop(backend->ev_loop, &async);
   if (RTEST(raise)) TEST_RESUME_EXCEPTION(switchpoint_result);
   RB_GC_GUARD(switchpoint_result);
   return switchpoint_result;