polyphony 0.15 → 0.16

data/examples/http/http_server_throttled.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
+require 'bundler/setup'
+require 'polyphony/http'
 
 $throttler = throttle(1000)
 opts = { reuse_addr: true, dont_linger: true }

data/examples/http/http_ws_server.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
 STDOUT.sync = true
 
-Polyphony = import('../../lib/polyphony')
+require 'bundler/setup'
+require 'polyphony/http'
+require 'polyphony/websocket'
 
 def ws_handler(conn)
   timer = spawn {
@@ -13,7 +13,7 @@ def ws_handler(conn)
     }
   }
   while msg = conn.recv
-    # conn << "you said: #{msg}"
+    conn << "you said: #{msg}"
   end
 ensure
   timer.stop

data/examples/http/https_raw_client.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
+require 'bundler/setup'
+require 'polyphony/http'
 
 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")
+io = Polyphony::Net.tcp_connect('google.com', 443, secure: true)
+io.write("GET / HTTP/1.0\r\nHost: realiteq.net\r\n\r\n")
 reply = io.read
 puts "time: #{Time.now - t0}"
 puts

data/examples/http/https_server.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require 'modulation'
+require 'bundler/setup'
+require 'polyphony/http'
 require 'localhost/authority'
 
-Polyphony = import('../../lib/polyphony')
-
 authority = Localhost::Authority.fetch
 opts = {
   reuse_addr: true,

data/examples/http/https_wss_server.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require 'modulation'
+require 'bundler/setup'
+require 'polyphony/http'
 require 'localhost/authority'
 
 STDOUT.sync = true
 
-Polyphony = import('../../lib/polyphony')
-
 def ws_handler(conn)
   timer = spawn {
     throttled_loop(1) {

data/examples/http/rack_server.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-require 'localhost/authority'
-
-Polyphony = import('../../lib/polyphony')
+require 'bundler/setup'
+require 'polyphony/http'
 
 app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
 app = Polyphony::HTTP::Rack.load(app_path)

data/examples/http/rack_server_https.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require 'modulation'
+require 'bundler/setup'
+require 'polyphony/http'
 require 'localhost/authority'
 
-Polyphony = import('../../lib/polyphony')
-
 app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
 app = Polyphony::HTTP::Rack.load(app_path)
 

data/examples/http/rack_server_https_forked.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require 'modulation'
+require 'bundler/setup'
+require 'polyphony/http'
 require 'localhost/authority'
 
-Polyphony = import('../../lib/polyphony')
-
 app_path = ARGV.first || File.expand_path('./config.ru', __dir__)
 app = Polyphony::HTTP::Rack.load(app_path)
 

data/examples/http/websocket_secure_server.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require 'modulation'
+require 'bundler/setup'
+require 'polyphony/http'
 require 'localhost/authority'
 
 STDOUT.sync = true
 
-Polyphony = import('../../lib/polyphony')
-
 def ws_handler(conn)
   while msg = conn.recv
     conn << "you said: #{msg}"

data/examples/http/websocket_server.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require 'modulation'
+require 'bundler/setup'
+require 'polyphony/http'
 
 STDOUT.sync = true
 
-Polyphony = import('../../lib/polyphony')
-
 def ws_handler(conn)
   while msg = conn.recv
     conn << "you said: #{msg}"

data/examples/interfaces/pg_client.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-Postgres =  import('../../lib/polyphony/extensions/postgres')
+require 'bundler/setup'
+require 'polyphony/postgres'
 
 def get_records
   res = $db.query("select 1 as test")

data/examples/interfaces/pg_pool.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-Postgres =  import('../../lib/polyphony/extensions/postgres')
+require 'bundler/setup'
+require 'polyphony/postgres'
 
 PGOPTS = {
   host:     '/tmp',
@@ -16,7 +14,7 @@ PGOPTS = {
 DBPOOL = Polyphony::ResourcePool.new(limit: 8) { PG.connect(PGOPTS) }
 
 def get_records(db)
-  res = db.query("select pg_sleep(0.0001) as test")
+  res = db.query("select pg_sleep(0.001) as test")
   # puts "got #{res.ntuples} records: #{res.to_a}"
 rescue => e
   puts "got error: #{e.inspect}"
@@ -32,6 +30,6 @@ count = 0
 coprocs = CONCURRENCY.times.map {
   spawn { loop { DBPOOL.acquire { |db| get_records(db); count += 1 } } }
 }
-sleep 3
+sleep 5
 puts "count: #{count} query rate: #{count / (Time.now - t0)} queries/s"
 coprocs.each(&:interrupt)

data/examples/interfaces/{pg_query.rb → pg_transaction.rb}

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-Postgres =  import('../../lib/polyphony/extensions/postgres')
+require 'bundler/setup'
+require 'polyphony/postgres'
 
 DB = PG.connect(
   host:     '/tmp',

data/examples/interfaces/redis_channels.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-import('../../lib/polyphony/extensions/redis')
+require 'bundler/setup'
+require 'polyphony/redis'
 
 class RedisChannel < Polyphony::Channel
   def self.publish_connection

data/examples/interfaces/redis_client.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-import('../../lib/polyphony/extensions/redis')
+require 'bundler/setup'
+require 'polyphony/redis'
 
 redis = Redis.new
 

data/examples/interfaces/redis_pubsub.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
-import('../../lib/polyphony/extensions/redis')
+require 'bundler/setup'
+require 'polyphony/redis'
 
 spawn do
   redis = Redis.new

data/examples/interfaces/redis_pubsub_perf.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require 'modulation'
+require 'bundler/setup'
+require 'polyphony/redis'
 require 'json'
 
-Polyphony = import('../../lib/polyphony')
-import('../../lib/polyphony/extensions/redis')
-
 X_SESSIONS = 1000
 X_NODES = 10000
 X_SUBSCRIPTIONS_PER_SESSION = 100

data/examples/io/echo_client.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
+require 'bundler/setup'
+require 'polyphony'
 
 socket = Polyphony::Net.tcp_connect('127.0.0.1', 1234)
 
 writer = spawn do
-  throttled_loop(1) { socket << "#{Time.now}\n" }
+  throttled_loop(1) { socket << "#{Time.now}\n" rescue nil }
 end
 
 reader = spawn do
   puts "received from echo server:"
-  while data = socket.read
+  while data = socket.readpartial(8192)
     STDOUT << data
   end
 end

data/examples/io/echo_server.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-Polyphony = import('../../lib/polyphony')
+require 'bundler/setup'
+require 'polyphony'
 
 server = TCPServer.open(1234)
 puts "Echoing on port 1234..."

data/examples/io/echo_server_with_timeout.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
+require 'bundler/setup'
+require 'polyphony'
 
 begin
   server = Polyphony::Net.tcp_listen(nil, 1234, reuse_addr: true, dont_linger: true)
@@ -14,8 +13,7 @@ begin
       cancel_scope = nil
       move_on_after(5) do |s|
         cancel_scope = s
-        loop do
-          data = client.read
+        while (data = client.readpartial(8192))
           s.reset_timeout
           client.write(data)
         end

data/examples/io/echo_stdin.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require 'modulation'
-
-Polyphony = import('../../lib/polyphony')
+require 'bundler/setup'
+require 'polyphony'
 
 puts "Write something..."
 move_on_after(5) do |scope|
   loop do
-    data = STDIN.read
+    data = STDIN.readpartial(8192)
     scope.reset_timeout
     puts "you wrote: #{data}"
   end

data/examples/performance/perf_multi_snooze.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-Polyphony = import('../../lib/polyphony')
+require 'bundler/setup'
+require 'polyphony'
 
 ITERATIONS  = 1_000
 FIBERS      = 1_000

data/examples/performance/perf_snooze.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'modulation'
-Polyphony = import('../../lib/polyphony')
+require 'bundler/setup'
+require 'polyphony'
 
 X = 1_000_000
 

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

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require 'modulation'
+require 'bundler/setup'
+require 'polyphony'
 require 'http/parser'
 
-Polyphony = import('../../../lib/polyphony')
-
 class Http::Parser
   def setup_async
     self.on_message_complete = proc { @request_complete = true }
@@ -25,8 +24,8 @@ async def handle_client(socket)
   parser.on_message_complete = proc do |env|
     req = parser
   end
-  loop do
-    parser << socket.read
+  while (data = socket.readpartial(8192)) do
+    parser << data
     if req
       handle_request(socket, req)
       req = nil

data/ext/ev/ev_module.c

@@ -54,8 +54,9 @@ void Init_EV() {
   rb_define_singleton_method(mEV, "post_fork", EV_post_fork, 0);
   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);
+  rb_define_global_function("suspend", EV_suspend, 0);
+  rb_define_global_function("snooze", EV_snooze, 0);
+  rb_define_global_function("next_tick", EV_next_tick, 0);
 
   ID_call                 = rb_intern("call");
   ID_caller               = rb_intern("caller");

data/lib/polyphony/core/supervisor.rb

@@ -7,7 +7,7 @@ Exceptions  = import('./exceptions')
 
 class Supervisor
   def initialize
-    @coprocesss = []
+    @coprocesses = []
   end
 
   def await(&block)
@@ -34,14 +34,14 @@ class Supervisor
   end
 
   def spawn_coprocess(proc)
-    @coprocesss << proc
+    @coprocesses << proc
     proc.when_done { task_completed(proc) }
     proc.run unless proc.running?
     proc
   end
 
   def spawn_proc(proc)
-    @coprocesss << Object.spawn do |coprocess|
+    @coprocesses << Object.spawn do |coprocess|
       proc.call(coprocess)
       task_completed(coprocess)
     rescue Exception => e
@@ -50,7 +50,7 @@ class Supervisor
   end
 
   def still_running?
-    !@coprocesss.empty?
+    !@coprocesses.empty?
   end
 
   def stop!(result = nil)
@@ -62,15 +62,15 @@ class Supervisor
 
   def stop_all_tasks
     exception = Exceptions::Stop.new
-    @coprocesss.each do |c|
+    @coprocesses.each do |c|
       EV.next_tick { c.interrupt(exception) }
     end
   end
 
   def task_completed(coprocess)
-    return unless @coprocesss.include?(coprocess)
+    return unless @coprocesses.include?(coprocess)
     
-    @coprocesss.delete(coprocess)
-    @supervisor_fiber&.transfer if @coprocesss.empty?
+    @coprocesses.delete(coprocess)
+    @supervisor_fiber&.transfer if @coprocesses.empty?
   end
 end

data/lib/polyphony/http/agent.rb

@@ -7,7 +7,7 @@ require 'http/parser'
 require 'http/2'
 require 'json'
 
-ResourcePool = import('../resource_pool')
+ResourcePool = import('../core/resource_pool')
 
 module ResponseMixin
   def body

data/lib/polyphony/http.rb

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 
-export  :Server
+require_relative '../polyphony'
 
-auto_import(
-  Server: './http/server'
-)
+module Polyphony
+  module HTTP
+    auto_import(
+      Agent:      './http/agent',
+      Rack:       './http/rack',
+      Server:     './http/server',
+    )
+  end
+end
+
+export_default Polyphony::HTTP

data/lib/polyphony/net.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
 export  :tcp_connect,
-        :tcp_listen#,
-        # :getaddrinfo
+        :tcp_listen
 
 import('./extensions/socket')
-import('./extensions/ssl')
+import('./extensions/openssl')
 
 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)
@@ -37,17 +35,16 @@ def tcp_listen(host = nil, port = nil, opts = {})
   end
 end
 
-DEFAULT_SSL_CONTEXT = OpenSSL::SSL::SSLContext.new
-DEFAULT_SSL_CONTEXT.set_params(verify_mode: OpenSSL::SSL::VERIFY_PEER)
-
 def secure_socket(socket, context, opts)
-  context ||= DEFAULT_SSL_CONTEXT
-  setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
-  OpenSSL::SSL::SSLSocket.new(socket, context).tap { |s| s.connect }
+  if context
+    setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
+    OpenSSL::SSL::SSLSocket.new(socket, context).tap { |s| s.connect }
+  else
+    OpenSSL::SSL::SSLSocket.new(socket).tap { |s| s.connect }
+  end
 end
 
 def secure_server(socket, context, opts)
-  context ||= DEFAULT_SSL_CONTEXT
   setup_alpn(context, opts[:alpn_protocols]) if opts[:alpn_protocols]
   OpenSSL::SSL::SSLServer.new(socket, context)
 end

data/lib/polyphony/{extensions/postgres.rb → postgres.rb}

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
-export :Client
-
+require_relative '../polyphony'
 require 'pg'
 
-Core  = import('../core')
-
 module ::PG
   def self.connect(*args)
     Connection.connect_start(*args).tap(&method(:connect_async))

data/lib/polyphony/{extensions/redis.rb → redis.rb}

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-export :Driver
+require_relative '../polyphony'
 
 require "redis"
 require "hiredis/reader"
 
-Net = import('../net')
-
 class Driver
   def self.connect(config)
     if config[:scheme] == "unix"
@@ -22,7 +20,7 @@ class Driver
   end
 
   def initialize(host, port)
-    @connection = Net.tcp_connect(host, port)
+    @connection = Polyphony::Net.tcp_connect(host, port)
     @reader = ::Hiredis::Reader.new
   end
 
@@ -56,8 +54,7 @@ class Driver
     reply = @reader.gets
     return reply if reply
     
-    loop do
-      data = @connection.read
+    while (data = @connection.readpartial(8192))
       @reader.feed(data)
       reply = @reader.gets
       return reply if reply

data/lib/polyphony/version.rb

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

data/lib/polyphony/websocket.rb

@@ -8,7 +8,7 @@ require 'websocket'
 class WebsocketConnection
   def initialize(client, headers)
     @client = client
-    @headers = headers    
+    @headers = headers
     setup(headers)
   end