bayserver-core 3.0.3 → 3.3.2

data/lib/baykit/bayserver/agent/multiplexer/spin_multiplexer.rb

@@ -14,14 +14,19 @@ module Baykit
 
           include Baykit::BayServer::Rudders
           include Baykit::BayServer::Util
+          include Baykit::BayServer::Common
 
           class Lapper  # abstract class
 
+            attr :multiplexer
+            attr :state_id
             attr :state
             attr :last_access
 
-            def initialize(state)
+            def initialize(mpx, state)
+              @multiplexer = mpx
               @state = state
+              @state_id = state.id
               access
             end
 
@@ -46,8 +51,8 @@ module Baykit
 
             attr :agent
 
-            def initialize(agt, st)
-              super(st)
+            def initialize(mpx, agt, st)
+              super(mpx, st)
               @agent = agt
               st.rudder.set_non_blocking
             end
@@ -61,10 +66,9 @@ module Baykit
 
                 begin
                   n = @state.rudder.read(@state.read_buf, @state.buf_size)
-                  #infile.sysread(@state.buf_size, @state.read_buf)
-                rescue EOFError => e
-                  @state.read_buf.clear
-                  eof = true
+                  if n == 0
+                    eof = true
+                  end
                 rescue Errno::EAGAIN => e
                   BayLog.debug("%s %s", @agent, e)
                   return true
@@ -78,11 +82,11 @@ module Baykit
                   end
                 end
 
-                @agent.send_read_letter(@state, @state.read_buf.length, nil, false)
+                @agent.send_read_letter(@state_id, @state.rudder, @multiplexer, @state.read_buf.length, nil, false)
                 return false
 
               rescue Exception => e
-                @agent.send_error_letter(@state, e, false)
+                @agent.send_error_letter(@state_id, @state.rudder, @multiplexer, e, false)
                 return false
               end
             end
@@ -140,7 +144,7 @@ module Baykit
             end
           end
 
-          def req_write(rd, buf, len, adr, tag, &lis)
+          def req_write(rd, buf, adr, tag, &lis)
             st = get_rudder_state(rd)
             if st == nil
               BayLog.warn("Invalid rudder")
@@ -173,8 +177,9 @@ module Baykit
 
           def req_close(rd)
             st = get_rudder_state(rd)
-            close_rudder(st)
-            @agent.send_closed_letter(st, false)
+            st.closing = true
+            close_rudder(rd)
+            @agent.send_closed_letter(st.id, st.rudder, self, false)
           end
 
 
@@ -206,7 +211,7 @@ module Baykit
           end
 
           def next_read(st)
-            lpr = ReadIOLapper.new(@agent, st)
+            lpr = ReadIOLapper.new(self, @agent, st)
             lpr.next
 
             add_to_running_list(lpr)
@@ -266,7 +271,7 @@ module Baykit
               spun = lpr.lap
               st.access
 
-              all_spun = all_spun & spun
+              all_spun = all_spun && spun
             end
 
             if all_spun
@@ -287,11 +292,11 @@ module Baykit
           #########################################
           private
 
-          def remove_from_running_list(st)
-            BayLog.debug("remove: %s", st.rudder)
+          def remove_from_running_list(rd)
+            BayLog.debug("remove: %s", rd)
             @running_list_lock.synchronize do
               @running_list.delete_if do |lpr |
-                lpr.state == st
+                lpr.state.rudder == rd
               end
             end
           end

data/lib/baykit/bayserver/agent/multiplexer/taxi_multiplexer.rb

@@ -21,9 +21,9 @@ module Baykit
             end
             def depart
               if @for_read
-                @rudder_state.multiplexer.do_next_read(@rudder_state)
+                @rudder_state.multiplexer.do_next_read(@rudder_state.rudder)
               else
-                @rudder_state.multiplexer.do_next_write(@rudder_state)
+                @rudder_state.multiplexer.do_next_write(@rudder_state.rudder)
               end
             end
 
@@ -40,6 +40,7 @@ module Baykit
           include Baykit::BayServer::Rudders
           include Baykit::BayServer::Util
           include Baykit::BayServer::Taxi
+          include Baykit::BayServer::Common
 
           def initialize(agt)
             super
@@ -87,7 +88,7 @@ module Baykit
             st = get_rudder_state(rd)
             BayLog.debug("%s reqWrite st=%s", @agent, st)
 
-            if st == nil || st.closed
+            if st == nil
               BayLog.warn("%s Channel is closed: %s", @agent, rd)
               lis.call
               return
@@ -114,10 +115,10 @@ module Baykit
           end
 
           def req_close(rd)
+            BayLog.debug("%s reqClose rd=%s", @agent, rd);
+            close_rudder(rd)
             st = get_rudder_state(rd)
-            BayLog.debug("%s reqClose st=%s", @agent, st);
-            close_rudder(st)
-            @agent.send_closed_letter(st, false)
+            @agent.send_closed_letter(st.id, rd, self, true)
             st.access
           end
 
@@ -155,22 +156,25 @@ module Baykit
             TaxiRunner.post(@agent.agent_id, TaxiForMpx.new(st, for_read))
           end
 
-          def do_next_read(st)
-            st.access
+          def do_next_read(rd)
+            st = get_rudder_state(rd)
+
             begin
               len = st.rudder.read(st.read_buf, st.buf_size)
               if len <= 0
                 len = 0
               end
-              @agent.send_read_letter(st, len, nil, true)
+              @agent.send_read_letter(st.id, rd, self, len, nil, true)
 
             rescue Exception => e
-              @agent.send_error_letter(st, e, true)
+              @agent.send_error_letter(st.id, rd, self, e, true)
             end
           end
 
-          def do_next_write(st)
+          def do_next_write(rd)
+            st = get_rudder_state(rd)
             st.access
+
             begin
               if st.write_queue.empty?
                 raise Sink("%s write queue is empty", self)
@@ -183,10 +187,10 @@ module Baykit
                 len = st.rudder.write(u.buf)
                 u.buf.slice!(0, len)
               end
-              @agent.send_wrote_letter(st, len, true)
+              @agent.send_wrote_letter(st.id, rd, self, len, true)
 
             rescue Exception => e
-              @agent.send_error_letter(st, e, true)
+              @agent.send_error_letter(st.id, rd, self, e, true)
             end
           end
         end

data/lib/baykit/bayserver/bay_log.rb

@@ -81,6 +81,10 @@ module Baykit
       end
 
       def self.log(lvl, stack_idx, err, fmt, args)
+        if lvl < @log_level
+          return
+        end
+
         #pos = caller[1].split("/")[-1]
         apos = parse_caller(caller[1])
         if(!@full_path)
@@ -90,22 +94,20 @@ module Baykit
         #pos = caller[1]
 
         if fmt != nil
-          if lvl >= @log_level
-            begin
-              if args == nil || args.length == 0
-                msg = sprintf("%s", fmt)
-              else
-                msg = sprintf(fmt, *args)
-              end
-            rescue => e
-              puts(e.class)
-              puts(e.message + " " + pos)
-              print_exception(e)
-              msg = fmt
+          begin
+            if args == nil || args.length == 0
+              msg = sprintf("%s", fmt)
+            else
+              msg = sprintf(fmt, *args)
             end
-
-            print("[#{Time.now}] #{LOG_LEVEL_NAME[lvl]}. #{msg} (at #{pos})\n")
+          rescue => e
+            puts(e.class)
+            puts(e.message + " " + pos)
+            print_exception(e)
+            msg = fmt
           end
+
+          print("[#{Time.now}] #{LOG_LEVEL_NAME[lvl]}. #{msg} (at #{pos})\n")
         end
 
         if err != nil
@@ -129,8 +131,10 @@ module Baykit
       end
 
       def self.print_exception err
-        for s in err.backtrace
-          puts "\t" + s
+        if err.backtrace != nil
+          for s in err.backtrace
+            puts "\t" + s
+          end
         end
         if err.cause
           puts "Caused by:"

data/lib/baykit/bayserver/bayserver.rb

@@ -28,6 +28,7 @@ require 'baykit/bayserver/protocol/protocol_handler_store'
 
 require 'baykit/bayserver/docker/package'
 require 'baykit/bayserver/common/inbound_ship_store'
+require 'baykit/bayserver/common/rudder_state_store'
 require 'baykit/bayserver/common/warp_ship_store'
 
 require 'baykit/bayserver/util/locale'
@@ -52,7 +53,6 @@ module Baykit
       include Baykit::BayServer::Agent::Signal
       include Baykit::BayServer::Agent::Monitor
       include Baykit::BayServer::Protocol
-      include Baykit::BayServer::WaterCraft
       include Baykit::BayServer::Tours
       include Baykit::BayServer::Docker
       include Baykit::BayServer::Docker::Base
@@ -249,6 +249,7 @@ module Baykit
 
           # Init stores, memory usage managers
           PacketStore.init()
+          RudderStateStore.init()
           InboundShipStore.init()
           ProtocolHandlerStore.init()
           TourStore.init(TourStore::MAX_TOURS)
@@ -281,7 +282,7 @@ module Baykit
         end
       end
 
-      def self.open_ports(anchored_port_map, unanchored_port_map)
+      def self.open_ports()
         @ports.each do |dkr|
           # open port
           adr = dkr.address()
@@ -312,8 +313,6 @@ module Baykit
 
             skt.listen(0)
 
-            #skt = port_dkr.new_server_socket skt
-            anchored_port_map[skt] = dkr
           else
             # Open UDP port
             BayLog.info(BayMessage.get(:MSG_OPENING_UDP_PORT, dkr.host, dkr.port, dkr.protocol()))
@@ -328,23 +327,20 @@ module Baykit
               BayLog.error_e(e, BayMessage.get(:INT_CANNOT_OPEN_PORT, dkr.host, dkr.port, e))
               raise e
             end
-            unanchored_port_map[skt] = dkr
+            @unanchorable_port_map[IORudder.new(skt)] = dkr
 
           end
         end
       end
 
       def self.parent_start()
-        anchored_port_map = {}
-        unanchored_port_map = {}
-
 
         if @harbor.multi_core
           if !SysUtil.run_on_windows()
-            open_ports(anchored_port_map, unanchored_port_map)
+            open_ports()
           end
         else
-          open_ports(anchored_port_map, unanchored_port_map)
+          open_ports()
 
           # Thread mode
           GrandAgent.init(
@@ -355,7 +351,7 @@ module Baykit
         end
 
         SignalAgent.init(@harbor.control_port)
-        GrandAgentMonitor.init(@harbor.grand_agents, anchored_port_map)
+        GrandAgentMonitor.init(@harbor.grand_agents)
         create_pid_file(Process.pid)
         GrandAgentMonitor.join
       end
@@ -364,11 +360,8 @@ module Baykit
 
         invoke_runners()
 
-        @anchorable_port_map = {}
-        unanchored_port_map = {}
-
         if(SysUtil.run_on_windows())
-         open_ports(@anchorable_port_map, unanchored_port_map)
+         open_ports()
         else
           @derived_port_nos.each do |no|
             # Rebuild server socket

data/lib/baykit/bayserver/common/cities.rb

@@ -1,6 +1,6 @@
 module Baykit
   module BayServer
-    module Util
+    module Common
       class Cities
 
         attr :any_city

data/lib/baykit/bayserver/common/inbound_ship.rb

@@ -208,22 +208,8 @@ module Baykit
               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
-                if keep_alive
-                  if tur.res.headers.content_length() < 0
-                    keep_alive = false
-                  end
-                end
-              end
 
-              tour_handler.send_end_tour(tur, keep_alive, &callback)
+              tour_handler.send_end_tour(tur, &callback)
             end
           end
 

data/lib/baykit/bayserver/common/inbound_ship_store.rb

@@ -11,7 +11,6 @@ module Baykit
   module BayServer
     module Common
         class InboundShipStore < Baykit::BayServer::Util::ObjectStore
-          include Baykit::BayServer::WaterCraft
           include Baykit::BayServer::Util
           include Baykit::BayServer::Agent
 

data/lib/baykit/bayserver/{agent/multiplexer → common}/rudder_state.rb

@@ -1,15 +1,26 @@
+require 'baykit/bayserver/util/reusable'
+require 'baykit/bayserver/util/counter'
 
 module Baykit
   module BayServer
-    module Agent
-      module Multiplexer
+    module Common
         class RudderState
+          include Baykit::BayServer::Util::Reusable  # implements
+
+          include Baykit::BayServer::Util
+          class << self
+            attr :id_counter
+          end
+          @id_counter = Counter.new
+
+          attr :id
+
           attr :rudder
           attr :transporter
           attr_accessor :multiplexer
 
           attr :last_access_time
-
+          attr_accessor :closing
           attr :read_buf
           attr :buf_size
           attr :write_queue
@@ -21,17 +32,19 @@ module Baykit
           attr :write_queue_lock
           attr :reading_lock
           attr :writing_lock
-          attr_accessor :closed
           attr_accessor :finale
 
           attr_accessor :accepting
           attr_accessor :connecting
 
+          def initialize
+
+          end
 
-          def initialize(rd, tp = nil, timeout_sec = 0)
+          def init(rd, tp = nil, timeout_sec = 0)
+            @id = RudderState.id_counter.next
             @rudder = rd
             @transporter = tp
-            @closed = false
             @timeout_sec = timeout_sec
 
             if tp != nil
@@ -60,6 +73,30 @@ module Baykit
             return str
           end
 
+          #########################################
+          # Implements Reusable
+          #########################################
+          def reset()
+            @id = 0
+            @rudder = nil
+            @transporter = nil
+            @multiplexer = nil
+
+            @last_access_time = 0
+            @closing = false
+            @read_buf.clear
+            @write_queue = []
+            @bytes_read = 0
+            @bytes_wrote = 0
+            @finale = false
+            @reading = false
+            @writing = false
+            @timeout_sec = 0
+          end
+
+          #########################################
+          # Custom methods
+          #########################################
 
           def access
             @last_access_time = Time.now.tv_sec
@@ -69,7 +106,6 @@ module Baykit
             @finale = true
           end
 
-        end
       end
     end
   end

data/lib/baykit/bayserver/common/rudder_state_store.rb

@@ -0,0 +1,63 @@
+require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/lifecycle_listener'
+
+require 'baykit/bayserver/common/rudder_state'
+
+require 'baykit/bayserver/util/object_store'
+require 'baykit/bayserver/util/string_util'
+
+module Baykit
+  module BayServer
+    module Common
+      class RudderStateStore  < Baykit::BayServer::Util::ObjectStore
+        include Baykit::BayServer::Util
+        include Baykit::BayServer::Agent
+        class AgentListener
+          include Baykit::BayServer::Agent::LifecycleListener # implements
+
+          def add(agt_id)
+            RudderStateStore.stores[agt_id] = RudderStateStore.new();
+          end
+
+          def remove(agt_id)
+            RudderStateStore.stores.delete(agt_id);
+          end
+        end
+
+        class << self
+          #  Agent id => InboundShipStore
+          attr :stores
+        end
+        @stores = {}
+
+
+        def initialize
+          super
+          @factory = -> { RudderState.new() }
+        end
+
+        #
+        #  print memory usage
+        #
+        def print_usage(indent)
+          BayLog.info("%sRudderStateStore Usage:", StringUtil.indent(indent))
+          super(indent+1)
+        end
+
+
+        ######################################################
+        # class methods
+        ######################################################
+        def self.init()
+          GrandAgent.add_lifecycle_listener(AgentListener.new())
+        end
+
+        def self.get_store(agent_id)
+          return @stores[agent_id]
+        end
+
+      end
+    end
+  end
+end
+

data/lib/baykit/bayserver/{agent/multiplexer → common}/transporter.rb

@@ -2,8 +2,7 @@ require 'baykit/bayserver/util/reusable'
 
 module Baykit
   module BayServer
-    module Agent
-      module Multiplexer
+    module Common
         module Transporter # interface
           include Baykit::BayServer::Util::Reusable # implements
 
@@ -55,7 +54,6 @@ module Baykit
             raise NotImplementedError.new
           end
         end
-      end
     end
   end
 end

data/lib/baykit/bayserver/common/warp_ship.rb

@@ -172,10 +172,10 @@ module Baykit
 
           def end_warp_tour(tur, keep)
             wdat = WarpData.get(tur)
-            BayLog.debug("%s end warp tour: started=%s ended=%s", tur, wdat.started, wdat.ended)
+            BayLog.debug("%s end warp tour: wtur#%d started=%s ended=%s", tur, wdat.warp_id, wdat.started, wdat.ended)
 
             if(!@tour_map.include?(wdat.warp_id))
-              raise Sink.new("%s WarpId not in tourMap: %d", tur, wdat.warp_id);
+              raise Sink.new("%s WarpId not in tourMap: wture#%d", tur, wdat.warp_id);
             else
               @tour_map.delete wdat.warp_id
             end
@@ -214,8 +214,9 @@ module Baykit
           def notify_error_to_owner_tour(status, msg)
             @lock.synchronize do
               @tour_map.keys.each do |warp_id|
+                BayLog.debug("%s wtur#%d notify error to owner", self, warp_id)
                 tur = get_tour(warp_id)
-                BayLog.debug("%s send error to owner: %s running=%s", self, tur, tur.running?)
+                BayLog.debug("%s wtur#%d send error to owner: %s running=%s", self, warp_id, tur, tur.running?)
                 if tur.running? || tur.reading?
                   begin
                     tur.res.send_error(Tour::TOUR_ID_NOCHECK, status, msg)

data/lib/baykit/bayserver/{agent/multiplexer → common}/write_unit.rb

@@ -2,8 +2,7 @@ require 'baykit/bayserver/util/reusable'
 
 module Baykit
   module BayServer
-    module Agent
-      module Multiplexer
+    module Common
         class WriteUnit
 
           attr :buf
@@ -24,7 +23,6 @@ module Baykit
             end
           end
         end
-      end
     end
   end
 end

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

@@ -1,5 +1,4 @@
 require 'baykit/bayserver/agent/next_socket_action'
-require 'baykit/bayserver/agent/transporter/data_listener'
 require 'baykit/bayserver/ships/ship'
 require 'baykit/bayserver/tours/package'
 

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

@@ -1,6 +1,5 @@
 require 'baykit/bayserver/protocol/protocol_handler_store'
 require 'baykit/bayserver/bcf/package'
-require 'baykit/bayserver/agent/multiplexer/plain_transporter'
 require 'baykit/bayserver/rudders/io_rudder'
 require 'baykit/bayserver/util/object_store'
 require 'baykit/bayserver/util/object_factory'
@@ -8,6 +7,7 @@ require 'baykit/bayserver/util/object_factory'
 require 'baykit/bayserver/docker/port'
 require 'baykit/bayserver/docker/base/docker_base'
 require 'baykit/bayserver/common/inbound_ship_store'
+require 'baykit/bayserver/agent/multiplexer/plain_transporter'
 
 module Baykit
   module BayServer
@@ -21,7 +21,6 @@ module Baykit
           include Baykit::BayServer::Agent::Multiplexer
           include Baykit::BayServer::Docker
           include Baykit::BayServer::Docker::Base
-          include Baykit::BayServer::WaterCraft
           include Baykit::BayServer::Protocol
           include Baykit::BayServer::Rudders
           include Baykit::BayServer::Util
@@ -152,8 +151,8 @@ module Baykit
                 raise ConfigException.new(kv.file_name, kv.line_no, BayMessage.get(:CFG_INVALID_PARAMETER_VALUE, kv.value))
               end
 
-              name = kv.value[0 .. idx].strip()
-              value = kv.value[idx+1 .. -1].strip()
+              name  = kv.value[0, idx].strip
+              value = kv.value[idx+1, kv.value.length].strip
               @additional_headers << [name, value]
 
             else
@@ -218,7 +217,8 @@ module Baykit
             proto_hnd = PortBase.get_protocol_handler_store(protocol(), agt_id).rent()
             sip.init_inbound(rd, agt_id, tp, self, proto_hnd)
 
-            st = RudderState.new(rd, tp)
+            st = RudderStateStore.get_store(agt_id).rent()
+            st.init(rd, tp)
             agt.net_multiplexer.add_rudder_state(rd, st)
             agt.net_multiplexer.req_read(rd)
           end