bayserver-core 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3384e309df7bc1a51935394fa90199ec3037f2a40978a6612e5c4a8ae826cdbf
-  data.tar.gz: 0dd2baf7f2cf5878eda0fcace793d50f3dce873962c983e3d49fe899542cf158
+  metadata.gz: f41f9fb4f873cb31dc74958aa960ea25631f97b3c247ec19e79610e7c7401891
+  data.tar.gz: 9399102f0b30b1ad6dfe92439707ec97e6b678593855b5a3c0d933253f1d0744
 SHA512:
-  metadata.gz: 3a84b96eba136c9bf08ec77ced8300289967bbe4a55d0aa9bdf66a4ceaad72dc0e27409878b92faf9f594ea11ed48dcff58fbc669b38daad37ef163c6d7b7bae
-  data.tar.gz: 64f1d19b52431b7f0986be35723231ea56ed17941314ce44ecab9d4a26296dc89e60f7a179f1eb71a4e5e3719de7d6630ac38a01f97a63ec20b2655707fba5f2
+  metadata.gz: 5eaa95c017ca683078c214ba13700b3b99735a4883a74433b1a9654342930d2d5e297d7ab9fdcac3291da1ca51629e17315a88cd4a89b34124e5b76a3e8da05e
+  data.tar.gz: dc9635c29598928060361e0ec733c3af899bc211486256b806f0d7ca00b38a6d4f73982d16a94624db3463ed23319105d59dbe03f2f4100f732b1506be55219d

data/lib/baykit/bayserver/agent/grand_agent.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'objspace'
 
 require 'baykit/bayserver/sink'
 require 'baykit/bayserver/agent/accept_handler'
@@ -23,15 +24,6 @@ module Baykit
         include Baykit::BayServer::Agent::Signal
         include Baykit::BayServer::Util
 
-        module GrandAgentLifecycleListener
-          #
-          # interface
-          #
-          #             void add(int agentId);
-          #             void remove(int agentId);
-          #
-        end
-
         SELECT_TIMEOUT_SEC = 10
 
         CMD_OK = 0
@@ -54,6 +46,7 @@ module Baykit
         attr :unanchorable_transporters
         attr :aborted
         attr :command_receiver
+        attr :timer_handlers
 
         class << self
           attr :agents
@@ -83,6 +76,7 @@ module Baykit
           @agent_id = agent_id
           @anchorable = anchorable
 
+          @timer_handlers = []
           if @anchorable
             @accept_handler = AcceptHandler.new(self, GrandAgent.anchorable_port_map)
           else
@@ -102,7 +96,7 @@ module Baykit
 
 
         def to_s()
-          return "Agt#" + @agent_id.to_s
+          return "agt#" + @agent_id.to_s
         end
 
 
@@ -185,8 +179,9 @@ module Baykit
 
                 if not processed
                   # timeout check
-                  @non_blocking_handler.close_timeout_sockets()
-                  @spin_handler.stop_timeout_spins()
+                  @timer_handlers.each do |h|
+                    h.on_timer()
+                  end
                 end
 
               rescue => e
@@ -204,7 +199,6 @@ module Baykit
         end
 
         def shutdown()
-          BayLog.debug("%s shutdown", self)
           if @accept_handler != nil
             @accept_handler.shutdown()
           end
@@ -213,6 +207,11 @@ module Baykit
         end
 
         def abort_agent(err = nil, status = 1)
+          BayLog.info("%s abort aborted=%s", self, @aborted)
+          if @aborted
+            return
+          end
+
           if err
             BayLog.fatal("%s abort", self)
             BayLog.fatal_e(err)
@@ -225,13 +224,13 @@ module Baykit
 
           GrandAgent.agents.delete(@agent_id)
 
+          @aborted = true
           if BayServer.harbor.multi_core
             exit(1)
           else
             clean()
           end
 
-          @aborted = true
         end
 
         def reload_cert()
@@ -248,8 +247,15 @@ module Baykit
 
         def print_usage()
           # print memory usage
-          BayLog.info("Agent#%d MemUsage", @agent_id);
-          MemUsage.get(@agent_id).print_usage(1);
+          BayLog.info("%s MemUsage", self)
+          BayLog.info("  Ruby version: %s", RUBY_VERSION)
+          memsize = ObjectSpace.memsize_of_all
+          # formatted by comma
+          msize_comma = memsize.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse.then do |str|
+            str[0] == ',' ? str[1..-1] : str
+          end
+          BayLog.info("  Total object size: %s bytes", msize_comma)
+          MemUsage.get(@agent_id).print_usage(1)
         end
 
         def wakeup
@@ -261,6 +267,14 @@ module Baykit
           @command_receiver = CommandReceiver.new(self, com_channel)
         end
 
+        def add_timer_handler(handler)
+          @timer_handlers << handler
+        end
+
+        def remove_timer_handler(handler)
+          @timer_handlers.delete(handler)
+        end
+
         private
         def on_waked_up(pipe_fd)
           #BayLog.debug("%s waked up", self)

data/lib/baykit/bayserver/agent/grand_agent_monitor.rb

@@ -69,6 +69,7 @@ module Baykit
         def print_usage()
           BayLog.debug("%s Send mem_usage command", self)
           send(GrandAgent::CMD_MEM_USAGE)
+          sleep(0.5)  # Lazy implementation
         end
 
         def send(cmd)

data/lib/baykit/bayserver/agent/lifecycle_listener.rb

@@ -0,0 +1,16 @@
+
+module Baykit
+  module BayServer
+    module Agent
+      module LifecycleListener
+        #
+        # interface
+        #
+        #             void add(int agentId);
+        #             void remove(int agentId);
+        #
+      end
+    end
+  end
+end
+

data/lib/baykit/bayserver/agent/non_blocking_handler.rb

@@ -11,6 +11,7 @@ module Baykit
         #   Sockets or file descriptors are kinds of channel
         #
         class NonBlockingHandler
+          include Baykit::BayServer::Agent::TimerHandler # implements
           include Baykit::BayServer::Agent
           include Baykit::BayServer::Util
 
@@ -78,6 +79,8 @@ module Baykit
             @ch_count = 0
             @operations = []
             @operations_lock = Monitor.new()
+
+            @agent.add_timer_handler(self)
           end
 
 
@@ -85,6 +88,18 @@ module Baykit
             return @agent.to_s()
           end
 
+          ######################################################
+          # Implements TimerHandler
+          ######################################################
+
+          def on_timer()
+            self.close_timeout_sockets()
+          end
+
+          ######################################################
+          # Custom methods
+          ######################################################
+
           def handle_channel(ch, op)
 
             ch_state = find_channel_state(ch)
@@ -106,8 +121,15 @@ module Baykit
                 next_action = ch_state.listener.on_connectable(ch)
                 if next_action == nil
                   raise Sink.new("unknown next action")
-                elsif next_action == NextSocketAction::CONTINUE
-                  ask_to_read(ch)
+                elsif next_action == NextSocketAction::READ
+                  # "Write-OP Off"
+                  op = @agent.selector.get_op(ch)
+                  op = op & ~Selector::OP_WRITE
+                  if op == 0
+                    @agent.selector.unregister(ch)
+                  else
+                    @agent.selector.modify(ch, op)
+                  end
                 end
 
               else
@@ -253,9 +275,14 @@ module Baykit
             now = DateTime.now
             @ch_map.values.each do |ch_state|
               if ch_state.listener != nil
-                duration =  ((now - ch_state.last_access_time) * 86400).to_i
-                if ch_state.listener.check_timeout(ch_state.channel, duration)
-                  BayLog.debug("%s timeout: skt=%s", @agent, ch_state.channel)
+                begin
+                  duration =  ((now - ch_state.last_access_time) * 86400).to_i
+                  if ch_state.listener.check_timeout(ch_state.channel, duration)
+                    BayLog.debug("%s timeout: ch=%s", @agent, ch_state.channel)
+                    close_list << ch_state
+                  end
+                rescue IOError => e
+                  BayLog.error_e(e)
                   close_list << ch_state
                 end
               end
@@ -283,7 +310,7 @@ module Baykit
 
           def ask_to_connect(ch, addr)
             ch_state = find_channel_state(ch)
-            BayLog.debug("%s askToConnect addr=%s skt=%s chState=%s", @agent, addr, ch, ch_state)
+            BayLog.debug("%s askToConnect addr=%s skt=%s chState=%s", @agent, addr.ip_address, ch, ch_state)
 
             begin
               ch.connect_nonblock(addr)
@@ -292,7 +319,7 @@ module Baykit
             end
 
             ch_state.connecting = true
-            add_operation(ch, Selector::OP_READ, true)
+            add_operation(ch, Selector::OP_WRITE, true)
           end
 
           def ask_to_read(ch)
@@ -379,9 +406,12 @@ module Baykit
           def close_channel(ch, ch_state)
             BayLog.debug("%s Close chState=%s", @agent, ch_state)
 
+            ch.close()
+
             if ch_state == nil
               ch_state = find_channel_state(ch)
             end
+
             if ch_state.accepted and @agent.accept_handler
               agent.accept_handler.on_closed
             end
@@ -398,7 +428,6 @@ module Baykit
               BayLog.warn_e(e)
             end
 
-            ch.close()
           end
 
           def add_channel_state(ch, ch_state)

data/lib/baykit/bayserver/agent/signal/signal_sender.rb

@@ -68,6 +68,7 @@ module Baykit
             begin
               a = Addrinfo.tcp(host, port)
               s = Socket.new(a.ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM)
+              s.setsockopt(Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, [60, 0].pack("l_2"))
               s.connect(a)
               s.write(cmd + "\n")
               s.flush();

data/lib/baykit/bayserver/agent/spin_handler.rb

@@ -1,9 +1,12 @@
+require 'baykit/bayserver/agent/timer_handler'
 
 module Baykit
   module BayServer
     module Agent
       class SpinHandler
 
+        include Baykit::BayServer::Agent::TimerHandler # implements
+
         module SpinListener
           #
           # interface
@@ -35,12 +38,25 @@ module Baykit
           @lock = Mutex.new
           @agent = agt
           @spin_count = 0
+          @agent.add_timer_handler(self)
         end
 
         def to_s()
           return @agent.to_s()
         end
 
+        ######################################################
+        # Implements TimerHandler
+        ######################################################
+
+        def on_timer()
+          stop_timeout_spins()
+        end
+
+        ######################################################
+        # Custom methods
+        ######################################################
+        #
         def process_data()
           if @listeners.empty?
             return false

data/lib/baykit/bayserver/agent/timer_handler.rb

@@ -0,0 +1,15 @@
+
+module Baykit
+  module BayServer
+    module Agent
+      module TimerHandler # interface
+
+        def on_timer()
+          raise NotImplementedError()
+        end
+
+      end
+    end
+  end
+end
+

data/lib/baykit/bayserver/docker/base/inbound_ship.rb

@@ -65,13 +65,13 @@ module Baykit
           # Other methods
           ######################################################
 
-          def get_tour(tur_key)
+          def get_tour(tur_key, force=false, rent=true)
             tur = nil
             store_key = InboundShip.uniq_key(@ship_id, tur_key)
             @lock.synchronize do
               tur = @tour_store.get(store_key)
-              if tur == nil
-                tur = @tour_store.rent(store_key, false)
+              if tur == nil && rent
+                tur = @tour_store.rent(store_key, force)
                 if tur == nil
                   return nil
                 end
@@ -135,13 +135,7 @@ module Baykit
               @port_docker.additional_headers.each do |nv|
                 tur.res.headers.add(nv[0], nv[1])
               end
-              begin
-                @protocol_handler.send_res_headers(tur)
-              rescue IOError => e
-                BayLog.debug_e(e, "%s abort: %s", tur, e)
-                tur.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
-                raise e
-              end
+              @protocol_handler.send_res_headers(tur)
             end
           end
 
@@ -163,28 +157,12 @@ module Baykit
 
             check_ship_id(check_id)
 
-            if tur.zombie? || tur.aborted?
-              # Don't send peer any data
-              BayLog::debug("%s Aborted or zombie tour. do nothing: %s state=%s", self, tur, tur.state)
-              tur.change_state(Tour::TOUR_ID_NOCHECK, TourState::ENDED)
-              if callback != nil
-                callback.call()
-              end
-              return
-            end
-
             max_len = @protocol_handler.max_res_packet_data_size();
             if len > max_len
               send_res_content(Ship::SHIP_ID_NOCHECK, tur, bytes, ofs, max_len)
               send_res_content(Ship::SHIP_ID_NOCHECK, tur, bytes, ofs + max_len, len - max_len, &callback)
             else
-              begin
-                @protocol_handler.send_res_content(tur, bytes, ofs, len, &callback)
-              rescue IOError => e
-                BayLog.debug_e(e, "%s abort: %s", tur, e)
-                tur.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
-                raise e
-              end
+              @protocol_handler.send_res_content(tur, bytes, ofs, len, &callback)
             end
           end
 
@@ -193,34 +171,25 @@ module Baykit
               check_ship_id(chk_ship_id)
               BayLog.debug("%s sendEndTour: %s state=%s", self, tur, tur.state)
 
-              if tur.zombie? || tur.aborted?
-                # Don't send peer any data. Do nothing
-                BayLog.debug("%s Aborted or zombie tour. do nothing: %s state=%s", self, tur, tur.state)
-                tur.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ENDED)
-                callback.call()
-              else
-                if !tur.valid?
-                  raise Sink.new("Tour is not valid")
+              if !tur.valid?
+                raise Sink.new("Tour is not valid")
+              end
+              keep_alive = false
+              if tur.req.headers.get_connection() == Headers::CONNECTION_KEEP_ALIVE
+                keep_alive = true
+                if keep_alive
+                  res_conn = tur.res.headers.get_connection()
+                  keep_alive = (res_conn == Headers::CONNECTION_KEEP_ALIVE) ||
+                    (res_conn == Headers::CONNECTION_UNKOWN)
                 end
-                keep_alive = false
-                if tur.req.headers.get_connection() == Headers::CONNECTION_KEEP_ALIVE
-                  keep_alive = true
-                  if keep_alive
-                    res_conn = tur.res.headers.get_connection()
-                    keep_alive = (res_conn == Headers::CONNECTION_KEEP_ALIVE) ||
-                      (res_conn == Headers::CONNECTION_UNKOWN)
-                  end
-                  if keep_alive
-                    if tur.res.headers.content_length() < 0
-                      keep_alive = false
-                    end
+                if keep_alive
+                  if tur.res.headers.content_length() < 0
+                    keep_alive = false
                   end
                 end
-
-                tur.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ENDED)
-
-                @protocol_handler.send_end_tour(tur, keep_alive, &callback)
               end
+
+              @protocol_handler.send_end_tour(tur, keep_alive, &callback)
             end
           end
 

data/lib/baykit/bayserver/docker/base/inbound_ship_store.rb

@@ -1,4 +1,5 @@
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 
 require 'baykit/bayserver/docker/base/inbound_ship'
 require 'baykit/bayserver/docker/base/inbound_ship_store'
@@ -16,7 +17,7 @@ module Baykit
           include Baykit::BayServer::Agent
 
           class AgentListener
-            include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener # implements
+            include Baykit::BayServer::Agent::LifecycleListener # implements
 
             def add(agt)
               InboundShipStore.stores[agt.agent_id] = InboundShipStore.new();

data/lib/baykit/bayserver/docker/built_in/built_in_log_docker.rb

@@ -1,4 +1,5 @@
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/agent/transporter/plain_transporter'
 require 'baykit/bayserver/agent/transporter/spin_write_transporter'
 require 'baykit/bayserver/docker/built_in/write_file_taxi'
@@ -20,7 +21,7 @@ module Baykit
             include Baykit::BayServer::Bcf
 
             class AgentListener
-              include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener  # implements
+              include Baykit::BayServer::Agent::LifecycleListener  # implements
               include Baykit::BayServer::Agent::Transporter
 
               attr :log_docker
@@ -45,7 +46,7 @@ module Baykit
 
                 when LOG_WRITE_METHOD_TAXI
                   tp = WriteFileTaxi.new()
-                  tp.init(File.open(file_name, "a"), boat)
+                  tp.init(agt.agent_id, File.open(file_name, "a"), boat)
 
                 end
 

data/lib/baykit/bayserver/docker/built_in/write_file_taxi.rb

@@ -19,6 +19,7 @@ module Baykit
           attr :data_listener
           attr :write_queue
           attr :lock
+          attr :agent_id
 
           def initialize()
             super
@@ -26,7 +27,8 @@ module Baykit
             @lock = Mutex.new()
           end
 
-          def init(out, data_listener)
+          def init(agt_id, out, data_listener)
+            @agent_id = agt_id
             @outfile = out
             @data_listener = data_listener
             @ch_valid = true
@@ -92,7 +94,7 @@ module Baykit
           end
 
           def next_run()
-            TaxiRunner.post(self)
+            TaxiRunner.post(@agent_id, self)
           end
         end
       end

data/lib/baykit/bayserver/docker/warp/warp_data.rb

@@ -38,6 +38,12 @@ module Baykit
               end
 
               tur_id = tur.id()
+
+              if !@started
+                # The buffer will become corrupted due to reuse.
+                buf = buf.dup()
+              end
+
               @warp_ship.warp_handler.post_warp_contents(
                 tur,
                 buf,
@@ -51,6 +57,7 @@ module Baykit
 
           def on_end_content(tur)
             BayLog.debug("%s End req content tur=%s", @warp_ship, tur)
+            @warp_ship.check_ship_id(@warp_ship_id)
             @warp_ship.warp_handler.post_warp_end(tur)
           end
 
@@ -66,6 +73,7 @@ module Baykit
             if !@started
               @warp_ship.protocol_handler.command_packer.flush(@warp_ship)
               BayLog.debug("%s Start Warp tour", self)
+              @warp_ship.flush()
               @started = true
             end
           end

data/lib/baykit/bayserver/docker/warp/warp_docker.rb

@@ -1,6 +1,7 @@
 require 'uri'
 
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/docker/base/club_base'
 require 'baykit/bayserver/docker/warp/warp_data'
 require 'baykit/bayserver/docker/warp/warp_data_listener'
@@ -19,7 +20,7 @@ module Baykit
           include Baykit::BayServer::Docker::Warp
 
           class AgentListener
-            include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener
+            include Baykit::BayServer::Agent::LifecycleListener
 
             attr :warp_docker
 

data/lib/baykit/bayserver/docker/warp/warp_ship.rb

@@ -18,7 +18,7 @@ module Baykit
           attr_accessor :connected
           attr :socket_timeout_sec
           attr :lock
-
+          attr :cmd_buf
 
           def initialize()
             super
@@ -27,12 +27,17 @@ module Baykit
             @tour_map = {}
             @lock = Mutex.new()
             @connected = false
+            @cmd_buf = []
           end
 
           def to_s()
             return "warp##{@ship_id}/#{@object_id}[#{protocol}]"
           end
 
+          def inspect
+            to_s
+          end
+
           ######################################################
           # Implements Reusable
           ######################################################
@@ -43,6 +48,8 @@ module Baykit
               BayLog.error("BUG: Some tours is active: %s", @tour_map)
             end
             @connected = false
+            @tour_map = {}
+            @cmd_buf = []
           end
 
 
@@ -129,6 +136,8 @@ module Baykit
                   rescue Exception => e
                     BayLog.error_e(e)
                   end
+                else
+                  tur.res.end_content(Tour::TOUR_ID_NOCHECK)
                 end
               end
               @tour_map.clear
@@ -161,8 +170,28 @@ module Baykit
             return timeout
           end
 
-          def inspect
-            to_s
+          def post(cmd, listener=nil)
+            if !@connected
+              @cmd_buf << [cmd, listener]
+            else
+              if cmd == nil
+                listener.call()
+              else
+                @protocol_handler.command_packer.post(self, cmd, &listener)
+              end
+            end
+          end
+          def flush()
+              @cmd_buf.each do | cmd_and_lis |
+                cmd = cmd_and_lis[0]
+                lis = cmd_and_lis[1]
+                if cmd == nil
+                  lis.call()
+                else
+                  @protocol_handler.command_packer.post(self, cmd, &lis)
+                end
+              end
+              @cmd_buf = []
           end
         end
       end

data/lib/baykit/bayserver/mem_usage.rb

@@ -1,5 +1,6 @@
 require 'baykit/bayserver/bayserver'
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/protocol/protocol_handler_store'
 require 'baykit/bayserver/protocol/packet_store'
 require 'baykit/bayserver/tours/tour_store'
@@ -20,7 +21,7 @@ module Baykit
       include Baykit::BayServer::Util
 
       class AgentListener
-        include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener
+        include Baykit::BayServer::Agent::LifecycleListener
 
         def add(agt)
           MemUsage.mem_usages[agt.agent_id] = MemUsage.new(agt.agent_id);

data/lib/baykit/bayserver/protocol/packet_store.rb

@@ -1,4 +1,5 @@
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/util/object_store'
 require 'baykit/bayserver/protocol/packet_factory'
 
@@ -12,7 +13,7 @@ module Baykit
         include Baykit::BayServer::Util
 
         class AgentListener
-          include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener # implements
+          include Baykit::BayServer::Agent::LifecycleListener # implements
 
           def add(agt)
             PacketStore.proto_map.values().each do |ifo|

data/lib/baykit/bayserver/protocol/protocol_handler_store.rb

@@ -1,4 +1,5 @@
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/util/object_store'
 require 'baykit/bayserver/util/string_util'
 
@@ -10,7 +11,7 @@ module Baykit
         include Baykit::BayServer::Util
 
         class AgentListener
-          include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener # implements
+          include Baykit::BayServer::Agent::LifecycleListener # implements
 
           def add(agt)
             ProtocolHandlerStore.proto_map.values().each {|ifo| ifo.add_agent(agt) }

data/lib/baykit/bayserver/taxi/taxi_runner.rb

@@ -1,23 +1,97 @@
+require 'baykit/bayserver/bayserver'
+require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/util/executor_service'
+require 'baykit/bayserver/sink'
 
 module Baykit
   module BayServer
     module Taxi
       class TaxiRunner
+        include Baykit::BayServer
+        include Baykit::BayServer::Agent
         include Baykit::BayServer::Util
 
+        class AgentListener
+          include Baykit::BayServer::Agent::LifecycleListener # implements
+
+          def add(agt)
+            TaxiRunner.runners[agt.agent_id - 1] = TaxiRunner.new(agt)
+          end
+
+          def remove(agt)
+            TaxiRunner.runners[agt.agent_id - 1].terminate()
+            TaxiRunner.runners[agt.agent_id - 1] = nil
+          end
+        end
+
+
         # define class instance accessor
         class << self
-          attr :exe
+          attr :max_taxis
+          attr :runners
+        end
+
+        attr :agent
+        attr :exe
+        attr :running_taxis
+        attr :lock
+
+        def initialize(agt)
+          @agent = agt
+          @exe = ExecutorService.new("TaxiRunner", TaxiRunner.max_taxis)
+          @agent.add_timer_handler(self)
+          @running_taxis = []
+          @lock = Monitor.new()
         end
 
-        def TaxiRunner.init(num_agents)
-          @exe = ExecutorService.new("TaxiRunner", num_agents)
+        ######################################################
+        # Implements TimerHandler
+        ######################################################
+
+        def on_timer()
+          @lock.synchronize do
+            @running_taxis.each do |txi|
+              txi.on_timer()
+            end
+          end
+        end
+
+        ######################################################
+        # Custom methods
+        ######################################################
+
+        def terminate()
+          @agent.remove_timer_handler(self)
+        end
+
+        def submit(txi)
+          @lock.synchronize do
+            @running_taxis << txi
+          end
+          @exe.submit(txi)
+          @lock.synchronize do
+            @running_taxis.delete(txi)
+          end
+        end
+
+        ######################################################
+        # Class methods
+        ######################################################
+
+        def TaxiRunner.init(max_taxis)
+          if(max_taxis <= 0)
+            raise Sink.new()
+          end
+          @max_taxis = max_taxis
+          @runners = []
+          GrandAgent.add_lifecycle_listener(AgentListener.new())
         end
 
-        def TaxiRunner.post(taxi)
+        def TaxiRunner.post(agt_id, txi)
+          BayLog.debug("agt#%d post taxi: thread=%s taxi=%s", agt_id, Thread.current.name, txi);
           begin
-            @exe.submit(taxi)
+            @runners[agt_id - 1].submit(txi)
             return true
           rescue => e
             BayLog.error_e(e)

data/lib/baykit/bayserver/tours/read_file_taxi.rb

@@ -23,12 +23,14 @@ module Baykit
         attr :buf_size
         attr :running
         attr :lock
+        attr :agent_id
 
-        def initialize(buf_size)
+        def initialize(agt_id, buf_size)
           super()
           @buf_size = buf_size
           @buf = StringUtil.alloc(buf_size)
           @lock = Monitor.new()
+          @agent_id = agt_id
         end
 
         def to_s()
@@ -88,7 +90,7 @@ module Baykit
             return
           end
           @running = true
-          TaxiRunner.post(self)
+          TaxiRunner.post(@agent_id, self)
         end
 
         def close()

data/lib/baykit/bayserver/tours/tour.rb

@@ -124,12 +124,15 @@ module Baykit
             begin
               city.enter(self)
             rescue Sink => e
+              change_state(TOUR_ID_NOCHECK, TourState::ABORTED)
               raise e
             rescue HttpException => e
               BayLog.error_e(e)
+              change_state(TOUR_ID_NOCHECK, TourState::ABORTED)
               raise e
             rescue => e
               BayLog.error_e(e)
+              change_state(TOUR_ID_NOCHECK, TourState::ABORTED)
               raise HttpException.new(HttpStatus::INTERNAL_SERVER_ERROR, e.message)
             end
           end
@@ -155,6 +158,10 @@ module Baykit
           return @state == TourState::ABORTED
         end
 
+        def ended?()
+          return @state == TourState::ENDED
+        end
+
         def initialized?()
           return state != TourState::UNINITIALIZED
         end

data/lib/baykit/bayserver/tours/tour_req.rb

@@ -125,34 +125,33 @@ module Baykit
         def post_content(check_id, data, start, len)
           @tour.check_tour_id(check_id)
 
+          data_passed = false
           if !@tour.running?
             BayLog.debug("%s tour is not running.", @tour)
-            return true
-          end
 
-          if @content_handler == nil
+          elsif @content_handler == nil
             BayLog.warn("%s content read, but no content handler", tour)
-            return true
-          end
 
-          if @consume_listener == nil
+          elsif @consume_listener == nil
             raise Sink.new("Request consume listener is null")
-          end
 
-          if @bytes_posted + len > @bytes_limit
+          elsif @bytes_posted + len > @bytes_limit
             raise ProtocolException.new("Read data exceed content-length: %d/%d", @bytes_posted + len, @bytes_limit)
-          end
 
-          # If has error, only read content. (Do not call content handler)
-          if @tour.error == nil
+          elsif  @tour.error != nil
+            # If has error, only read content. (Do not call content handler)
+            BayLog.debug("%s tour has error.", @tour)
+
+          else
             @content_handler.on_read_content(@tour, data, start, len)
+            data_passed = true
           end
-          @bytes_posted += len
 
+          @bytes_posted += len
           BayLog.debug("%s read content: len=%d posted=%d limit=%d consumed=%d",
                        @tour, len, @bytes_posted, @bytes_limit, @bytes_consumed)
 
-          if @tour.error == nil
+          if !data_passed
             return true
           end
 

data/lib/baykit/bayserver/tours/tour_res.rb

@@ -47,11 +47,13 @@ module Baykit
         attr :bytes_consumed
         attr :bytes_limit
         attr :buffer_size
+        attr :tour_returned
 
         def initialize(tur)
           @headers = Headers.new()
           @tour = tur
           @buffer_size = BayServer.harbor.tour_buffer_size
+          @tour_returned = false
         end
 
         def init()
@@ -82,6 +84,7 @@ module Baykit
           @bytes_posted = 0
           @bytes_consumed = 0
           @bytes_limit = 0
+          @tour_returned = false
         end
 
         ######################################################
@@ -121,8 +124,16 @@ module Baykit
             end
           end
 
-          @tour.ship.send_headers(@tour.ship_id, @tour)
-          @header_sent = true
+          begin
+            @tour.ship.send_headers(@tour.ship_id, @tour)
+          rescue IOError => e
+            BayLog.debug_e(e, "%s abort: %s", @tour, e)
+            @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+            raise e
+          ensure
+            @header_sent = true
+          end
+
         end
 
         def send_redirect(chk_tour_id, status, location)
@@ -132,9 +143,15 @@ module Baykit
             BayLog.error("Try to redirect after response header is sent (Ignore)")
           else
             set_consume_listener(&ContentConsumeListener::DEV_NULL)
-            @tour.ship.send_redirect(@tour.ship_id, @tour, status, location)
-            @header_sent = true
-            end_content(chk_tour_id)
+            begin
+              @tour.ship.send_redirect(@tour.ship_id, @tour, status, location)
+            rescue IOError => e
+              @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+              raise e
+            ensure
+              @header_sent = true
+              end_content(chk_tour_id)
+            end
           end
 
         end
@@ -176,14 +193,21 @@ module Baykit
             raise ProtocolException.new("Post data exceed content-length: " + @bytes_posted + "/" + @bytes_limit)
           end
 
-          if @can_compress
-            get_compressor().compress(buf, ofs, len, &done_lis)
+          if @tour.zombie? || @tour.aborted?
+            # Don't send peer any data
+            BayLog::debug("%s Aborted or zombie tour. do nothing: %s state=%s", self, @tour, @tour.state)
+            done_lis.call()
           else
-            begin
-              @tour.ship.send_res_content(@tour.ship_id, @tour, buf, ofs, len, &done_lis)
-            rescue IOError => e
-              done_lis.call()
-              raise e
+            if @can_compress
+              get_compressor().compress(buf, ofs, len, &done_lis)
+            else
+              begin
+                @tour.ship.send_res_content(@tour.ship_id, @tour, buf, ofs, len, &done_lis)
+              rescue IOError => e
+                done_lis.call()
+                @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+                raise e
+              end
             end
           end
 
@@ -208,6 +232,10 @@ module Baykit
           @tour.check_tour_id(chk_tour_id)
 
           BayLog.debug("%s end ResContent", self)
+          if @tour.ended?
+            BayLog.debug("%s Tour is already ended (Ignore).", self)
+            return
+          end
 
           if !@tour.zombie? && @tour.city != nil
             @tour.city.log(@tour)
@@ -221,14 +249,31 @@ module Baykit
 
           # Done listener
           done_lis = Proc.new() do
+            @tour.check_tour_id(chk_tour_id)
             @tour.ship.return_tour(@tour)
+            @tour_returned = true
           end
 
           begin
-            @tour.ship.send_end_tour(@tour.ship_id, @tour, &done_lis)
-          rescue IOError => e
-            done_lis.call()
-            raise e
+            if @tour.zombie? || @tour.aborted?
+              # Don't send peer any data. Do nothing
+              BayLog.debug("%s Aborted or zombie tour. do nothing: %s state=%s", self, @tour, @tour.state)
+              @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ENDED)
+              done_lis.call()
+            else
+              begin
+                @tour.ship.send_end_tour(@tour.ship_id, @tour, &done_lis)
+              rescue IOError => e
+                BayLog.debug("%s Error on sending end tour", self)
+                done_lis.call()
+                raise e
+              end
+            end
+          ensure
+            BayLog.debug("%s Tour is returned: %s", self, @tour_returned)
+            if !@tour_returned
+              @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ENDED)
+            end
           end
         end
 
@@ -288,8 +333,19 @@ module Baykit
             end
           else
             set_consume_listener(&ContentConsumeListener::DEV_NULL)
-            @tour.ship.send_error(@tour.ship_id, @tour, status, msg, err)
-            @header_sent = true
+
+            if @tour.zombie? || @tour.aborted?
+              # Don't send peer any data. Do nothing
+              BayLog.debug("%s Aborted or zombie tour. do nothing: %s state=%s", self, @tour, @tour.state)
+            else
+              begin
+                @tour.ship.send_error(@tour.ship_id, @tour, status, msg, err)
+              rescue IOError => e
+                BayLog.debug("%s Error on sending end tour", self)
+                @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+              end
+              @header_sent = true
+            end
           end
 
           end_content(chk_tour_id)
@@ -306,7 +362,7 @@ module Baykit
 
           if File.directory?(file)
             raise HttpException.new HttpStatus::FORBIDDEN, file
-          elsif !File.exists?(file)
+          elsif !File.exist?(file)
             raise HttpException.new HttpStatus::NOT_FOUND, file
           end
 
@@ -357,11 +413,11 @@ module Baykit
                 tp.open_valve()
 
               when Harbor::FILE_SEND_METHOD_TAXI
-                txi = ReadFileTaxi.new(bufsize)
+                txi = ReadFileTaxi.new(@tour.ship.agent.agent_id, bufsize)
                 @yacht.init(@tour, file, txi)
                 txi.init(File.open(file, "rb"), @yacht)
-                if !TaxiRunner.post(txi)
-                  raise HttpException.new(HttpStatus.SERVICE_UNAVAILABLE, "Taxi is busy!");
+                if !TaxiRunner.post(@tour.ship.agent.agent_id, txi)
+                  raise HttpException.new(HttpStatus::SERVICE_UNAVAILABLE, "Taxi is busy!");
                 end
 
               else
@@ -382,9 +438,18 @@ module Baykit
 
         def get_compressor()
           if @compressor == nil
-            @compressor = GzipCompressor.new(lambda do |new_buf, new_ofs, new_len, &lis|
-              @tour.ship.send_res_content(@tour.ship_id, @tour, new_buf, new_ofs, new_len, &lis)
-            end)
+            sip_id = @tour.ship.ship_id
+            tur_id = @tour.tour_id
+            gz_callback = lambda do |new_buf, new_ofs, new_len, &lis|
+              begin
+                @tour.ship.send_res_content(sip_id, @tour, new_buf, new_ofs, new_len, &lis)
+              rescue IOError => e
+                @tour.change_state(tur_id, Tour::TourState::ABORTED)
+                raise e
+              end
+            end
+
+            @compressor = GzipCompressor.new(gz_callback)
           end
 
           return @compressor

data/lib/baykit/bayserver/tours/tour_store.rb

@@ -1,4 +1,5 @@
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
 require 'baykit/bayserver/tours/tour'
 require 'baykit/bayserver/util/string_util'
 
@@ -15,7 +16,7 @@ module Baykit
 
 
         class AgentListener
-          include Baykit::BayServer::Agent::GrandAgent::GrandAgentLifecycleListener  # implements
+          include Baykit::BayServer::Agent::LifecycleListener  # implements
 
           def add(agt)
             TourStore.stores[agt.agent_id] = TourStore.new();

data/lib/baykit/bayserver/util/executor_service.rb

@@ -23,9 +23,9 @@ module Baykit
           def run
             while true
               tsk = @que.deq
-              #BayLog.debug("%s Start task on: %s", tsk, @name)
+              BayLog.debug("%s Start task on: %s", tsk, @name)
               tsk.run
-              #BayLog.debug("%s End task on: %s", tsk, @name)
+              BayLog.debug("%s End task on: %s", tsk, @name)
             end
           end
 

data/lib/baykit/bayserver/version.rb

@@ -1,7 +1,7 @@
 module Baykit
   module BayServer
       class Version
-        VERSION='2.2.2'
+        VERSION='2.3.0'
       end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-core
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Michisuke-P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-30 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies: []
 description: BayServer is one of the high-speed web servers. It operates as a single-threaded,
   asynchronous server, which makes it exceptionally fast. It also supports multi-core
@@ -25,6 +25,7 @@ files:
 - lib/baykit/bayserver/agent/command_receiver.rb
 - lib/baykit/bayserver/agent/grand_agent.rb
 - lib/baykit/bayserver/agent/grand_agent_monitor.rb
+- lib/baykit/bayserver/agent/lifecycle_listener.rb
 - lib/baykit/bayserver/agent/next_socket_action.rb
 - lib/baykit/bayserver/agent/non_blocking_handler.rb
 - lib/baykit/bayserver/agent/package.rb
@@ -32,6 +33,7 @@ files:
 - lib/baykit/bayserver/agent/signal/signal_proxy.rb
 - lib/baykit/bayserver/agent/signal/signal_sender.rb
 - lib/baykit/bayserver/agent/spin_handler.rb
+- lib/baykit/bayserver/agent/timer_handler.rb
 - lib/baykit/bayserver/agent/transporter/data_listener.rb
 - lib/baykit/bayserver/agent/transporter/package.rb
 - lib/baykit/bayserver/agent/transporter/plain_transporter.rb