bayserver-core 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f41f9fb4f873cb31dc74958aa960ea25631f97b3c247ec19e79610e7c7401891
-  data.tar.gz: 9399102f0b30b1ad6dfe92439707ec97e6b678593855b5a3c0d933253f1d0744
+  metadata.gz: ef1870c148ef4f045575bdd31e28b5e13808013fa159e0642a627471e0b80962
+  data.tar.gz: 0247c5d8b92f4c9f1cf95b20ae02687202d524c6edd82158711bce98fa5e8e6e
 SHA512:
-  metadata.gz: 5eaa95c017ca683078c214ba13700b3b99735a4883a74433b1a9654342930d2d5e297d7ab9fdcac3291da1ca51629e17315a88cd4a89b34124e5b76a3e8da05e
-  data.tar.gz: dc9635c29598928060361e0ec733c3af899bc211486256b806f0d7ca00b38a6d4f73982d16a94624db3463ed23319105d59dbe03f2f4100f732b1506be55219d
+  metadata.gz: c3460ae4f7b5d50945fb20e5f6072838fe7277ccf6d6b9f0cd9d8e51e4ecd3c87a729121cc1d502edb8ddb120841e99377a63ba62324515a74de06d27fe769b6
+  data.tar.gz: 22d1f706b151704256cf55526e8b4bc6d29a04c2ab543c9803cb32316719239140997390d7b88b500e1d248cc8281821e68666ba68f2abdddd247880a2dbc698

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

@@ -37,7 +37,7 @@ module Baykit
               when GrandAgent::CMD_MEM_USAGE
                 @agent.print_usage()
               when GrandAgent::CMD_SHUTDOWN
-                @agent.shutdown()
+                @agent.req_shutdown()
                 @aborted = true
               when GrandAgent::CMD_ABORT
                 IOUtil.write_int32(@communication_channel, GrandAgent::CMD_OK)

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

@@ -125,112 +125,117 @@ module Baykit
           busy = true
           begin
             while not @aborted
-              begin
-                count = -1
-
-                if @accept_handler
-                  test_busy = @accept_handler.ch_count >= @max_inbound_ships
-                  if test_busy != busy
-                    busy = test_busy
-                    if busy
-                      @accept_handler.on_busy()
-                    else
-                      @accept_handler.on_free()
-                    end
+
+              count = -1
+
+              if @accept_handler
+                test_busy = @accept_handler.ch_count >= @max_inbound_ships
+                if test_busy != busy
+                  busy = test_busy
+                  if busy
+                    @accept_handler.on_busy()
+                  else
+                    @accept_handler.on_free()
                   end
                 end
+              end
 
-                if !busy && @selector.count() == 2
-                  # agent finished
-                  BayLog.debug("%s Selector has no key", self)
-                  break
-                end
+              if !busy && @selector.count() == 2
+                # agent finished
+                BayLog.debug("%s Selector has no key", self)
+                break
+              end
 
-                if !@spin_handler.empty?
-                  timeout = 0
-                else
-                  timeout = @select_timeout_sec
-                end
+              if !@spin_handler.empty?
+                timeout = 0
+              else
+                timeout = @select_timeout_sec
+              end
 
-                #@BayServer.debug("Selecting... read=" + read_list.to_s)
-                selected_map = @selector.select(timeout)
-                #BayLog.debug("%s selected: %s", self, selected_map)
+              if @aborted
+                BayLog.info("%s aborted by another thread", self)
+                break
+              end
+              #@BayServer.debug("Selecting... read=" + read_list.to_s)
+              selected_map = @selector.select(timeout)
+              #BayLog.debug("%s selected: %s", self, selected_map)
 
-                processed = @non_blocking_handler.register_channel_ops() > 0
+              processed = @non_blocking_handler.register_channel_ops() > 0
 
-                if selected_map.length == 0
-                  # No channel is selected
-                  processed |= @spin_handler.process_data()
-                end
+              if @aborted
+                BayLog.info("%s aborted by another thread", self)
+                break
+              end
 
-                selected_map.keys().each do |ch|
-                  if ch == @select_wakeup_pipe[0]
-                    # Waked up by ask_to_*
-                    on_waked_up(ch)
-                  elsif ch == @command_receiver.communication_channel
-                    @command_receiver.on_pipe_readable()
-                  elsif @accept_handler && @accept_handler.server_socket?(ch)
-                    @accept_handler.on_acceptable(ch)
-                  else
-                    @non_blocking_handler.handle_channel(ch, selected_map[ch])
-                  end
-                  processed = true
-                end
+              if selected_map.length == 0
+                # No channel is selected
+                processed |= @spin_handler.process_data()
+              end
 
-                if not processed
-                  # timeout check
-                  @timer_handlers.each do |h|
-                    h.on_timer()
-                  end
+              selected_map.keys().each do |ch|
+                if ch == @select_wakeup_pipe[0]
+                  # Waked up by ask_to_*
+                  on_waked_up(ch)
+                elsif ch == @command_receiver.communication_channel
+                  @command_receiver.on_pipe_readable()
+                elsif @accept_handler && @accept_handler.server_socket?(ch)
+                  @accept_handler.on_acceptable(ch)
+                else
+                  @non_blocking_handler.handle_channel(ch, selected_map[ch])
                 end
+                processed = true
+              end
 
-              rescue => e
-                raise e
+              if not processed
+                # timeout check
+                @timer_handlers.each do |h|
+                  h.on_timer()
+                end
               end
+
             end # while
 
           rescue => e
-            BayLog.error_e(e)
-            raise e
+            BayLog.fatal_e(e)
           ensure
             BayLog.info("%s end", self)
-            abort_agent(nil, 0)
+            shutdown()
           end
         end
 
         def shutdown()
+          BayLog.info("%s shutdown", self)
+
           if @accept_handler != nil
             @accept_handler.shutdown()
           end
-          @aborted = true
-          wakeup()
-        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)
-          end
 
           @command_receiver.end()
+          @non_blocking_handler.close_all()
+
           GrandAgent.listeners.each do |lis|
             lis.remove(self)
           end
 
           GrandAgent.agents.delete(@agent_id)
 
-          @aborted = true
+          @agent_id = -1
+          if BayServer.harbor.multi_core
+            exit(1)
+          end
+        end
+
+        def abort_agent()
+          BayLog.info("%s abort", self)
+
           if BayServer.harbor.multi_core
             exit(1)
-          else
-            clean()
           end
+        end
 
+        def req_shutdown()
+          @aborted = true
+          wakeup()
         end
 
         def reload_cert()
@@ -281,11 +286,6 @@ module Baykit
           val = IOUtil.read_int32(pipe_fd)
         end
 
-        def clean()
-          @non_blocking_handler.close_all()
-          @agent_id = -1
-        end
-
         ######################################################
         # class methods
         ######################################################

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

@@ -25,11 +25,13 @@ module Baykit
         attr :agent_id
         attr :anchorable
         attr :communication_channel
+        attr :child_pid
 
-        def initialize(agt_id, anchorable, com_channel)
+        def initialize(agt_id, anchorable, com_channel, child_pid)
           @agent_id = agt_id
           @anchorable = anchorable
           @communication_channel = com_channel
+          @child_pid = child_pid
         end
 
         def to_s()
@@ -42,7 +44,7 @@ module Baykit
             if res == nil || res == GrandAgent::CMD_CLOSE
               BayLog.debug("%s read Close", self)
               close()
-              GrandAgentMonitor.agent_aborted(@agent_id, @anchorable)
+              agent_aborted()
             else
               BayLog.debug("%s read OK: %d", self, res)
             end
@@ -81,6 +83,33 @@ module Baykit
           @communication_channel.close()
         end
 
+        def agent_aborted()
+          BayLog.info(BayMessage.get(:MSG_GRAND_AGENT_SHUTDOWN, @agent_id))
+
+          if @child_pid != nil
+            begin
+              Process.kill("TERM", @child_pid)
+            rescue => e
+              BayLog.debug_e(e, "Error on killing process")
+            end
+            Process.wait(@child_pid)
+          end
+          GrandAgentMonitor.monitors.delete(@agent_id)
+
+          if not GrandAgentMonitor.finale
+            if GrandAgentMonitor.monitors.length < GrandAgentMonitor.num_agents
+              begin
+                if !BayServer.harbor.multi_core
+                  GrandAgent.add(-1, @anchorable)
+                end
+                GrandAgentMonitor.add(@anchorable)
+              rescue => e
+                BayLog.error_e(e)
+              end
+            end
+          end
+        end
+
         ########################################
         # Class methods
         ########################################
@@ -151,32 +180,16 @@ module Baykit
               agt.run()
             end
 
+            child = nil
+
           end
 
           @monitors[agt_id] =
             GrandAgentMonitor.new(
               agt_id,
               anchoroable,
-              client_socket)
-        end
-
-        def self.agent_aborted(agt_id, anchorable)
-          BayLog.info(BayMessage.get(:MSG_GRAND_AGENT_SHUTDOWN, agt_id))
-
-          @monitors.delete(agt_id)
-
-          if not @finale
-            if @monitors.length < @num_agents
-              begin
-                if !BayServer.harbor.multi_core
-                  GrandAgent.add(-1, anchorable)
-                end
-                add(anchorable)
-              rescue => e
-                BayLog.error_e(e)
-              end
-            end
-          end
+              client_socket,
+              child)
         end
 
         def self.reload_cert_all()

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

@@ -77,6 +77,8 @@ module Baykit
                 end
                 tur.init(tur_key, self)
                 @active_tours.append(tur)
+              else
+                tur.ship.check_ship_id(@ship_id)
               end
             end
             return tur

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

@@ -203,7 +203,7 @@ module Baykit
           end
 
           def return_protocol_handler(agt, proto_hnd)
-            BayLog.debug("%s Return protocol handler: ", proto_hnd)
+            BayLog.debug("%s Return protocol handler", proto_hnd)
             PortBase.get_protocol_handler_store(proto_hnd.protocol, agt).Return(proto_hnd)
           end
 

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

@@ -83,6 +83,10 @@ module Baykit
             end
           end
 
+          def on_timer()
+
+          end
+
           def post(data, adr, tag)
             @lock.synchronize do
               empty = @write_queue.empty?

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

@@ -66,17 +66,17 @@ module Baykit
               tur = pair[1]
               tur.check_tour_id pair[0]
 
-              if !tur.res.header_sent
-                BayLog.error("%s Send ServiceUnavailable: tur=%s", self, tur);
-                tur.res.send_error(Tour::TOUR_ID_NOCHECK, HttpStatus::SERVICE_UNAVAILABLE, "Server closed on reading headers")
-              else
-                # NOT treat EOF as Error
-                BayLog.debug("%s EOF is not an error: tur=%s", self, tur);
-                begin
+              begin
+                if !tur.res.header_sent
+                  BayLog.debug("%s Send ServiceUnavailable: tur=%s", self, tur)
+                  tur.res.send_error(Tour::TOUR_ID_NOCHECK, HttpStatus::SERVICE_UNAVAILABLE, "Server closed on reading headers")
+                else
+                  # NOT treat EOF as Error
+                  BayLog.debug("%s EOF is not an error: tur=%s", self, tur)
                   tur.res.end_content(Tour::TOUR_ID_NOCHECK)
-                rescue IOError => e
-                  BayLog::debug_e(e, "%s end content error: tur=%s", self, tur);
                 end
+              rescue IOError => e
+                BayLog::debug_e(e)
               end
             end
 

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

@@ -8,6 +8,7 @@ module Baykit
         # abstract method
         #
         # depart()
+        # on_timer()
         #
 
         class << self

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

@@ -20,6 +20,7 @@ module Baykit
           end
 
           def remove(agt)
+            BayLog.debug("%s Remove tax runner", agt)
             TaxiRunner.runners[agt.agent_id - 1].terminate()
             TaxiRunner.runners[agt.agent_id - 1] = nil
           end
@@ -63,15 +64,30 @@ module Baykit
 
         def terminate()
           @agent.remove_timer_handler(self)
+          @exe.shutdown
         end
 
         def submit(txi)
-          @lock.synchronize do
-            @running_taxis << txi
-          end
-          @exe.submit(txi)
-          @lock.synchronize do
-            @running_taxis.delete(txi)
+          @exe.submit() do
+            if @agent.aborted
+              BayLog.error("Agent is aborted")
+              return
+            end
+
+            @lock.synchronize do
+              @running_taxis << txi
+            end
+
+            begin
+              txi.run()
+            rescue => e
+              BayLog.fatal_e(e)
+              @agent.req_shutdown
+            ensure
+              @lock.synchronize do
+                @running_taxis.delete(txi)
+              end
+            end
           end
         end
 

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

@@ -24,6 +24,7 @@ module Baykit
         attr :running
         attr :lock
         attr :agent_id
+        attr :start_time
 
         def initialize(agt_id, buf_size)
           super()
@@ -58,28 +59,36 @@ module Baykit
         ######################################################
 
         def depart()
-          @lock.synchronize do
-            begin
-              @buf.clear()
-              @infile.read(@buf_size, @buf)
-
-              if @buf.length == 0
-                @data_listener.notify_eof()
-                close()
-                return
-              end
+          @start_time = Time.now.to_i
+          begin
+            @buf.clear()
+            @infile.read(@buf_size, @buf)
 
-              act = @data_listener.notify_read(@buf, nil)
+            if @buf.length == 0
+              close()
+              return
+            end
 
-              @running = false
-              if act == NextSocketAction::CONTINUE
-                next_run()
-              end
+            act = @data_listener.notify_read(@buf, nil)
 
-            rescue Exception => e
-              BayLog.error_e(e)
-              close()
+            @running = false
+            if act == NextSocketAction::CONTINUE
+              next_run()
             end
+
+          rescue IOError => e
+            BayLog.debug_e(e)
+            close()
+          rescue Exception => e
+            close()
+            raise e
+          end
+        end
+
+        def on_timer()
+          duration_sec = Time.now.to_i - @start_time
+          if (@data_listener.check_timeout(duration_sec))
+            close()
           end
         end
 
@@ -94,9 +103,21 @@ module Baykit
         end
 
         def close()
-          @ch_valid = false
-          @infile.close()
-          @data_listener.notify_close()
+          @lock.synchronize do
+            if !@ch_valid
+              return
+            end
+
+            @ch_valid = false
+            @data_listener.notify_eof()
+
+            begin
+              @infile.close()
+            rescue IOError => e
+            end
+
+            @data_listener.notify_close()
+          end
         end
       end
     end

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

@@ -57,7 +57,11 @@ module Baykit
 
         def notify_eof()
           BayLog.trace("%s EOF(^o^) %s", self, @file_name)
-          @tour.res.end_content(@tour_id)
+          begin
+            @tour.res.end_content(@tour_id)
+          rescue IOError => e
+            BayLog.debug_e(e)
+          end
           return NextSocketAction::CLOSE
         end
 

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

@@ -123,17 +123,9 @@ module Baykit
           else
             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
         end

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

@@ -208,26 +208,27 @@ module Baykit
         end
 
         def abort()
-          if !@tour.preparing?
-            BayLog.debug("%s cannot abort non-preparing tour", @tour)
-            return false
-          end
-
           BayLog.debug("%s abort", @tour)
-          if @tour.aborted?
-            raise Sink.new("tour has already aborted")
-          end
+          if @tour.preparing?
+            @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+            return true
 
-          aborted = true
-          if @tour.running? && @content_handler != nil
-            aborted = @content_handler.on_abort(@tour)
-          end
+          elsif @tour.running?
+            aborted = true
+            if @content_handler != nil
+              aborted = @content_handler.on_abort(@tour)
+            end
 
-          if aborted
-            @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+            if aborted
+              @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+            end
+
+            return aborted
+          else
+            BayLog.debug("%s tour is not preparing or not running", @tour)
+            return false
           end
 
-          return aborted
         end
 
         def set_content_handler(hnd)

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

@@ -47,13 +47,11 @@ 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()
@@ -187,6 +185,7 @@ module Baykit
             raise Sink.new("Response consume listener is null")
           end
 
+          @bytes_posted += len
           BayLog.debug("%s posted res content len=%d posted=%d limit=%d consumed=%d",
           @tour, len, @bytes_posted, @bytes_limit, @bytes_consumed)
           if @bytes_limit > 0 && @bytes_limit < self.bytes_posted
@@ -211,10 +210,6 @@ module Baykit
             end
           end
 
-          @bytes_posted += len
-
-          BayLog.debug("%s post res content: len=%d posted=%d limit=%d consumed=%d",
-                       @tour, len, @bytes_posted, @bytes_limit, @bytes_consumed)
 
           old_available = @available
           if !buffer_available()
@@ -248,17 +243,17 @@ module Baykit
 
 
           # Done listener
+          tour_returned = false
           done_lis = Proc.new() do
             @tour.check_tour_id(chk_tour_id)
             @tour.ship.return_tour(@tour)
-            @tour_returned = true
+            tour_returned = true
           end
 
           begin
             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
@@ -270,8 +265,10 @@ module Baykit
               end
             end
           ensure
-            BayLog.debug("%s Tour is returned: %s", self, @tour_returned)
-            if !@tour_returned
+            # If tour is returned, we cannot change its state because
+            # it will become uninitialized.
+            BayLog.debug("%s tur#%d is returned: %s", self, chk_tour_id, tour_returned)
+            if !tour_returned
               @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ENDED)
             end
           end
@@ -326,8 +323,8 @@ module Baykit
           end
 
           if @header_sent
-            BayLog.warn("Try to send error after response header is sent (Ignore)")
-            BayLog.warn("%s: status=%d, message=%s", self, status, msg)
+            BayLog.debug("Try to send error after response header is sent (Ignore)")
+            BayLog.debug("%s: status=%d, message=%s", self, status, msg)
             if err != nil
               BayLog.error_e(err);
             end
@@ -341,7 +338,7 @@ module Baykit
               begin
                 @tour.ship.send_error(@tour.ship_id, @tour, status, msg, err)
               rescue IOError => e
-                BayLog.debug("%s Error on sending end tour", self)
+                BayLog.debug_e(e, "%s Error on sending error", self)
                 @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
               end
               @header_sent = true

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

@@ -20,17 +20,25 @@ module Baykit
             @name = name
           end
 
+          def to_s
+            @name
+          end
+
           def run
             while true
-              tsk = @que.deq
-              BayLog.debug("%s Start task on: %s", tsk, @name)
-              tsk.run
-              BayLog.debug("%s End task on: %s", tsk, @name)
+              block = @que.deq
+              if block == nil
+                break
+              end
+              BayLog.debug("Start task on: %s", @name)
+              block.call
+              BayLog.debug("End task on: %s", @name)
             end
           end
 
-          def to_s
-            @name
+          def shutdown
+            @que.pop until @que.empty?
+            @que.enq(nil)
           end
         end
 
@@ -40,12 +48,14 @@ module Baykit
         attr :count
         attr :max_queue_len
         attr :name
+        attr :executors
 
         def initialize(name, count)
           @que = Thread::Queue.new
           @count = count
           @max_queue_len = MAX_LEN_PER_EXECUTOR * count
           @name = name
+          @executors = []
 
           count.times do |i|
             started = false
@@ -56,6 +66,7 @@ module Baykit
               Thread.current.name = th_name
               e = Executor.new @que, id, th_name
               e.run
+              @executors << e
             end
             while !started
               sleep(0.01)
@@ -63,17 +74,23 @@ module Baykit
           end
         end
 
-        def to_s()
+        def to_s
           return "ExecutorService[#{@name}]"
         end
 
         # post task
-        def submit(tsk)
-          BayLog.debug("%s Submit: task=%s (qlen=%d/%d)", self, tsk, @que.length, @max_queue_len)
+        def submit(&block)
+          BayLog.debug("%s Submit: (qlen=%d/%d)", self, @que.length, @max_queue_len)
           if @que.length > @max_queue_len
             raise IOError("Task queue is full (>_<)")
           end
-          @que.enq(tsk)
+          @que.enq(block)
+        end
+
+        def shutdown
+          @executors.each do |exe|
+            exe.shutdown
+          end
         end
       end
     end

data/lib/baykit/bayserver/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-core
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Michisuke-P
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 2023-12-23 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