bayserver-core 2.3.2 → 3.0.1

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

@@ -1,15 +1,11 @@
+require 'baykit/bayserver/common/vehicle'
 require 'baykit/bayserver/util/counter'
+
 module Baykit
   module BayServer
     module Taxi
-      class Taxi
+      class Taxi < Baykit::BayServer::Common::Vehicle
         include Baykit::BayServer::Util
-        #
-        # abstract method
-        #
-        # depart()
-        # on_timer()
-        #
 
         class << self
           attr :taxi_id_counter
@@ -27,11 +23,20 @@ module Baykit
         end
 
         def run()
-          BayLog.trace("%s Start taxi on: %s", self, Thread.current.name);
-          self.depart();
-          BayLog.trace("%s End taxi on: %s", self, Thread.current.name);
+          BayLog.trace("%s Start taxi on: %s", self, Thread.current.name)
+          begin
+            self.depart
+          rescue => e
+            BayLog.error_e(e)
+          ensure
+            BayLog.trace("%s End taxi on: %s", self, Thread.current.name)
+          end
+
         end
 
+        def depart
+          NotImplementedError.new
+        end
       end
     end
   end

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

@@ -1,119 +1,34 @@
 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'
+require 'baykit/bayserver/common/vehicle_runner'
 
 module Baykit
   module BayServer
     module Taxi
       class TaxiRunner
         include Baykit::BayServer
-        include Baykit::BayServer::Agent
-        include Baykit::BayServer::Util
+        include Baykit::BayServer::Common
 
-        class AgentListener
-          include Baykit::BayServer::Agent::LifecycleListener # implements
 
-          def add(agt)
-            TaxiRunner.runners[agt.agent_id - 1] = TaxiRunner.new(agt)
-          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
-        end
-
-
-        # define class instance accessor
         class << self
-          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
-
-        ######################################################
-        # 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)
-          @exe.shutdown
+          attr :runner
         end
 
-        def submit(txi)
-          @exe.submit() do
-            if @agent.aborted
-              BayLog.error("Agent is aborted")
-              return
-            end
+        @runner = VehicleRunner.new
 
-            @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
 
         ######################################################
         # 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())
+        def self.init(max_taxis)
+          @runner.init(max_taxis)
         end
 
-        def TaxiRunner.post(agt_id, txi)
+        def self.post(agt_id, txi)
           BayLog.debug("agt#%d post taxi: thread=%s taxi=%s", agt_id, Thread.current.name, txi);
-          begin
-            @runners[agt_id - 1].submit(txi)
-            return true
-          rescue => e
-            BayLog.error_e(e)
-            return false
-          end
+          @runner.post(agt_id, txi)
         end
+
       end
     end
   end

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

@@ -59,7 +59,7 @@ module Baykit
         ######################################################
 
         def depart()
-          @start_time = Time.now.to_i
+          @start_time = Time.now.tv_sec
           begin
             @buf.clear()
             @infile.read(@buf_size, @buf)
@@ -86,7 +86,7 @@ module Baykit
         end
 
         def on_timer()
-          duration_sec = Time.now.to_i - @start_time
+          duration_sec = Time.now.tv_sec - @start_time
           if (@data_listener.check_timeout(duration_sec))
             close()
           end

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

@@ -2,27 +2,30 @@ module Baykit
   module BayServer
     module Tours
 
-      module ReqContentHandler
-        #
-        # interface
-        #
-        #         void onReadContent(Tour tur, byte[] buf, int start, int len) throws IOException;
-        #         void onEndContent(Tour tur) throws IOException, HttpException;
-        #         void onAbort(Tour tur);
-        #
-
-        #DEV_NULL = nil
+      module ReqContentHandler # interface
+        def on_read_req_content(tur, buf, start, len)
+          raise NotImplementedError.new
+        end
+
+        def on_end_req_content(tur)
+          raise NotImplementedError.new
+        end
+
+        def on_abort_req(tur)
+          raise NotImplementedError.new
+        end
+
       end
 
       class DevNullReqContentHandler
         include ReqContentHandler  # implements
-        def on_read_content(tur, buf, start, len)
+        def on_read_req_content(tur, buf, start, len)
         end
 
-        def on_end_content(tur)
+        def on_end_req_content(tur)
         end
 
-        def on_abort(tur)
+        def on_abort_req(tur)
           return false
         end
       end

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

@@ -1,7 +1,7 @@
 require 'baykit/bayserver/bay_log'
 require 'baykit/bayserver/http_exception'
 
-require 'baykit/bayserver/watercraft/ship'
+require 'baykit/bayserver/ships/ship'
 require 'baykit/bayserver/util/counter'
 
 
@@ -10,7 +10,7 @@ module Baykit
     module Tours
       class Tour
         include Baykit::BayServer
-        include Baykit::BayServer::WaterCraft
+        include Baykit::BayServer::Ships
         include Baykit::BayServer::Util
         include Baykit::BayServer::Util::Reusable # implements
 

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

@@ -0,0 +1,36 @@
+require 'baykit/bayserver/bay_log'
+require 'baykit/bayserver/http_exception'
+
+require 'baykit/bayserver/ships/ship'
+require 'baykit/bayserver/util/counter'
+
+
+module Baykit
+  module BayServer
+    module Tours
+      module TourHandler
+
+        # Send HTTP headers to client
+        def send_res_headers(tur)
+          raise NotImplementedError.new
+        end
+
+        # Send Contents to client
+        def send_res_content(tur, bytes, ofs, len, &lis)
+          raise NotImplementedError.new
+        end
+
+        # Send end of contents to client.
+        def send_end_tour(tur, keep_alive, &lis)
+          raise NotImplementedError.new
+        end
+
+        # Send protocol error to client
+        def on_protocol_error(e)
+          raise NotImplementedError.new
+        end
+
+      end
+    end
+  end
+end

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

@@ -51,7 +51,6 @@ module Baykit
         attr :bytes_consumed
         attr :bytes_limit
 
-        attr :consume_listener
         attr :available
         attr :ended
 
@@ -98,7 +97,6 @@ module Baykit
           @charset = nil
           @available = false
           @content_handler = nil
-          @consume_listener = nil
           @ended = false
 
         end
@@ -107,22 +105,21 @@ module Baykit
         # other methods
         ######################################################
 
-        def remote_host()
+        def remote_host
           return @remote_host_func.call()
         end
 
-        def set_consume_listener(limit, &listener)
+        def set_limit(limit)
           if limit < 0
             raise Sink.new("invalid limit")
           end
           @bytes_limit = limit
-          @consume_listener = listener
           @bytes_posted = 0
           @bytes_consumed = 0
           @available = true
         end
 
-        def post_content(check_id, data, start, len)
+        def post_req_content(check_id, data, start, len, &callback)
           @tour.check_tour_id(check_id)
 
           data_passed = false
@@ -132,9 +129,6 @@ module Baykit
           elsif @content_handler == nil
             BayLog.warn("%s content read, but no content handler", tour)
 
-          elsif @consume_listener == nil
-            raise Sink.new("Request consume listener is null")
-
           elsif @bytes_posted + len > @bytes_limit
             raise ProtocolException.new("Read data exceed content-length: %d/%d", @bytes_posted + len, @bytes_limit)
 
@@ -143,7 +137,7 @@ module Baykit
             BayLog.debug("%s tour has error.", @tour)
 
           else
-            @content_handler.on_read_content(@tour, data, start, len)
+            @content_handler.on_read_req_content(@tour, data, start, len, &callback)
             data_passed = true
           end
 
@@ -167,7 +161,7 @@ module Baykit
           return @available
         end
 
-        def end_content(check_id)
+        def end_req_content(check_id)
           @tour.check_tour_id(check_id)
           if @ended
             raise Sink.new("#{@tour} Request content is already ended")
@@ -178,17 +172,13 @@ module Baykit
           end
 
           if @content_handler != nil
-            @content_handler.on_end_content(@tour)
+            @content_handler.on_end_req_content(@tour)
           end
           @ended = true
         end
 
-        def consumed(chk_id, length)
+        def consumed(chk_id, length, &callback)
           @tour.check_tour_id(chk_id)
-          BayLog.debug("%s content_consumed: len=%d posted=%d", @tour, length, @bytes_posted)
-          if @consume_listener == nil
-            raise Sink.new("Request consume listener is null")
-          end
 
           @bytes_consumed += length
           BayLog.debug("%s reqConsumed: len=%d posted=%d limit=%d consumed=%d",
@@ -204,24 +194,24 @@ module Baykit
             BayLog.debug("%s request available (^o^): posted=%d consumed=%d", self,  @bytes_posted, @bytes_consumed);
             resume = true
           end
-          @consume_listener.call(length, resume)
+          callback.call(length, resume)
         end
 
-        def abort()
+        def abort
           BayLog.debug("%s abort", @tour)
           if @tour.preparing?
-            @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+            #@tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
             return true
 
           elsif @tour.running?
             aborted = true
             if @content_handler != nil
-              aborted = @content_handler.on_abort(@tour)
+              aborted = @content_handler.on_abort_req(@tour)
             end
 
-            if aborted
-              @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
-            end
+            #if aborted
+            #  @tour.change_state(Tour::TOUR_ID_NOCHECK, Tour::TourState::ABORTED)
+            #end
 
             return aborted
           else

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

@@ -1,6 +1,6 @@
 require 'baykit/bayserver/http_exception'
 require 'baykit/bayserver/protocol/protocol_exception'
-require 'baykit/bayserver/agent/transporter/plain_transporter'
+require 'baykit/bayserver/agent/multiplexer/plain_transporter'
 require 'baykit/bayserver/taxi/taxi_runner'
 require 'baykit/bayserver/docker/harbor'
 require 'baykit/bayserver/tours/send_file_yacht'
@@ -101,6 +101,7 @@ module Baykit
           end
 
           @bytes_limit = @headers.content_length()
+          BayLog.debug("%s send_headers content length: %s", self, @bytes_limit)
 
           # Compress check
           if BayServer.harbor.gzip_comp &&
@@ -161,7 +162,7 @@ module Baykit
           @available = true
         end
 
-        def send_content(chk_tour_id, buf, ofs, len)
+        def send_res_content(chk_tour_id, buf, ofs, len)
           @tour.check_tour_id(chk_tour_id)
           BayLog.debug("%s sendContent len=%d", @tour, len)
 
@@ -223,7 +224,7 @@ module Baykit
           return @available
         end
 
-        def end_content(chk_tour_id)
+        def end_res_content(chk_tour_id)
           @tour.check_tour_id(chk_tour_id)
 
           BayLog.debug("%s end ResContent", self)
@@ -345,92 +346,7 @@ module Baykit
             end
           end
 
-          end_content(chk_tour_id)
-        end
-
-
-
-        def send_file(chk_tour_id, file, charset, async)
-          @tour.check_tour_id(chk_tour_id)
-
-          if @tour.zombie?
-            return
-          end
-
-          if File.directory?(file)
-            raise HttpException.new HttpStatus::FORBIDDEN, file
-          elsif !File.exist?(file)
-            raise HttpException.new HttpStatus::NOT_FOUND, file
-          end
-
-          mime_type = nil
-
-          rname = File.basename(file)
-          pos = rname.rindex('.')
-          if pos
-            ext = rname[pos + 1 .. -1].downcase
-            mime_type = Mimes.type(ext)
-          end
-
-          if !mime_type
-            mime_type = "application/octet-stream"
-          end
-
-          if mime_type.start_with?("text/") && charset != nil
-            mime_type = mime_type + "; charset=" + charset
-          end
-
-          file_len = ::File.size(file)
-          BayLog.debug("%s send_file %s async=%s len=%d", @tour, file, async, file_len)
-
-          @headers.set_content_type(mime_type)
-          @headers.set_content_length(file_len)
-
-          begin
-            send_headers(Tour::TOUR_ID_NOCHECK)
-
-            if async
-              bufsize = @tour.ship.protocol_handler.max_res_packet_data_size()
-
-              case(BayServer.harbor.file_send_method())
-
-              when Harbor::FILE_SEND_METHOD_SELECT
-                tp = PlainTransporter.new(false, bufsize)
-                @yacht.init(@tour, file, tp)
-                tp.init(@tour.ship.agent.non_blocking_handler, File.open(file, "rb"), @yacht)
-                @tour.ship.resume(@tour.ship_id)
-                tp.open_valve()
-
-              when Harbor::FILE_SEND_METHOD_SPIN
-                timeout = 10
-                tp = SpinReadTransporter.new(bufsize)
-                @yacht.init(@tour, file, tp)
-                tp.init(@tour.ship.agent.spin_handler, @yacht, File.open(file, "rb"), File.size(file), timeout, nil)
-                @tour.ship.resume(@tour.ship_id)
-                tp.open_valve()
-
-              when Harbor::FILE_SEND_METHOD_TAXI
-                txi = ReadFileTaxi.new(@tour.ship.agent.agent_id, bufsize)
-                @yacht.init(@tour, file, txi)
-                txi.init(File.open(file, "rb"), @yacht)
-                if !TaxiRunner.post(@tour.ship.agent.agent_id, txi)
-                  raise HttpException.new(HttpStatus::SERVICE_UNAVAILABLE, "Taxi is busy!");
-                end
-
-              else
-                raise Sink.new();
-              end
-
-            else
-              SendFileTrain.new(@tour, file).run()
-            end
-          rescue HttpException => e
-            raise e
-          rescue => e
-            BayLog.error_e(e)
-            raise HttpException.new(HttpStatus::INTERNAL_SERVER_ERROR, file)
-          end
-
+          end_res_content(chk_tour_id)
         end
 
         def get_compressor()

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

@@ -18,12 +18,12 @@ module Baykit
         class AgentListener
           include Baykit::BayServer::Agent::LifecycleListener  # implements
 
-          def add(agt)
-            TourStore.stores[agt.agent_id] = TourStore.new();
+          def add(agt_id)
+            TourStore.stores[agt_id] = TourStore.new();
           end
 
-          def remove(agt)
-            TourStore.stores.delete(agt.agent_id);
+          def remove(agt_id)
+            TourStore.stores.delete(agt_id);
           end
         end
 
@@ -46,7 +46,7 @@ module Baykit
         def initialize()
           @free_tours = []
           @active_tour_map = {}
-          @lock = Monitor.new
+          @lock = ::Monitor.new
         end
 
         def get(key)

data/lib/baykit/bayserver/train/train_runner.rb

@@ -5,26 +5,30 @@ module Baykit
   module BayServer
       module Train
         class TrainRunner
-          include Baykit::BayServer::Util
+          include Baykit::BayServer
+          include Baykit::BayServer::Common
+
 
-          # define class instance accessor
           class << self
-            attr :exe
+            attr :runner
           end
 
-          def self.init(num_agents)
-            @exe = ExecutorService.new("TrainRunner", num_agents)
+          @runner = VehicleRunner.new
+
+
+          ######################################################
+          # Class methods
+          ######################################################
+
+          def self.init(max_trains)
+            @runner.init(max_trains)
           end
 
-          def self.post(train)
-            begin
-              @exe.submit(train)
-              return true
-            rescue => e
-              BayLog.error_e(e)
-              return false
-            end
+          def self.post(agt_id, train)
+            BayLog.debug("agt#%d post train: thread=%s train=%s", agt_id, Thread.current.name, train);
+            @runner.post(agt_id, train)
           end
+
         end
       end
   end

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

@@ -1,7 +1,7 @@
 module Baykit
   module BayServer
     module Util
-      class DataConsumeListener
+      class DataConsumeListener # interface
         #
         # interface
         #

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

@@ -60,13 +60,17 @@ module Baykit
           count.times do |i|
             started = false
             Thread.new do
-              started = true
-              id = i + 1
-              th_name = "Executor[#{name}]##{id}"
-              Thread.current.name = th_name
-              e = Executor.new @que, id, th_name
-              e.run
-              @executors << e
+              begin
+                started = true
+                id = i + 1
+                th_name = "Executor[#{name}]##{id}"
+                Thread.current.name = th_name
+                e = Executor.new @que, id, th_name
+                e.run
+                @executors << e
+              rescue => e
+                BayLog.error_e(e)
+              end
             end
             while !started
               sleep(0.01)