bayserver-core 2.3.2 → 3.0.1

data/lib/baykit/bayserver/bayserver.rb

@@ -8,10 +8,13 @@ require 'baykit/bayserver/version'
 require 'baykit/bayserver/mem_usage'
 require 'baykit/bayserver/sink'
 
+require 'baykit/bayserver/rudders/io_rudder'
+
 require 'baykit/bayserver/agent/signal/signal_agent'
 require 'baykit/bayserver/agent/signal/signal_sender'
 require 'baykit/bayserver/agent/signal/signal_sender'
 require 'baykit/bayserver/agent/grand_agent'
+require 'baykit/bayserver/agent/monitor/grand_agent_monitor'
 
 require 'baykit/bayserver/bcf/package'
 
@@ -24,8 +27,8 @@ require 'baykit/bayserver/taxi/taxi_runner'
 require 'baykit/bayserver/protocol/protocol_handler_store'
 
 require 'baykit/bayserver/docker/package'
-require 'baykit/bayserver/docker/base/inbound_ship_store'
-require 'baykit/bayserver/docker/warp/warp_ship_store'
+require 'baykit/bayserver/common/inbound_ship_store'
+require 'baykit/bayserver/common/warp_ship_store'
 
 require 'baykit/bayserver/util/locale'
 require 'baykit/bayserver/util/md5_password'
@@ -33,9 +36,10 @@ require 'baykit/bayserver/util/string_util'
 require 'baykit/bayserver/util/mimes'
 require 'baykit/bayserver/util/reusable'
 require 'baykit/bayserver/util/http_status'
-require 'baykit/bayserver/util/cities'
 require 'baykit/bayserver/util/selector'
 
+require 'baykit/bayserver/common/cities'
+
 module Baykit
   module BayServer
 
@@ -46,12 +50,14 @@ module Baykit
       include Baykit::BayServer::Train
       include Baykit::BayServer::Taxi
       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
-      include Baykit::BayServer::Docker::Warp
+      include Baykit::BayServer::Common
+      include Baykit::BayServer::Rudders
 
       ENV_BSERV_HOME = "BSERV_HOME"
       ENV_BSERV_LIB  = "BSERV_LIB"
@@ -68,12 +74,12 @@ module Baykit
         attr :my_host_name
         attr :my_host_addr
         attr :dockers
+        attr :software_name
+        attr :cities
         attr :ports
         attr :harbor
-        attr :bay_agent
-        attr :cities
-        attr :ractor_local_map
-        attr :software_name
+        attr :anchorable_port_map
+        attr :unanchorable_port_map
         attr :rack_app
         attr :derived_port_nos
         attr :monitor_port
@@ -88,8 +94,8 @@ module Baykit
       @harbor = nil
       @any_city = nil
       @cities = Cities.new()
-      @ractor_local_map = {}
-      @rack_app = nil
+      @anchorable_port_map = {}
+      @unanchorable_port_map = {}
 
       def self.get_version
         return Version::VERSION
@@ -212,7 +218,7 @@ module Baykit
       #
       def self.start(agt_id)
         begin
-          BayMessage.init(@bserv_lib + "/conf/messages", Locale.new('ja', 'JP'))
+          BayMessage.init(@bserv_lib + "/conf/messages", Locale.default())
 
           @dockers = BayDockers.new
           @dockers.init(@bserv_lib + "/conf/dockers.bcf")
@@ -267,6 +273,8 @@ module Baykit
             child_start(agt_id)
           end
 
+          return
+
           while not GrandAgentMonitor.monitors.empty?
             sel = Selector.new()
             pip_to_mon_map = {}
@@ -326,6 +334,8 @@ module Baykit
               raise e
             end
 
+            @anchorable_port_map[IORudder.new(skt)] = dkr
+
             skt.listen(0)
 
             #skt = port_dkr.new_server_socket skt
@@ -365,10 +375,7 @@ module Baykit
           # Thread mode
           GrandAgent.init(
             (1..@harbor.grand_agents).to_a,
-            anchored_port_map,
-            unanchored_port_map,
-            @harbor.max_ships,
-            @harbor.multi_core)
+            @harbor.max_ships)
 
           invoke_runners()
         end
@@ -376,17 +383,18 @@ module Baykit
         SignalAgent.init(@harbor.control_port)
         GrandAgentMonitor.init(@harbor.grand_agents, anchored_port_map)
         create_pid_file(Process.pid)
+        GrandAgentMonitor.join
       end
 
       def self.child_start(agt_id)
 
         invoke_runners()
 
-        anchored_port_map = {}
+        @anchorable_port_map = {}
         unanchored_port_map = {}
 
         if(SysUtil.run_on_windows())
-         open_ports(anchored_port_map, unanchored_port_map)
+         open_ports(@anchorable_port_map, unanchored_port_map)
         else
           @derived_port_nos.each do |no|
             # Rebuild server socket
@@ -402,27 +410,23 @@ module Baykit
             end
 
             if portDkr == nil
-              BayLog.fatal("Cannot find port docker: %d", port)
+              BayLog.fatal("Cannot find port docker: %d", portDkr.port)
               exit(1)
             end
 
-            anchored_port_map[skt] = portDkr
+            BayLog.debug("agt#%d server port=%d socket=%s(%d)", agt_id, portDkr.port, skt, no)
+            @anchorable_port_map[IORudder.new(skt)] = portDkr
           end
         end
 
-        skt= TCPSocket.new("localhost", @monitor_port)
 
-        GrandAgent.init(
-          [agt_id],
-          anchored_port_map,
-          nil,
-          @harbor.max_ships,
-          @harbor.multi_core
-        )
+        GrandAgent.init([agt_id], @harbor.max_ships)
         agt = GrandAgent.get(agt_id)
 
-        agt.run_command_receiver(skt)
+        skt= TCPSocket.new("localhost", @monitor_port)
+        rd = IORudder.new(skt)
 
+        agt.add_command_receiver(rd)
         agt.run()
       end
 

data/lib/baykit/bayserver/{util → common}/groups.rb

@@ -3,7 +3,7 @@ require 'baykit/bayserver/bcf/package'
 
 module Baykit
   module BayServer
-    module Util
+    module Common
       class Groups
         include Baykit::BayServer::Bcf
 

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

@@ -0,0 +1,12 @@
+require 'baykit/bayserver/tours/tour_handler'
+
+module Baykit
+  module BayServer
+    module Common
+        module InboundHandler  # interface
+          include Baykit::BayServer::Tours::TourHandler # extends
+        end
+    end
+  end
+end
+

data/lib/baykit/bayserver/{docker/base → common}/inbound_ship.rb

@@ -1,17 +1,21 @@
+require 'baykit/bayserver/sink'
+
 require 'baykit/bayserver/agent/next_socket_action'
-require 'baykit/bayserver/watercraft/ship'
+require 'baykit/bayserver/rudders/io_rudder'
+require 'baykit/bayserver/ships/ship'
 require 'baykit/bayserver/tours/package'
 
 module Baykit
   module BayServer
-    module Docker
-      module Base
-        class InboundShip < Baykit::BayServer::WaterCraft::Ship
+    module Common
+        class InboundShip < Baykit::BayServer::Ships::Ship
 
+          include Baykit::BayServer
           include Baykit::BayServer::Agent
           include Baykit::BayServer::Tours
-          include Baykit::BayServer::WaterCraft
           include Baykit::BayServer::Util
+          include Baykit::BayServer::Rudders
+          include Baykit::BayServer::Ships
 
           # class variables
           class << self
@@ -23,27 +27,29 @@ module Baykit
 
           attr :port_docker
 
-          attr :tour_store
+          attr :protocol_handler
           attr_accessor :need_end
           attr :socket_timeout_sec
-          attr :lock
+          attr :tour_store
           attr :active_tours
+          attr :lock
 
           def initialize()
             super
-            @lock = Monitor.new()
+            @lock = ::Monitor.new
             @active_tours = []
           end
 
           def to_s
-            return "#{@agent} ship##{@ship_id}/#{@object_id}[#{protocol()}]"
+            proto = @protocol_handler != nil ? "[" + @protocol_handler.protocol + "]" : ""
+            return "agt##{@agent_id} ship##{@ship_id}/#{@object_id}#{proto}"
           end
 
-          def init_inbound(skt, agt, postman, port, proto_hnd)
-            self.init(skt, agt, postman)
-            @port_docker = port
+          def init_inbound(rd, agt_id, tp, port_dkr, proto_hnd)
+            self.init(agt_id, rd, tp)
+            @port_docker = port_dkr
             @socket_timeout_sec = @port_docker.timeout_sec >= 0 ? @port_docker.timeout_sec : BayServer.harbor.socket_timeout_sec
-            @tour_store = TourStore.get_store(agt.agent_id)
+            @tour_store = TourStore.get_store(agt_id)
             set_protocol_handler(proto_hnd)
           end
 
@@ -61,10 +67,74 @@ module Baykit
             @need_end = false
           end
 
+          ######################################################
+          # Implements Ship
+          ######################################################
+
+          def notify_handshake_done(proto)
+            return NextSocketAction::CONTINUE
+          end
+
+          def notify_connect
+            raise Sink.new
+          end
+
+          def notify_read(buf)
+            return @protocol_handler.bytes_received(buf)
+          end
+
+          def notify_eof
+            BayLog.debug("%s EOF detected", self)
+            return NextSocketAction::CLOSE
+          end
+
+          def notify_error(e)
+            BayLog.debug_e(e, "%s Error notified", self)
+          end
+
+          def notify_protocol_error(e)
+            BayLog.debug_e(e)
+            return tour_handler.on_protocol_error(e)
+          end
+
+          def notify_close
+            BayLog.debug("%s notifyClose", self)
+
+            abort_tours
+
+            if @active_tours.length > 0
+              # cannot close because there are some running tours
+              BayLog.debug("%s cannot end ship because there are some running tours (ignore)", self)
+              @need_end = true
+            else
+              end_ship
+            end
+          end
+
+          def check_timeout(duration_sec)
+            if @socket_timeout_sec <= 0
+              timeout = false
+            elsif @keeping
+              timeout = duration_sec >= BayServer.harbor.keep_timeout_sec
+            else
+              timeout = duration_sec >= @socket_timeout_sec
+            end
+
+            BayLog.debug("%s Check timeout: dur=%d, timeout=%s, keeping=%s limit=%d keeplim=%d",
+                         self, duration_sec, timeout, @keeping, @socket_timeout_sec, BayServer.harbor.keep_timeout_sec)
+            return timeout;
+          end
+
           ######################################################
           # Other methods
           ######################################################
 
+          def set_protocol_handler(proto_handler)
+            @protocol_handler = proto_handler
+            proto_handler.init(self)
+            BayLog.debug("%s protocol handler is set", self)
+          end
+
           def get_tour(tur_key, force=false, rent=true)
             tur = nil
             store_key = InboundShip.uniq_key(@ship_id, tur_key)
@@ -98,6 +168,7 @@ module Baykit
 
             if tur.zombie? || tur.aborted?
               # Don't send peer any data
+              BayLog.debug("%s zombie tur", tur)
               return
             end
 
@@ -137,7 +208,8 @@ module Baykit
               @port_docker.additional_headers.each do |nv|
                 tur.res.headers.add(nv[0], nv[1])
               end
-              @protocol_handler.send_res_headers(tur)
+              BayLog.debug("%s send_res_headers", tur)
+              tour_handler.send_res_headers(tur)
             end
           end
 
@@ -156,15 +228,15 @@ module Baykit
           def send_res_content(check_id, tur, bytes, ofs, len, &callback)
 
             BayLog.debug("%s send_res_content bytes: %d", self, len)
-
             check_ship_id(check_id)
 
             max_len = @protocol_handler.max_res_packet_data_size();
+            BayLog.debug("%s max_len=%d", self, max_len)
             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
-              @protocol_handler.send_res_content(tur, bytes, ofs, len, &callback)
+              tour_handler.send_res_content(tur, bytes, ofs, len, &callback)
             end
           end
 
@@ -191,7 +263,7 @@ module Baykit
                 end
               end
 
-              @protocol_handler.send_end_tour(tur, keep_alive, &callback)
+              tour_handler.send_end_tour(tur, keep_alive, &callback)
             end
           end
 
@@ -236,7 +308,7 @@ module Baykit
 
           def end_ship()
             BayLog.debug("%s endShip", self)
-            @port_docker.return_protocol_handler(@agent, @protocol_handler)
+            @port_docker.return_protocol_handler(@agent_id, @protocol_handler)
             @port_docker.return_ship(self)
           end
 
@@ -259,6 +331,10 @@ module Baykit
             end
           end
 
+          def tour_handler
+            return @protocol_handler.command_handler
+          end
+
           protected
           def send_error_content(chk_id, tour, content)
 
@@ -306,7 +382,6 @@ module Baykit
             end
           end
         end
-      end
     end
   end
 end

data/lib/baykit/bayserver/{docker/base → common}/inbound_ship_store.rb

@@ -1,16 +1,15 @@
 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'
+require 'baykit/bayserver/common/inbound_ship'
+require 'baykit/bayserver/common/inbound_ship_store'
 
 require 'baykit/bayserver/util/object_store'
 require 'baykit/bayserver/util/string_util'
 
 module Baykit
   module BayServer
-    module Docker
-      module Base
+    module Common
         class InboundShipStore < Baykit::BayServer::Util::ObjectStore
           include Baykit::BayServer::WaterCraft
           include Baykit::BayServer::Util
@@ -19,12 +18,12 @@ module Baykit
           class AgentListener
             include Baykit::BayServer::Agent::LifecycleListener # implements
 
-            def add(agt)
-              InboundShipStore.stores[agt.agent_id] = InboundShipStore.new();
+            def add(agt_id)
+              InboundShipStore.stores[agt_id] = InboundShipStore.new();
             end
 
-            def remove(agt)
-              InboundShipStore.stores.delete(agt.agent_id);
+            def remove(agt_id)
+              InboundShipStore.stores.delete(agt_id);
             end
           end
 
@@ -60,7 +59,6 @@ module Baykit
           end
 
         end
-      end
     end
   end
 end

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

@@ -0,0 +1,98 @@
+
+
+module Baykit
+  module BayServer
+    module Common
+      module Multiplexer # interface
+
+        def add_rudder_state(rd, st)
+          raise NotImplementedError.new
+        end
+
+        def get_rudder_state(rd)
+          raise NotImplementedError.new
+        end
+
+        def get_transporter(rd)
+          raise NotImplementedError.new
+        end
+
+        def req_accept(rd)
+          raise NotImplementedError.new
+        end
+
+        def req_connect(rd, adr)
+          raise NotImplementedError.new
+        end
+
+        def req_read(rd)
+          raise NotImplementedError.new
+        end
+
+        def req_write(rd, buf, adr, tag, lis)
+          raise NotImplementedError.new
+        end
+
+        def req_end(rd)
+          raise NotImplementedError.new
+        end
+
+        def req_close(rd)
+
+        end
+
+        def cancel_read(st)
+          raise NotImplementedError.new
+        end
+
+        def cancel_write(st)
+          raise NotImplementedError.new
+        end
+
+        def next_accept(st)
+          raise NotImplementedError.new
+        end
+
+        def next_read(st)
+          raise NotImplementedError.new
+        end
+
+        def next_write(st)
+          raise NotImplementedError.new
+        end
+
+        def shutdown()
+          raise NotImplementedError.new
+        end
+
+        def is_non_blocking()
+          raise NotImplementedError.new
+        end
+
+        def use_async_api()
+          raise NotImplementedError.new
+        end
+
+        def consume_oldest_unit(st)
+          raise NotImplementedError.new
+        end
+
+        def close_rudder(st)
+          raise NotImplementedError.new
+        end
+
+        def is_busy
+          raise NotImplementedError.new
+        end
+
+        def on_busy
+          raise NotImplementedError.new
+        end
+
+        def on_free
+          raise NotImplementedError.new
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+
+
+module Baykit
+  module BayServer
+    module Common
+      module Postpone # interface
+
+        def run
+          raise NotImplementedError.new
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+require 'baykit/bayserver/ships/ship'
+require 'baykit/bayserver/sink'
+
+
+module Baykit
+  module BayServer
+    module Common
+
+      class ReadOnlyShip < Baykit::BayServer::Ships::Ship
+
+        include Baykit::BayServer
+
+        #########################################
+        # Implements Reusable
+        #########################################
+        def reset
+          super
+        end
+
+
+        #########################################
+        # Implements Ship
+        #########################################
+
+        def notify_handshake_done(proto)
+          raise Sink.new
+        end
+
+        def notify_connect
+          raise Sink.new
+        end
+
+        def notify_protocol_error(e)
+          raise Sink.new
+        end
+
+
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,24 @@
+
+
+module Baykit
+  module BayServer
+    module Common
+      module Recipient # interface
+
+        #
+        # Receive letters
+        #
+        def receive(wait)
+          raise NotImplementedError.new
+        end
+
+        #
+        # Wake up the recipient
+        #
+        def wakeup()
+          raise NotImplementedError.new
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+
+
+module Baykit
+  module BayServer
+    module Common
+      class Vehicle # abstract class
+
+        attr :id
+
+        def initialize(id)
+          @id = id
+        end
+        def run()
+          raise NotImplementedError.new
+        end
+
+        def on_timer()
+          raise NotImplementedError.new
+        end
+
+      end
+    end
+  end
+end