polyphony 0.14 → 0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b1d2bf93b1562b6ef1010acdf4a30993d6fd8f40e001ab13a00606e0ed2137
-  data.tar.gz: ea0f410c483ee06da41e1acdd342f9fccadf87c51bbca258571d8f5d2c6048a5
+  metadata.gz: 3b20863a05d3f48a1b2af107ebeecb67c08cdeb20a7973cdcf6cf0e7ad3d31f7
+  data.tar.gz: 62753e931ed71137ef4cc3c2b1b011f69cfaf2e578da65c6b193b3c40dc88e5f
 SHA512:
-  metadata.gz: 70af3ec736856b611bd1d4242f6430761b83382f88239a31a1a7e4124fbe6804153e08d248c03c61510c272f9511cdf7f6f4ada277eab2cbd6809f2e41daaa39
-  data.tar.gz: 678dad06dab6f6dbbccc23e39ac45e8045b4fdf0b2ea29959fd34e243d9d0f19f624ef80a8022f7dde4790e080302f59b06e65ec3ca26c9fe5efc4a70856f2c2
+  metadata.gz: 075bbc81be5b7818f550186d6d5d4094e53245cd425743fff407b15573bcd7b4a7c9219d9628167589b13ea538c6202e72b5f782675135d397a6346323133391
+  data.tar.gz: d4c25633ff9f79a14ae978fbf3c8a2e51ce1b7a7c82d5ab4aa007dae26780d7b29deca39bf285c885f197b67f290f78c91bccf0faaeb22b13a0481cc664d5a57

data/CHANGELOG.md

@@ -1,11 +1,20 @@
+0.15 2019-05-20
+---------------
+
+* Optimize `#next_tick` callback (about 6% faster than before)
+* Fix IO#<< to return self
+* Refactor HTTP code and examples
+* Fix race condition in `Supervisor#stop!`
+* Add `Kernel#snooze` method (`EV.snooze` will be deprecated eventually)
+
 0.14 2019-05-17
 ---------------
 
 * Use chunked encoding in HTTP 1 response
-* Rewrite IO#read, #readpartial, #write in C (about 30% performance improvement)
+* Rewrite `IO#read`, `#readpartial`, `#write` in C (about 30% performance improvement)
 * Add method delegation to `ResourcePool`
 * Optimize PG::Connection#async_exec
-* Fix Coprocess#cancel!
+* Fix `Coprocess#cancel!`
 * Preliminary support for websocket (see `examples/io/http_ws_server.rb`)
 * Rename `Coroutine` to `Coprocess`
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polyphony (0.14)
+    polyphony (0.15)
       http-2 (= 0.10.0)
       http_parser.rb (= 0.6.0)
       modulation (= 0.23)

data/TODO.md

@@ -1,3 +1,8 @@
+## Full or almost full functionality of IO using monkey patching
+
+- stuff like gets, getc etc should be using the ev reactor
+
+
 ## Testing
 
 - test IO

data/examples/core/genserver.rb

@@ -15,7 +15,7 @@ class GenServer
       end
     end
     build_api(coprocess, receiver)
-    EV.snooze
+    snooze
     coprocess
   end
 

data/examples/{io → http}/happy_eyeballs.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+# idea taken from the example given in trio:
+# https://www.youtube.com/watch?v=oLkfnc_UMcE
+
 require 'modulation'
 Polyphony = import('../../lib/polyphony')
 
-async def try_connect(supervisor, target)
+async def try_connect(target, supervisor)
   puts "trying #{target[2]}"
   socket = Polyphony::Net.tcp_connect(target[2], 80)
   supervisor.stop!([target[2], socket])
@@ -17,11 +20,11 @@ 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(supervisor, t)
+        supervisor.spawn try_connect(t, supervisor)
       end
     end
     if success
-      puts "success: #{success[0]} (#{Time.now - t0}s)"
+      puts "success: %s (%.3fs)" % [success[0], Time.now - t0]
     else
       puts "timed out (#{Time.now - t0}s)"
     end
@@ -29,4 +32,4 @@ def happy_eyeballs(hostname, port, max_wait_time: 0.025)
 end
 
 # Let's try it out:
-happy_eyeballs("debian.org", "https")
+happy_eyeballs("debian.org", "https")

data/examples/{io → http}/http_client.rb

@@ -9,11 +9,11 @@ def get_server_time
   Agent.get('https://ui.realiteq.net/', q: :time).json
 end
 
-X = 50
+X = 1
 puts "Making #{X} requests..."
 t0 = Time.now
 supervise do |s|
   X.times { get_server_time }
 end
 elapsed = Time.now - t0
-puts "count: #{X} elapsed: #{elapsed} rate: #{X / elapsed} reqs/s"
+puts "count: #{X} elapsed: #{elapsed} rate: #{X / elapsed} reqs/s"

data/examples/http/http_server.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'modulation'
+
+Polyphony = import('../../lib/polyphony')
+
+opts = { reuse_addr: true, dont_linger: true }
+spawn {
+  Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts) do |req|
+    req.respond("Hello world!\n")
+  end
+}
+
+puts "pid: #{Process.pid}"
+puts "Listening on port 1234..."

data/examples/{io → http}/http_server_forked.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
 require 'modulation'
-require 'localhost/authority'
 
 Polyphony = import('../../lib/polyphony')
-HTTPServer = import('../../lib/polyphony/http/server')
 
 opts = {
   reuse_addr: true,
   dont_linger: true,
 }
-runner = HTTPServer.listener('0.0.0.0', 1234, opts) do |req|
-  req.respond("Hello world!\n")
-end
+
+server = Polyphony::HTTP::Server.listen('0.0.0.0', 1234, opts)
 
 puts "Listening on port 1234"
 
@@ -20,8 +17,11 @@ child_pids = []
 4.times do
   child_pids << Polyphony.fork do
     puts "forked pid: #{Process.pid}"
-    spawn(&runner)
+    Polyphony::HTTP::Server.accept_loop(server, opts) do |req|
+      req.respond("Hello world!\n")
+    end
+  rescue Interrupt
   end
 end
 
-child_pids.each { |pid| EV::Child.new(pid).await }
+child_pids.each { |pid| EV::Child.new(pid).await }

data/examples/http/http_server_throttled.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'modulation'
+
+Polyphony = import('../../lib/polyphony')
+
+$throttler = throttle(1000)
+opts = { reuse_addr: true, dont_linger: true }
+spawn {
+  Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts) do |req|
+    $throttler.call { req.respond("Hello world!\n") }
+  end
+}
+
+puts "pid: #{Process.pid}"
+puts "Listening on port 1234..."

data/examples/{io → http}/http_ws_server.rb

@@ -5,8 +5,6 @@ require 'modulation'
 STDOUT.sync = true
 
 Polyphony = import('../../lib/polyphony')
-HTTPServer = import('../../lib/polyphony/http/server')
-Websocket = import('../../lib/polyphony/websocket')
 
 def ws_handler(conn)
   timer = spawn {
@@ -25,18 +23,17 @@ opts = {
   reuse_addr: true,
   dont_linger: true,
   upgrade: {
-    websocket: Websocket.handler(&method(:ws_handler))
+    websocket: Polyphony::Websocket.handler(&method(:ws_handler))
   }
 }
 
 HTML = IO.read(File.join(__dir__, 'ws_page.html'))
 
-server = HTTPServer.serve('0.0.0.0', 1234, opts) do |req|
-  req.respond(HTML, 'Content-Type' => 'text/html')
-end
+spawn {
+  server = Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts) do |req|
+    req.respond(HTML, 'Content-Type' => 'text/html')
+  end
+}
 
 puts "pid: #{Process.pid}"
-puts "Listening on port 1234..."
-server.await
-puts "bye bye"
-
+puts "Listening on port 1234..."

data/examples/http/https_raw_client.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'modulation'
+
+Polyphony = import('../../lib/polyphony')
+
+t0 = Time.now
+io = Polyphony::Net.tcp_connect('realiteq.net', 443, secure: true)
+io.write("GET /?q=time HTTP/1.0\r\nHost: realiteq.net\r\n\r\n")
+reply = io.read
+puts "time: #{Time.now - t0}"
+puts
+puts reply

data/examples/http/https_server.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'modulation'
+require 'localhost/authority'
+
+Polyphony = import('../../lib/polyphony')
+
+authority = Localhost::Authority.fetch
+opts = {
+  reuse_addr: true,
+  dont_linger: true,
+  secure_context: authority.server_context
+}
+
+puts "pid: #{Process.pid}"
+puts "Listening on port 1234..."
+Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts) do |req|
+  req.respond("Hello world!\n")
+end

data/examples/{io → http}/https_wss_server.rb

@@ -6,8 +6,6 @@ require 'localhost/authority'
 STDOUT.sync = true
 
 Polyphony = import('../../lib/polyphony')
-HTTPServer = import('../../lib/polyphony/http/server')
-Websocket = import('../../lib/polyphony/websocket')
 
 def ws_handler(conn)
   timer = spawn {
@@ -29,18 +27,14 @@ opts = {
   dont_linger: true,
   secure_context: authority.server_context,
   upgrade: {
-    websocket: Websocket.handler(&method(:ws_handler))
+    websocket: Polyphony::Websocket.handler(&method(:ws_handler))
   }
 }
 
 HTML = IO.read(File.join(__dir__, 'wss_page.html'))
 
-server = HTTPServer.serve('0.0.0.0', 1234, opts) do |req|
-  req.respond(HTML, 'Content-Type' => 'text/html')
-end
-
 puts "pid: #{Process.pid}"
 puts "Listening on port 1234..."
-server.await
-puts "bye bye"
-
+Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts) do |req|
+  req.respond(HTML, 'Content-Type' => 'text/html')
+end

data/examples/http/rack_server.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'modulation'
+require 'localhost/authority'
+
+Polyphony = import('../../lib/polyphony')
+
+app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
+app = Polyphony::HTTP::Rack.load(app_path)
+opts = { reuse_addr: true, dont_linger: true }
+
+puts "listening on port 1234"
+puts "pid: #{Process.pid}"
+Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts, &app)

data/examples/http/rack_server_https.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'modulation'
+require 'localhost/authority'
+
+Polyphony = import('../../lib/polyphony')
+
+app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
+app = Polyphony::HTTP::Rack.load(app_path)
+
+authority = Localhost::Authority.fetch
+opts = {
+  reuse_addr: true,
+  dont_linger: true,
+  secure_context: authority.server_context
+}
+
+puts "listening on port 1234"
+puts "pid: #{Process.pid}"
+Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts, &app)

data/examples/{io → http}/rack_server_https_forked.rb

@@ -4,11 +4,9 @@ require 'modulation'
 require 'localhost/authority'
 
 Polyphony = import('../../lib/polyphony')
-HTTPServer = import('../../lib/polyphony/http/server')
-Rack = import('../../lib/polyphony/http/rack')
 
 app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
-rack = Rack.load(app_path)
+app = Polyphony::HTTP::Rack.load(app_path)
 
 authority = Localhost::Authority.fetch
 opts = {
@@ -16,17 +14,15 @@ opts = {
   dont_linger: true,
   secure_context: authority.server_context
 }
-runner = HTTPServer.listener('0.0.0.0', 1234, opts, &rack)
+server = Polyphony::HTTP::Server.listen('0.0.0.0', 1234, opts)
 puts "Listening on port 1234"
 
 child_pids = []
 4.times do
   child_pids << Polyphony.fork do
     puts "forked pid: #{Process.pid}"
-    spawn(&runner)
+    Polyphony::HTTP::Server.accept_loop(server, opts, &app)
   end
 end
 
-spawn do
-  child_pids.each { |pid| EV::Child.new(pid).await }
-end
+child_pids.each { |pid| EV::Child.new(pid).await }

data/examples/http/websocket_secure_server.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'modulation'
+require 'localhost/authority'
+
+STDOUT.sync = true
+
+Polyphony = import('../../lib/polyphony')
+
+def ws_handler(conn)
+  while msg = conn.recv
+    conn << "you said: #{msg}"
+  end
+end
+
+authority = Localhost::Authority.fetch
+opts = {
+  reuse_addr: true,
+  dont_linger: true,
+  upgrade: {
+    websocket: Polyphony::Websocket.handler(&method(:ws_handler))
+  },
+  secure_context: authority.server_context
+}
+
+puts "pid: #{Process.pid}"
+puts "Listening on port 1234..."
+Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts) do |req|
+  req.respond("Hello world!\n")
+end

data/examples/{io → http}/websocket_server.rb

@@ -5,8 +5,6 @@ require 'modulation'
 STDOUT.sync = true
 
 Polyphony = import('../../lib/polyphony')
-HTTPServer = import('../../lib/polyphony/http/server')
-Websocket = import('../../lib/polyphony/websocket')
 
 def ws_handler(conn)
   while msg = conn.recv
@@ -18,16 +16,12 @@ opts = {
   reuse_addr: true,
   dont_linger: true,
   upgrade: {
-    websocket: Websocket.handler(&method(:ws_handler))
+    websocket: Polyphony::Websocket.handler(&method(:ws_handler))
   }
 }
 
-server = HTTPServer.serve('0.0.0.0', 1234, opts) do |req|
-  req.respond("Hello world!\n")
-end
-
 puts "pid: #{Process.pid}"
 puts "Listening on port 1234..."
-server.await
-puts "bye bye"
-
+Polyphony::HTTP::Server.serve('0.0.0.0', 1234, opts) do |req|
+  req.respond("Hello world!\n")
+end

data/examples/performance/perf_multi_snooze.rb

@@ -12,7 +12,7 @@ spawn do
   supervise do |s|
     FIBERS.times do
       s.spawn do
-        ITERATIONS.times { EV.snooze; count += 1 }
+        ITERATIONS.times { snooze; count += 1 }
       end
     end
   end

data/examples/performance/perf_snooze.rb

@@ -24,7 +24,7 @@ X = 1_000_000
 # snooze
 spawn do
   t0 = Time.now
-  X.times { EV.snooze }
+  X.times { snooze }
   dt = Time.now - t0
   puts "#{X / dt.to_f}/s"
 end

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

@@ -30,7 +30,7 @@ async def handle_client(socket)
     if req
       handle_request(socket, req)
       req = nil
-      EV.snooze
+      snooze
     end
   end
 rescue IOError, SystemCallError => e

data/ext/ev/ev_module.c

@@ -55,6 +55,7 @@ void Init_EV() {
   rb_define_singleton_method(mEV, "schedule_fiber", EV_schedule_fiber, 2);
 
   rb_define_method(rb_mKernel, "suspend", EV_suspend, 0);
+  rb_define_method(rb_mKernel, "snooze", EV_snooze, 0);
 
   ID_call                 = rb_intern("call");
   ID_caller               = rb_intern("caller");
@@ -175,7 +176,7 @@ static VALUE EV_post_fork(VALUE self) {
   return Qnil;
 }
 
-VALUE EV_next_tick_caller(VALUE proc, VALUE data, int argc, VALUE* argv) {
+VALUE EV_next_tick_runner(VALUE proc) {
   if (rb_obj_is_proc(proc)) {
     rb_funcall(proc, ID_call, 1, Qtrue);
   }
@@ -186,9 +187,13 @@ VALUE EV_next_tick_caller(VALUE proc, VALUE data, int argc, VALUE* argv) {
 }
 
 void EV_next_tick_callback(ev_loop *ev_loop, struct ev_timer *timer, int revents) {
-  VALUE scheduled_procs = rb_ary_dup(next_tick_procs);
-  rb_funcall(next_tick_procs, ID_clear, 0);
-  rb_block_call(scheduled_procs, ID_each, 0, NULL, EV_next_tick_caller, Qnil);
+  VALUE scheduled_procs = next_tick_procs;
+  next_tick_procs = rb_ary_new();
+
+  for (long i = 0; i < RARRAY_LEN(scheduled_procs); i++) {
+    EV_next_tick_runner(RARRAY_AREF(scheduled_procs, i));
+  }
+
   if (rb_array_len(next_tick_procs) > 0) {
     ev_timer_start(EV_DEFAULT, &next_tick_timer);
   } else {

data/ext/ev/io.c

@@ -35,6 +35,7 @@ static int EV_IO_symbol2event_mask(VALUE sym);
 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);
 
 void Init_EV_IO() {
   mEV = rb_define_module("EV");
@@ -51,7 +52,7 @@ void Init_EV_IO() {
   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, -1);
+  rb_define_method(cIO, "<<", IO_write_chevron, 1);
 }
 
 static const rb_data_type_t EV_IO_type = {
@@ -403,3 +404,8 @@ static VALUE IO_write(int argc, VALUE *argv, VALUE io) {
 
   return LONG2FIX(total);
 }
+
+static VALUE IO_write_chevron(VALUE io, VALUE str) {
+  IO_write(1, &str, io);
+  return io;
+}

data/lib/polyphony/core/channel.rb

@@ -21,7 +21,7 @@ class Channel
     else
       @waiting_queue.shift&.schedule(o)
     end
-    EV.snooze
+    snooze
   end
 
   def receive

data/lib/polyphony/core/coprocess.rb

@@ -47,7 +47,7 @@ class Coprocess
     @mailbox ||= []
     @mailbox << o
     @fiber&.schedule if @receive_waiting
-    EV.snooze
+    snooze
   end
 
   def receive

data/lib/polyphony/core/supervisor.rb

@@ -54,9 +54,10 @@ class Supervisor
   end
 
   def stop!(result = nil)
-    return unless @supervisor_fiber
+    return unless @supervisor_fiber && !@stopped
   
-    @supervisor_fiber&.transfer Exceptions::MoveOn.new(nil, result)
+    @stopped = true
+    @supervisor_fiber.transfer Exceptions::MoveOn.new(nil, result)
   end
 
   def stop_all_tasks

data/lib/polyphony/core.rb

@@ -41,5 +41,5 @@ at_exit do
   # in most cases, by the main fiber is done there are still pending or other
   # or asynchronous operations going on. If the reactor loop is not done, we
   # suspend the root fiber until it is done
-  suspend if $__reactor_fiber__.alive?
+  suspend if $__reactor_fiber__&.alive?
 end

data/lib/polyphony/extensions/io.rb

@@ -14,50 +14,51 @@ class ::IO
     @write_watcher&.stop
   end
 
-  # NO_EXCEPTION = { exception: false }.freeze
-
-  # def read(max = 8192, outbuf = nil)
-  #   outbuf ||= (@read_buffer ||= +'')
-  #   loop do
-  #     result = read_nonblock(max, outbuf, NO_EXCEPTION)
-  #     case result
-  #     when nil            then raise IOError
-  #     when :wait_readable then read_watcher.await
-  #     else                return result
-  #     end
-  #   end
-  # ensure
-  #   @read_watcher&.stop
-  # end
-
-  # def write(data)
-  #   loop do
-  #     result = write_nonblock(data, NO_EXCEPTION)
-  #     case result
-  #     when nil            then raise IOError
-  #     when :wait_writable then write_watcher.await
-  #     else
-  #       (result == data.bytesize) ? (return result) : (data = data[result..-1])
-  #     end
-  #   end
-  # ensure
-  #   @write_watcher&.stop
-  # end
-
-  # # write_list is inspired by 
-  # def write_list(*list)
-  #   list.each do |data|
-  #     loop do
-  #       result = write_nonblock(data, NO_EXCEPTION)
-  #       case result
-  #       when nil            then raise IOError
-  #       when :wait_writable then write_watcher.await
-  #       else
-  #         (result == data.bytesize) ? (break result) : (data = data[result..-1])
-  #       end
-  #     end
-  #   end
-  # ensure
-  #   @write_watcher&.stop
+  # def each(sep = $/, limit = nil, chomp: nil)
+  #   sep, limit = $/, sep if sep.is_a?(Integer)
+  # end
+  # alias_method :each_line, :each
+
+  # def each_byte
+  # end
+
+  # def each_char
+  # end
+
+  # def each_codepoint
+  # end
+
+  # def getbyte
+  # end
+
+  # def getc
+  # end
+
+  # def gets(sep = $/, limit = nil, chomp: nil)
+  #   sep, limit = $/, sep if sep.is_a?(Integer)
+  # end
+
+  # def print(*args)
+  # end
+
+  # def printf(format, *args)
+  # end
+
+  # def putc(obj)
+  # end
+
+  # def puts(*args)
+  # end
+
+  # def readbyte
+  # end
+
+  # def readchar
+  # end
+
+  # def readline(sep = $/, limit = nil, chomp: nil)
+  # end
+
+  # def readlines(sep = $/, limit = nil, chomp: nil)
   # end
 end

data/lib/polyphony/http/agent.rb

@@ -51,8 +51,8 @@ class Agent
 
   def request(url, opts = OPTS_DEFAULT)
     ctx = request_ctx(url, opts)
-    response = do_request(ctx)
 
+    response = do_request(ctx)
     case response[:status_code]
     when 301, 302
       request(response[:headers]['Location'])
@@ -115,7 +115,7 @@ class Agent
 
     state[:socket] << request
     while !done
-      parser << state[:socket].read
+      parser << state[:socket].readpartial(8192)
     end
 
     {
@@ -159,14 +159,14 @@ class Agent
     stream.on(:close) {
       done = true
       return {
-        protocol:     'http1.1',
+        protocol:     'http2',
         status_code:  headers && headers[':status'].to_i,
         headers:      headers || {},
         body:         body
       }
     }
 
-    while data = state[:socket].read
+    while data = state[:socket].readpartial(8192)
       state[:http2_client] << data
     end
   ensure

data/lib/polyphony/http/http1.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-export :run
+export :call
 
 require 'http/parser'
 
@@ -26,7 +26,7 @@ end
 # @param socket [Net::Socket] socket
 # @param handler [Proc] request handler
 # @return [void]
-def run(socket, opts, handler)
+def call(socket, opts, &handler)
   ctx = connection_context(socket, opts, handler)
   ctx[:parser].on_body = proc { |chunk| handle_body_chunk(ctx, chunk) }
 
@@ -35,7 +35,7 @@ def run(socket, opts, handler)
     break unless data
     if ctx[:parser].parse(data)
       break unless handle_request(ctx)
-      EV.snooze
+      snooze
     end
   end
 rescue IOError, SystemCallError => e

data/lib/polyphony/http/http2.rb

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
-export :run, :upgrade
+export :call, :upgrade
 
 require 'http/2'
 
 Request = import('./http2_request')
 
+def call(socket, opts, &handler)
+  interface = prepare(socket, handler)
+  client_loop(socket, interface)
+end
+
 UPGRADE_MESSAGE = <<~HTTP.gsub("\n", "\r\n")
   HTTP/1.1 101 Switching Protocols
   Connection: Upgrade
@@ -28,17 +33,12 @@ def prepare(socket, handler)
   end
 end
 
-def run(socket, opts, handler)
-  interface = prepare(socket, handler)
-  client_loop(socket, interface)
-end
-
 def client_loop(socket, interface)
   loop do
     data = socket.readpartial(8192)
     break unless data
     interface << data
-    EV.snooze
+    snooze
   end
 rescue IOError, SystemCallError => e
   # do nothing

data/lib/polyphony/http/server.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-export :serve, :listener
+export :serve, :listen, :accept_loop
 
 Net   = import('../net')
 HTTP1 = import('./http1')
@@ -9,31 +9,29 @@ HTTP2 = import('./http2')
 ALPN_PROTOCOLS = %w[h2 http/1.1].freeze
 H2_PROTOCOL = 'h2'
 
-async def serve(host, port, opts = {}, &handler)
+def serve(host, port, opts = {}, &handler)
   opts[:alpn_protocols] = ALPN_PROTOCOLS
   server = Net.tcp_listen(host, port, opts)
-
-  accept_loop(server, opts, handler)
+  accept_loop(server, opts, &handler)
 end
 
-def listener(host, port, opts = {}, &handler)
+def listen(host, port, opts = {})
   opts[:alpn_protocols] = ALPN_PROTOCOLS
-  server = Net.tcp_listen(host, port, opts)
-  proc { accept_loop(server, opts, handler) }
+  Net.tcp_listen(host, port, opts)
 end
 
-def accept_loop(server, opts, handler)
+def accept_loop(server, opts, &handler)
   while true
     client = server.accept
-    spawn client_task(client, opts, handler)
+    spawn { client_task(client, opts, &handler) }
   end
 rescue OpenSSL::SSL::SSLError
   retry # disregard
 end
 
-async def client_task(client, opts, handler)
+def client_task(client, opts, &handler)
   client.no_delay rescue nil
-  protocol_module(client).run(client, opts, handler)
+  protocol_module(client).(client, opts, &handler)
 end
 
 def protocol_module(socket)

data/lib/polyphony/http.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+export  :Server
+
+auto_import(
+  Server: './http/server'
+)

data/lib/polyphony/net.rb

@@ -8,6 +8,7 @@ import('./extensions/socket')
 import('./extensions/ssl')
 
 def tcp_connect(host, port, opts = {})
+  puts "tcp_connect(#{host.inspect}, #{port.inspect}, #{opts.inspect})"
   socket = ::Socket.new(:INET, :STREAM).tap { |s|
     addr = ::Socket.sockaddr_in(port, host)
     s.connect(addr)

data/lib/polyphony/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Polyphony
-  VERSION = '0.14'
+  VERSION = '0.15'
 end

data/lib/polyphony.rb

@@ -26,6 +26,15 @@ module Polyphony
     FS:           './polyphony/fs',
     # Net:          './polyphony/net',
     ResourcePool: './polyphony/resource_pool',
-    Supervisor:   './polyphony/supervisor'
+    Supervisor:   './polyphony/supervisor',
+    Websocket:    './polyphony/websocket'
   )
+
+  module HTTP
+    auto_import(
+      Agent:      './polyphony/http/agent',
+      Rack:       './polyphony/http/rack',
+      Server:     './polyphony/http/server',
+    )
+  end
 end

data/test/test_io.rb

@@ -8,16 +8,16 @@ module IOTests
   class IOTest < MiniTest::Test
     def setup
       EV.rerun
+      @i, @o = IO.pipe
     end
 
-    def test_that_io_does_not_block
-      i, o = IO.pipe
+    def test_that_io_op_yields_to_other_fibers
       count = 0
       msg = nil
       [
         spawn {
-          o.write("hello")
-          o.close
+          @o.write("hello")
+          @o.close
         },
 
         spawn {
@@ -28,11 +28,21 @@ module IOTests
         }, 
 
         spawn {
-          msg = i.read
+          msg = @i.read
         }
       ].each(&:await)
       assert_equal(5, count)
       assert_equal("hello", msg)
     end
+
+    def test_that_double_chevron_method_returns_io
+      assert_equal(@o, @o << 'foo')
+
+      @o << 'bar' << 'baz'
+      @o.close
+      assert_equal('foobarbaz', @i.read)
+    end
+
+    def test_
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.14'
+  version: '0.15'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-18 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modulation
@@ -148,6 +148,24 @@ files:
 - examples/core/thread_pool.rb
 - examples/core/throttle.rb
 - examples/fs/read.rb
+- examples/http/config.ru
+- examples/http/happy_eyeballs.rb
+- examples/http/http_client.rb
+- examples/http/http_server.js
+- examples/http/http_server.rb
+- examples/http/http_server_forked.rb
+- examples/http/http_server_throttled.rb
+- examples/http/http_ws_server.rb
+- examples/http/https_raw_client.rb
+- examples/http/https_server.rb
+- examples/http/https_wss_server.rb
+- examples/http/rack_server.rb
+- examples/http/rack_server_https.rb
+- examples/http/rack_server_https_forked.rb
+- examples/http/websocket_secure_server.rb
+- examples/http/websocket_server.rb
+- examples/http/ws_page.html
+- examples/http/wss_page.html
 - examples/interfaces/pg_client.rb
 - examples/interfaces/pg_pool.rb
 - examples/interfaces/pg_query.rb
@@ -155,27 +173,10 @@ files:
 - examples/interfaces/redis_client.rb
 - examples/interfaces/redis_pubsub.rb
 - examples/interfaces/redis_pubsub_perf.rb
-- examples/io/config.ru
 - examples/io/echo_client.rb
 - examples/io/echo_server.rb
 - examples/io/echo_server_with_timeout.rb
 - examples/io/echo_stdin.rb
-- examples/io/happy_eyeballs.rb
-- examples/io/http_client.rb
-- examples/io/http_server.js
-- examples/io/http_server.rb
-- examples/io/http_server_forked.rb
-- examples/io/http_server_throttled.rb
-- examples/io/http_ws_server.rb
-- examples/io/https_client.rb
-- examples/io/https_server.rb
-- examples/io/https_wss_server.rb
-- examples/io/rack_server.rb
-- examples/io/rack_server_https.rb
-- examples/io/rack_server_https_forked.rb
-- examples/io/websocket_server.rb
-- examples/io/ws_page.html
-- examples/io/wss_page.html
 - examples/performance/perf_multi_snooze.rb
 - examples/performance/perf_snooze.rb
 - examples/performance/thread-vs-fiber/polyphony_server.rb
@@ -226,6 +227,7 @@ files:
 - lib/polyphony/extensions/socket.rb
 - lib/polyphony/extensions/ssl.rb
 - lib/polyphony/fs.rb
+- lib/polyphony/http.rb
 - lib/polyphony/http/agent.rb
 - lib/polyphony/http/http1.rb
 - lib/polyphony/http/http1_request.rb
@@ -237,7 +239,6 @@ files:
 - lib/polyphony/net.rb
 - lib/polyphony/resource_pool.rb
 - lib/polyphony/server_task.rb
-- lib/polyphony/testing.rb
 - lib/polyphony/version.rb
 - lib/polyphony/websocket.rb
 - polyphony.gemspec

data/examples/io/http_server.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-HTTPServer = import('../../lib/polyphony/http/server')
-
-opts = { reuse_addr: true, dont_linger: true }
-server = HTTPServer.serve('0.0.0.0', 1234, opts) do |req|
-  req.respond("Hello world!\n")
-end
-puts "pid: #{Process.pid}"
-puts "Listening on port 1234..."
-server.await
-puts "bye bye"
-

data/examples/io/http_server_throttled.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-HTTPServer = import('../../lib/polyphony/http/server')
-
-$throttler = throttle(1000)
-opts = { reuse_addr: true, dont_linger: true }
-server = HTTPServer.serve('0.0.0.0', 1234, opts) do |req|
-  $throttler.call { req.respond("Hello world!\n") }
-end
-puts "pid: #{Process.pid}"
-puts "Listening on port 1234..."
-server.await
-puts "bye bye"

data/examples/io/https_client.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-
-spawn do
-  t0 = Time.now
-  io = Polyphony::Net.tcp_connect('google.com', 443, secure: true)
-  io.write("GET / HTTP/1.1\r\nHost: google.com\r\n\r\n")
-  reply = io.read(2**16)
-  puts "time: #{Time.now - t0}"
-  puts
-  puts reply
-rescue => e
-  p e
-end

data/examples/io/https_server.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'modulation'
-require 'localhost/authority'
-
-Polyphony = import('../../lib/polyphony')
-HTTPServer = import('../../lib/polyphony/http/server')
-
-spawn do
-  authority = Localhost::Authority.fetch
-  opts = {
-    reuse_addr: true,
-    dont_linger: true,
-    secure_context: authority.server_context
-  }
-  server = HTTPServer.serve('0.0.0.0', 1234, opts) do |req|
-    req.respond("Hello world!\n")
-  end
-  server.await
-end
-
-puts "pid: #{Process.pid}"
-puts "Listening on port 1234..."

data/examples/io/rack_server.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'modulation'
-require 'localhost/authority'
-
-Polyphony = import('../../lib/polyphony')
-HTTPServer = import('../../lib/polyphony/http/server')
-Rack = import('../../lib/polyphony/http/rack')
-
-app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
-rack = Rack.load(app_path)
-
-spawn do
-  opts = { reuse_addr: true, dont_linger: true }
-  server = HTTPServer.serve('0.0.0.0', 1234, opts, &rack)
-  puts "listening on port 1234"
-  puts "pid: #{Process.pid}"
-  server.await
-end

data/examples/io/rack_server_https.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'modulation'
-require 'localhost/authority'
-
-Polyphony = import('../../lib/polyphony')
-HTTPServer = import('../../lib/polyphony/http/server')
-Rack = import('../../lib/polyphony/http/rack')
-
-app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
-rack = Rack.load(app_path)
-
-spawn do
-  authority = Localhost::Authority.fetch
-  opts = {
-    reuse_addr: true,
-    dont_linger: true,
-    secure_context: authority.server_context
-  }
-  server = HTTPServer.serve('0.0.0.0', 1234, opts, &rack)
-  puts "listening on port 1234"
-  puts "pid: #{Process.pid}"
-  server.await
-end

data/lib/polyphony/testing.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-Core = import('./core')
-
-# Fiber used for running reactor loop
-ReactorLoopFiber = Fiber.new do
-  Polyphony.run_reactor
-end
-
-# Monkey-patch core module with async/await methods
-module Core
-  # Processes a promise by running reactor loop until promise is completed
-  # @param promise [Promise] promise
-  # @param more [Array<Promise>] more promises
-  # @return [any] resolved value
-  def self.await(promise = {}, *more)
-    return await_all(promise, *more) unless more.empty?
-
-    # raise FiberError, AWAIT_ERROR_MSG unless Fiber.current.async?
-    if promise.completed?
-      return_value = promise.clear_result
-    else
-      ReactorLoopFiber.transfer until promise.completed?
-      return_value = promise.result
-    end
-    return_value.is_a?(Exception) ? raise(return_value) : return_value
-  end
-
-  # Runs given block
-  # @return [void]
-  def self.async(&block)
-    block.()
-  end
-end