grpc_kit 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ae7845744ed9b1f55241cacaaf276754682761799e8ec68768f8ae4d8d76b37
-  data.tar.gz: 8dff9ea7a4b5c61c1b32c1199d8454e6a183f80c598eadb3e8a14a9628f34459
+  metadata.gz: f25addf2f2c68ddec2355fa793c556a0ae3f138f7d89c55d70f1ab5da6e8a2ee
+  data.tar.gz: a4fd8dab4169f06e7f3cf149ad058257acbd8d840db45401e533204fde355817
 SHA512:
-  metadata.gz: 69e40242bbc9d686b26637a0c52f1f52b0b993e73f0bac84f981eae2c09889054f60efaf0e18a272445134123ab0731a492fdf257ed8fc0b249510cd332ac3f1
-  data.tar.gz: f95ec0e2739c2292a99469ff55b5197c783af03fdca5110616ee9e5c3f5ae096b4322dd47d0917aa142b8783be15dbbe935864fbaff1c739eaabd42221115d30
+  metadata.gz: 538fcc7570e52993cde7783190b41cd0b20f45090de70abb10aabbf231b7e6de10546e077b2eacccb648078460452bea628e6f9f5c682afb6c21887b96a06a22
+  data.tar.gz: 5af00705af1b908e09630f2cb1401a65683c3f25aa25d2531783a9bc28fce893b1b66ced3220549f94f1a967b03abda7939e8d85a82f9526699413f2aaca6377

data/grpc_kit.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'googleapis-common-protos-types', '~> 1.0.2'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'grpc-tools', '~> 1.15.0'
+  spec.add_development_dependency 'grpc-tools', '~> 1.18.0'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'

data/lib/grpc_kit/{thread_pool.rb → rpc_dispatcher.rb}

@@ -1,34 +1,37 @@
 # frozen_string_literal: true
 
-require 'grpc_kit/thread_pool/auto_trimmer'
+require 'grpc_kit/rpc_dispatcher/auto_trimmer'
+require 'grpc_kit/transport/server_transport'
+require 'grpc_kit/stream/server_stream'
 
 module GrpcKit
-  class ThreadPool
+  class RpcDispatcher
     DEFAULT_MAX = 20
     DEFAULT_MIN = 5
 
+    # @param rpcs [Hash<String,GrpcKit::RpcDesc>]
     # @param min [Integer] A mininum thread pool size
     # @param max [Integer] A maximum thread pool size
     # @param interval [Integer] An interval time of calling #trim
-    def initialize(max: DEFAULT_MAX, min: DEFAULT_MIN, interval: 30, &block)
+    def initialize(rpcs, max: DEFAULT_MAX, min: DEFAULT_MIN, interval: 30)
+      @rpcs = rpcs
       @max_pool_size = max
       @min_pool_size = min
-      @shutdown = false
-      @tasks = Queue.new
       unless max == min
         @auto_trimmer = AutoTrimmer.new(self, interval: interval).tap(&:start!)
       end
 
+      @shutdown = false
+      @tasks = Queue.new
       @spawned = 0
       @workers = []
       @mutex = Mutex.new
-      @block = block
 
       @min_pool_size.times { spawn_thread }
     end
 
-    # @param task [Object] task to schedule
-    def schedule(task, &block)
+    # @param task [Object] task to dispatch
+    def schedule(task)
       if task.nil?
         return
       end
@@ -37,7 +40,7 @@ module GrpcKit
         raise "scheduling new task isn't allowed during shutdown"
       end
 
-      @tasks.push(block || task)
+      @tasks.push(task)
       if @tasks.size > 1 && @mutex.synchronize { @spawned < @max_pool_size }
         spawn_thread
       end
@@ -51,17 +54,32 @@ module GrpcKit
 
     def trim(force = false)
       if (force || @tasks.empty?) && @mutex.synchronize { @spawned > @min_pool_size }
-        GrpcKit.logger.debug("Trim grpc_kit worker! Next worker size #{@spawned - 1}")
+        GrpcKit.logger.debug("Decrease RpcDipatcher's worker. Next worker size is #{@spawned - 1}")
         @tasks.push(nil)
       end
     end
 
     private
 
+    def dispatch(stream, control_queue)
+      transport = GrpcKit::Transport::ServerTransport.new(control_queue, stream)
+      server_stream = GrpcKit::Stream::ServerStream.new(transport)
+      path = stream.headers.path
+
+      rpc = @rpcs[path]
+      unless rpc
+        e = GrpcKit::Errors::Unimplemented.new(path)
+        server_stream.send_status(status: e.code, msg: e.message)
+        return
+      end
+
+      server_stream.invoke(rpc)
+    end
+
     def spawn_thread
       @spawned += 1
       worker = Thread.new(@spawned) do |i|
-        Thread.current.name = "grpc_kit worker thread #{i}"
+        Thread.current.name = "RpcDispatcher #{i}"
         GrpcKit.logger.debug("#{Thread.current.name} started")
 
         loop do
@@ -75,13 +93,13 @@ module GrpcKit
           end
 
           begin
-            @block.call(task)
+            dispatch(task[0], task[1])
           rescue Exception => e # rubocop:disable Lint/RescueException
-            GrpcKit.logger.error("An error occured on top level in worker #{Thread.current.name}: #{e.message} (#{e.class})\n #{Thread.current.backtrace.join("\n")}")
+            GrpcKit.logger.error("An error occured on top level in worker #{Thread.current.name}: #{e.message} (#{e.class})\n #{e.backtrace.join("\n")}")
           end
         end
 
-        GrpcKit.logger.debug("worker thread #{Thread.current.name} is stopping")
+        GrpcKit.logger.debug("#{Thread.current.name} stopped")
         @mutex.synchronize do
           @spawned -= 1
           @workers.delete(worker)

data/lib/grpc_kit/{thread_pool → rpc_dispatcher}/auto_trimmer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GrpcKit
-  class ThreadPool
+  class RpcDispatcher
     class AutoTrimmer
       def initialize(pool, interval: 30)
         @pool = pool

data/lib/grpc_kit/server.rb

@@ -2,6 +2,7 @@
 
 require 'grpc_kit/session/io'
 require 'grpc_kit/session/server_session'
+require 'grpc_kit/rpc_dispatcher'
 
 module GrpcKit
   class Server
@@ -12,8 +13,8 @@ module GrpcKit
     def initialize(interceptors: [], shutdown_timeout: 30, min_pool_size: nil, max_pool_size: nil)
       @interceptors = interceptors
       @shutdown_timeout = shutdown_timeout
-      @min_pool_size = min_pool_size || GrpcKit::ThreadPool::DEFAULT_MIN
-      @max_pool_size = max_pool_size || GrpcKit::ThreadPool::DEFAULT_MAX
+      @min_pool_size = min_pool_size || GrpcKit::RpcDispatcher::DEFAULT_MIN
+      @max_pool_size = max_pool_size || GrpcKit::RpcDispatcher::DEFAULT_MAX
       @sessions = []
       @rpc_descs = {}
       @mutex = Mutex.new
@@ -90,25 +91,8 @@ module GrpcKit
 
     private
 
-    def dispatch(stream, control_queue)
-      t = GrpcKit::Transport::ServerTransport.new(control_queue, stream)
-      ss = GrpcKit::Stream::ServerStream.new(t)
-      path = stream.headers.path
-
-      rpc = @rpc_descs[path]
-      unless rpc
-        e = GrpcKit::Errors::Unimplemented.new(path)
-        ss.send_status(status: e.code, msg: e.message)
-        return
-      end
-
-      ss.invoke(rpc)
-    end
-
-    def thread_pool
-      @thread_pool ||= GrpcKit::ThreadPool.new(min: @min_pool_size, max: @max_pool_size) do |task|
-        dispatch(task[0], task[1])
-      end
+    def dispatcher
+      @dispatcher ||= GrpcKit::RpcDispatcher.new(@rpc_descs, min: @min_pool_size, max: @max_pool_size)
     end
 
     def shutdown_sessions
@@ -116,7 +100,7 @@ module GrpcKit
     end
 
     def establish_session(conn)
-      session = GrpcKit::Session::ServerSession.new(GrpcKit::Session::IO.new(conn), thread_pool)
+      session = GrpcKit::Session::ServerSession.new(GrpcKit::Session::IO.new(conn), dispatcher)
       begin
         @mutex.synchronize { @sessions << session }
         yield(session)

data/lib/grpc_kit/session/control_queue.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module GrpcKit
+  module Session
+    class ControlQueue
+      def initialize
+        @event_stream = Queue.new
+      end
+
+      # Be nonblocking
+      def pop
+        if @event_stream.empty?
+          nil
+        else
+          @event_stream.pop(true)
+        end
+      rescue ThreadError => _
+        nil
+      end
+
+      def submit_response(id, headers)
+        @event_stream.push([:submit_response, id, headers])
+      end
+
+      def submit_headers(id, headers)
+        @event_stream.push([:submit_headers, id, headers])
+      end
+
+      def resume_data(id)
+        @event_stream.push([:resume_data, id])
+      end
+    end
+  end
+end

data/lib/grpc_kit/session/server_session.rb

@@ -2,13 +2,9 @@
 
 require 'ds9'
 require 'forwardable'
-require 'grpc_kit/control_queue'
+require 'grpc_kit/session/control_queue'
 require 'grpc_kit/session/stream'
 require 'grpc_kit/session/drain_controller'
-require 'grpc_kit/stream/server_stream'
-require 'grpc_kit/session/send_buffer'
-require 'grpc_kit/transport/server_transport'
-require 'grpc_kit/thread_pool'
 
 module GrpcKit
   module Session
@@ -18,8 +14,8 @@ module GrpcKit
       delegate %i[send_event recv_event] => :@io
 
       # @param io [GrpcKit::Session::IO]
-      # @param pool [GrpcKit::ThreadPool] Thread pool handling reqeusts
-      def initialize(io, pool)
+      # @param pool [GrpcKit::RcpDispatcher]
+      def initialize(io, dispatcher)
         super() # initialize DS9::Session
 
         @io = io
@@ -27,8 +23,8 @@ module GrpcKit
         @stop = false
         @inflights = []
         @drain_controller = GrpcKit::Session::DrainController.new
-        @control_queue = GrpcKit::ControlQueue.new
-        @pool = pool
+        @control_queue = GrpcKit::Session::ControlQueue.new
+        @dispatcher = dispatcher
       end
 
       # @return [void]
@@ -84,7 +80,6 @@ module GrpcKit
       def shutdown
         stop
         @io.close
-        # @pool.shutdown
       rescue StandardError => e
         GrpcKit.logger.error(e)
       end
@@ -173,7 +168,7 @@ module GrpcKit
 
           unless stream.inflight
             stream.inflight = true
-            @pool.schedule([stream, @control_queue])
+            @dispatcher.schedule([stream, @control_queue])
           end
         when DS9::Frames::Headers
           if frame.end_stream?

data/lib/grpc_kit/session/stream.rb

@@ -11,8 +11,8 @@ module GrpcKit
     class Stream
       extend Forwardable
 
-      delegate %i[end_write end_write?] => :@pending_send_data
-      delegate %i[end_read end_read?] => :@pending_recv_data
+      delegate %i[end_write?] => :@pending_send_data
+      delegate %i[end_read?] => :@pending_recv_data
       delegate %i[close close_remote close_local close? close_remote? close_local?] => :@status
 
       attr_reader :headers, :pending_send_data, :pending_recv_data, :trailer_data, :status
@@ -32,6 +32,14 @@ module GrpcKit
         @draining = false
       end
 
+      def end_write
+        @pending_send_data.end_write
+      end
+
+      def end_read
+        @pending_recv_data.end_read
+      end
+
       # @return [void]
       def drain
         @draining = true

data/lib/grpc_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrpcKit
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Yuta Iwama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ds9
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +183,6 @@ files:
 - lib/grpc_kit/calls/server_server_streamer.rb
 - lib/grpc_kit/client.rb
 - lib/grpc_kit/codec.rb
-- lib/grpc_kit/control_queue.rb
 - lib/grpc_kit/errors.rb
 - lib/grpc_kit/grpc/core.rb
 - lib/grpc_kit/grpc/dsl.rb
@@ -205,6 +204,8 @@ files:
 - lib/grpc_kit/interceptors/server_server_streamer.rb
 - lib/grpc_kit/method_config.rb
 - lib/grpc_kit/rpc_desc.rb
+- lib/grpc_kit/rpc_dispatcher.rb
+- lib/grpc_kit/rpc_dispatcher/auto_trimmer.rb
 - lib/grpc_kit/rpcs.rb
 - lib/grpc_kit/rpcs/client_bidi_streamer.rb
 - lib/grpc_kit/rpcs/client_client_streamer.rb
@@ -216,6 +217,7 @@ files:
 - lib/grpc_kit/rpcs/server_server_streamer.rb
 - lib/grpc_kit/server.rb
 - lib/grpc_kit/session/client_session.rb
+- lib/grpc_kit/session/control_queue.rb
 - lib/grpc_kit/session/drain_controller.rb
 - lib/grpc_kit/session/headers.rb
 - lib/grpc_kit/session/io.rb
@@ -227,8 +229,6 @@ files:
 - lib/grpc_kit/status_codes.rb
 - lib/grpc_kit/stream/client_stream.rb
 - lib/grpc_kit/stream/server_stream.rb
-- lib/grpc_kit/thread_pool.rb
-- lib/grpc_kit/thread_pool/auto_trimmer.rb
 - lib/grpc_kit/transport/client_transport.rb
 - lib/grpc_kit/transport/packable.rb
 - lib/grpc_kit/transport/server_transport.rb

data/lib/grpc_kit/control_queue.rb

@@ -1,30 +0,0 @@
-module GrpcKit
-  class ControlQueue
-    def initialize
-      @event_stream = Queue.new
-    end
-
-    # Be nonblocking
-    def pop
-      if @event_stream.empty?
-        nil
-      else
-        @event_stream.pop(true)
-      end
-    rescue ThreadError => _
-      nil
-    end
-
-    def submit_response(id, headers)
-      @event_stream.push([:submit_response, id, headers])
-    end
-
-    def submit_headers(id, headers)
-      @event_stream.push([:submit_headers, id, headers])
-    end
-
-    def resume_data(id)
-      @event_stream.push([:resume_data, id])
-    end
-  end
-end