griffin 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61289d32bbb5830ad446ea08b51604a4f4cf0340f59ec596dcc92c32cf29f7ac
-  data.tar.gz: dc61c80a41aa8c79294d88c9b2042b3e7babb728c108be7fe7a581e6c6324559
+  metadata.gz: 853f045042c1e48f339bbccbf5cfad440f93140c5731339387f297fcc94043b6
+  data.tar.gz: 89c07719af930c53773099f827e1e97658b6dbeaf6575b612a963cc03b92f744
 SHA512:
-  metadata.gz: c0629cb8f5fe58daa29b9c44d0e27cf37f29885e26bbc8fefb4a9aac624be4efed3436e98053fd554bcff1576fa0c9c4e26c313baf1e059ededae9ab0237b601
-  data.tar.gz: ea6576f3ab391cc2f632872375926c26e1f374006ee1d7b9f38be37bbe8af053ebdc208f933db309e95a262e1fa14272efcbf17b45941d07be0998fb16cc6f18
+  metadata.gz: a3f7098832322baa01051bb48a0a4d5222c2807ba70139fcef4a3c57b5e9ebac0edd99a29aa0eed2eb46ce40a585c2e41e03e7d019983f0e45d33ad449effab0
+  data.tar.gz: 92fe69659ed318b4c3b56471de2e5decc26e30caf708e0d577f769954fd0de0938404e04d40a4965ccfe034372783974aee2c1f699aaece922c9af6e5cd4c052

data/lib/griffin/engine/server.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-require 'griffin/listener'
-
 module Griffin
   module Engine
     module Server
-      attr_reader :core, :listener
+      attr_reader :core, :socket_manager_path
 
       def initialize
         @core = Griffin::Server.new(
@@ -16,6 +14,8 @@ module Griffin
           max_connection_size: config[:max_connection_size],
           interceptors: config[:interceptors],
         )
+        @socket_manager_path = ServerEngine::SocketManager::Server.generate_path
+        @socket_manager_server = ServerEngine::SocketManager::Server.open(@socket_manager_path)
       end
 
       def before_run
@@ -26,6 +26,7 @@ module Griffin
 
       def stop(stop_graceful)
         super # needed
+        @socket_manager_server.close
       end
 
       # def after_start; end

data/lib/griffin/engine/single.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'griffin/server'
-require 'griffin/listener'
 
 module Griffin
   module Engine
@@ -20,7 +19,8 @@ module Griffin
       def initialize(server, config)
         @server = server
         @config = config
-        @listener = Griffin::Listener.new(@config[:bind], @config[:port])
+        @sock = TCPServer.new(@config[:bind], @config[:port])
+        @sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       end
 
       def run
@@ -31,7 +31,8 @@ module Griffin
         install_handler
 
         @server.before_run
-        @server.run(@listener.listen)
+        @sock.listen(Socket::SOMAXCONN)
+        @server.run(@sock)
       end
 
       def install_handler

data/lib/griffin/engine/worker.rb

@@ -1,19 +1,22 @@
 # frozen_string_literal: true
 
-require 'griffin/listener'
-
 module Griffin
   module Engine
     module Worker
+      def initialize
+        @socket_manager = ServerEngine::SocketManager::Client.new(server.socket_manager_path)
+      end
+
       def before_fork
-        @listener = Griffin::Listener.new(config[:bind], config[:port])
         server.core.before_run(worker_id)
       end
 
       def run
-        server.core.run(@listener.listen)
+        @lsock = @socket_manager.listen_tcp(config[:bind], config[:port])
+        @lsock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+        server.core.run(@lsock)
       ensure
-        @listener.close
+        @lsock.close if @lsock
       end
 
       def stop

data/lib/griffin/server.rb

@@ -95,9 +95,15 @@ module Griffin
             break if handle_command
           end
 
+          # @thread_pool.schedule could block and accepted socket would be timeout.
+          # So call Thread.pass other workers having resources to handle a request would accept.
+          unless @thread_pool.resouce_available?
+            break
+          end
+
           begin
             conn = sock.accept_nonblock
-            @thread_pool.schedule(conn[0])
+            @thread_pool.schedule(conn)
           rescue IO::WaitReadable, Errno::EINTR => e
             Griffin.logger.debug("Error raised #{e}")
             # nothing

data/lib/griffin/server_config_builder.rb

@@ -8,7 +8,7 @@ module Griffin
     SERVERENGIEN_FIXED_CONFIGS = %i[daemonize worker_type worker_process_name].freeze
 
     # The default size of thread pool TCP Connection
-    DEFAULT_POOL_SIZE = 30
+    DEFAULT_POOL_SIZE = 20
     DEFAULT_CONNECTION_SIZE = 3
 
     GRIFFIN_CONFIGS = [

data/lib/griffin/thread_pool.rb

@@ -41,6 +41,10 @@ module Griffin
       end
     end
 
+    def resouce_available?
+      (@waiting != 0) || (@spawned != @max_pool_size)
+    end
+
     def shutdown
       @shutdown = true
       @max_pool_size.times { @tasks.push(nil) }

data/lib/griffin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Griffin
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: griffin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Yuta Iwama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-28 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,7 +146,6 @@ files:
 - lib/griffin/engine/server.rb
 - lib/griffin/engine/single.rb
 - lib/griffin/engine/worker.rb
-- lib/griffin/listener.rb
 - lib/griffin/logger.rb
 - lib/griffin/server.rb
 - lib/griffin/server_config_builder.rb

data/lib/griffin/listener.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require 'socket'
-
-module Griffin
-  class Listener
-    DEFAULT_BACKLOG_SIZE = 1024
-
-    # @params host [String]
-    # @params port [Integer]
-    # @params backlog [Integer]
-    def initialize(host, port, backlog: DEFAULT_BACKLOG_SIZE)
-      @host = host
-      @port = port
-      @backlog = backlog
-    end
-
-    def listen(tcp_opt: true)
-      @sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-      if tcp_opt
-        @sock.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-      end
-
-      @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEPORT, true)
-
-      @sock.bind(Addrinfo.tcp(@host, @port))
-      @sock.listen(@backlog)
-      Griffin.logger.info("Start listening #{@host}:#{@port}")
-      @sock
-    end
-
-    def close
-      @sock.close
-    end
-  end
-end