bayserver-core 3.0.3 → 3.3.1

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

@@ -15,6 +15,7 @@ module Baykit
 
           include Baykit::BayServer::Rudders
           include Baykit::BayServer::Util
+          include Baykit::BayServer::Common
 
           def initialize(agt, anchorable)
             super
@@ -35,6 +36,7 @@ module Baykit
             end
 
             st = get_rudder_state(rd)
+            id = st.id
 
             Thread.new do
               begin
@@ -45,7 +47,7 @@ module Baykit
                 begin
                   client_skt, adr = rd.io.accept
                 rescue Exception => e
-                  @agent.send_error_letter(st, e, true)
+                  @agent.send_error_letter(id, rd, self, e, true)
                   next
                 end
 
@@ -54,7 +56,7 @@ module Baykit
                   BayLog.error("%s Agent is not alive (close)", @agent);
                   client_skt.close
                 else
-                  @agent.send_accepted_letter(st, IORudder.new(client_skt), true)
+                  @agent.send_accepted_letter(id, rd, self, IORudder.new(client_skt), true)
                 end
 
               rescue Exception => e
@@ -67,20 +69,28 @@ module Baykit
 
 
           def req_connect(rd, adr)
-            st = get_rudder_state(rd)
-            BayLog.debug("%s reqConnect adr=%s rd=%s chState=%s", @agent, adr.canonname, rd, st)
+            BayLog.debug("%s reqConnect adr=%s rd=%s", @agent, adr.canonname, rd)
 
             Thread.new do
+              st = get_rudder_state(rd)
+              if st == nil
+                # rudder is already closed
+                BayLog.debug("%s Rudder is already closed: rd=%s", @agent, rd)
+                return
+              end
+
               begin
                 rd.io.connect(adr)
                 BayLog.debug("%s Connected rd=%s", @agent, rd)
-                @agent.send_connected_letter(st, false)
+                @agent.send_connected_letter(st.id, rd, self, true)
               rescue Exception => e
-                @agent.send_error_letter(st, e, false)
+                @agent.send_error_letter(st.id, rd, self, e, true)
                 return
               end
             end
 
+            st = get_rudder_state(rd)
+            st.access
             st.connecting = true
           end
 
@@ -110,10 +120,11 @@ module Baykit
             st = get_rudder_state(rd)
             BayLog.debug("%s reqWrite st=%s", @agent, st)
 
-            if st == nil || st.closed
-              BayLog.warn("%s Channel is closed(callback immediately): %s", @agent, rd)
-              lis.call()
-              return
+            if st == nil
+              raise IOError.new("Invalid rudder")
+              #BayLog.warn("%s Channel is closed(callback immediately): %s", @agent, rd)
+              #lis.call()
+              #return
             end
 
             unt = WriteUnit.new(buf, adr, tag, &lis)
@@ -145,7 +156,9 @@ module Baykit
               return
             end
 
-            Thread.new do
+            id = st.id
+
+              Thread.new do
               begin
                 st = get_rudder_state(rd)
                 if st == nil
@@ -153,8 +166,8 @@ module Baykit
                   next
                 end
 
-                close_rudder(st)
-                @agent.send_closed_letter(st, true)
+                close_rudder(rd)
+                @agent.send_closed_letter(id, rd, self, true)
               rescue Exception => e
                 BayLog.fatal_e(e)
                 @agent.shutdown
@@ -177,12 +190,9 @@ module Baykit
           end
 
           def next_read(st)
+            id = st.id
+
             Thread.new do
-              if st.closed
-                #channel is already closed
-                BayLog.debug("%s Rudder is already closed: rd=%s", @agent, st.rudder);
-                next
-              end
 
               begin
                 if st.handshaking
@@ -203,45 +213,48 @@ module Baykit
                 end
 
                 BayLog.debug("%s Try to Read (rd=%s)", @agent, st.rudder)
-                begin
-                  n = st.rudder.read(st.read_buf, st.buf_size)
-                rescue EOFError => e
-                  n = 0
-                  st.read_buf.clear
-                end
+                n = st.rudder.read(st.read_buf, st.buf_size)
 
-                @agent.send_read_letter(st, n, nil, true)
+                if get_rudder_state(st.rudder) == nil
+                  #channel is already closed
+                  BayLog.debug("%s Rudder is already closed: rd=%s", self, st.rudder);
+                  next
+                else
+                  @agent.send_read_letter(id, st.rudder, self, n, nil, true)
+                end
 
               rescue Exception => e
-                @agent.send_error_letter(st, e, true)
+                @agent.send_error_letter(id, st.rudder, self, e, true)
               end
             end
           end
 
           def next_write(st)
+            id = st.id
+
             Thread.new do
               BayLog.debug("%s next write st=%s", @agent, st)
 
-              if st == nil || st.closed
+              if st == nil
                 BayLog.warn("%s Channel is closed: %s", @agent, st.rudder)
                 next
               end
 
               u = st.write_queue[0]
-              BayLog.debug("%s Try to write: pkt=%s buflen=%d closed=%s", self, u.tag, u.buf.length, st.closed);
+              BayLog.debug("%s Try to write: pkt=%s buflen=%d", self, u.tag, u.buf.length)
 
               n = 0
               begin
-                if !st.closed && u.buf.length > 0
+                if u.buf.length > 0
                   n = st.rudder.write(u.buf)
                   u.buf.slice!(0, n)
                 end
               rescue Exception => e
-                @agent.send_error_letter(st, e, true)
+                @agent.send_error_letter(id, st.rudder, self, e, true)
                 next
               end
 
-              @agent.send_wrote_letter(st, n, true)
+              @agent.send_wrote_letter(id, st.rudder, self, n, true)
             end
           end
 

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

@@ -26,7 +26,12 @@ module Baykit
             close_all()
           end
 
+          def on_busy()
+            BayLog.debug("%s onBusy (ignore)", self)
+          end
+
           def on_free()
+            BayLog.debug("%s onFree", self)
             if @agent.aborted
               return
             end

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

@@ -63,11 +63,11 @@ module Baykit
             return true
           end
 
-          def close_rudder(st)
-            BayLog.debug("%s closeRd %s state=%s closed=%s", agent, st.rudder, st, st.closed)
+          def close_rudder(rd)
+            BayLog.debug("%s closeRd %s", agent, rd)
 
             begin
-              st.rudder.close()
+              rd.close()
             rescue IOError => e
               Baylog.error_e(e)
             end
@@ -123,7 +123,7 @@ module Baykit
             end
             copied.each do |st|
               if st.rudder != @agent.command_receiver.rudder
-                close_rudder(st)
+                close_rudder(st.rudder)
               end
             end
           end

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

@@ -1,4 +1,4 @@
-require 'baykit/bayserver/agent/multiplexer/transporter'
+require 'baykit/bayserver/common/transporter'
 require 'baykit/bayserver/protocol/protocol_exception'
 require 'baykit/bayserver/agent/next_socket_action'
 
@@ -7,7 +7,7 @@ module Baykit
     module Agent
       module Multiplexer
         class PlainTransporter
-          include Transporter   # Implements
+          include Baykit::BayServer::Common::Transporter   # Implements
           include Baykit::BayServer::Agent
           include Baykit::BayServer::Protocol
           include Baykit::BayServer::Util
@@ -45,7 +45,6 @@ module Baykit
             check_rudder rd
 
             return @ship.notify_connect
-            ;
           end
 
           def on_read(rd, buf, adr)

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

@@ -1,11 +1,13 @@
 require 'baykit/bayserver/common/recipient'
+require 'baykit/bayserver/common/write_unit'
 require 'baykit/bayserver/rudders/rudder'
+
 require 'baykit/bayserver/rudders/io_rudder'
 
 require 'baykit/bayserver/agent/multiplexer/multiplexer_base'
-require 'baykit/bayserver/agent/multiplexer/write_unit'
 require 'baykit/bayserver/agent/timer_handler'
 
+
 module Baykit
   module BayServer
     module Agent
@@ -17,6 +19,7 @@ module Baykit
 
           include Baykit::BayServer::Rudders
           include Baykit::BayServer::Util
+          include Baykit::BayServer::Common
 
           class ChannelOperation
 
@@ -44,7 +47,18 @@ module Baykit
             @anchorable = anchorable
             @operations = []
             @operations_lock = Mutex.new
-            @selector = Selector.new
+
+            begin
+              require "nio4r"  # gem: nio4r
+              require 'baykit/bayserver/util/nio_selector'
+              @selector = NioSelector.new
+            rescue LoadError => e
+              BayLog.debug_e(e, "nio4r gem is not installed. Use Selector instead.")
+              require 'baykit/bayserver/util/rb_selector'
+              @selector = RbSelector.new
+            end
+
+
             @select_wakeup_pipe = IO.pipe
             @selector.register(@select_wakeup_pipe[0], Selector::OP_READ)
 
@@ -73,9 +87,15 @@ module Baykit
             rd.set_non_blocking
 
             begin
-              rd.io.connect(adr)
+              rd.io.connect_nonblock(adr)
             rescue IO::WaitWritable => e
-              #BayLog.error_e(e)
+              # In non-blocking mode, connect_nonblock raises IO::WaitWritable by design
+              # to signal an in-progress connection (this is expected and not an error).
+            rescue Errno::EISCONN
+              # Connection has been successfully established
+            rescue SystemCallError => e
+              @agent.send_error_letter(st.id, rd, self, e, false)
+              return
             end
 
             st.connecting = true
@@ -95,9 +115,9 @@ module Baykit
 
           def req_write(rd, buf,adr, tag, &lis)
             st = get_rudder_state(rd)
-            BayLog.debug("%s req write st=%s tag=%s", @agent, st, tag)
+            BayLog.debug("%s reqWrite st=%s tag=%s", @agent, st, tag)
 
-            if st == nil || st.closed
+            if st == nil
               BayLog.warn("%s Channel is closed: %s", @agent, rd)
               lis.call()
               return
@@ -132,8 +152,8 @@ module Baykit
               return
             end
 
-            close_rudder(st)
-            @agent.send_closed_letter(st, false)
+            close_rudder(rd)
+            @agent.send_closed_letter(st.id, rd, self, false)
 
             st.access
           end
@@ -157,6 +177,10 @@ module Baykit
           end
 
           def cancel_write(st)
+            if st.rudder.closed?
+              return
+            end
+
             op = @selector.get_op(st.rudder.io) & ~Selector::OP_WRITE
             # Write OP off
             if op != Selector::OP_READ
@@ -175,8 +199,8 @@ module Baykit
           def next_write(st)
           end
 
-          def close_rudder(st)
-            @selector.unregister(st.rudder.io)
+          def close_rudder(rd)
+            @selector.unregister(rd.io)
             super
           end
 
@@ -383,9 +407,7 @@ module Baykit
               raise e
 
             rescue => e
-              if e.kind_of? EOFError
-                BayLog.debug("%s Socket closed by peer: skt=%s", @agent, st.rudder.inspect)
-              elsif e.kind_of? SystemCallError
+              if e.kind_of? SystemCallError
                 BayLog.debug("%s O/S error: %s (skt=%s)", @agent, e.message, st.rudder.inspect)
               elsif e.kind_of? IOError
                 BayLog.debug("%s IO error: %s (skt=%s)", @agent, e.message, st.rudder.inspect)
@@ -397,7 +419,7 @@ module Baykit
               end
               # Cannot handle Exception any more
               BayLog.error_e(e)
-              @agent.send_error_letter(st, e, false)
+              @agent.send_error_letter(st.id, st.rudder, self, e, false)
             end
 
             st.access()
@@ -418,7 +440,7 @@ module Baykit
             client_rd.set_non_blocking
             #client_skt.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK)
 
-            @agent.send_accepted_letter(st, client_rd, false)
+            @agent.send_accepted_letter(st.id, st.rudder, self, client_rd, false)
 
           end
 
@@ -426,16 +448,18 @@ module Baykit
             BayLog.trace("%s onConnectable", self)
 
             # check connected
-            begin
-              buf = ""
-              st.rudder.io.syswrite(buf)
-            rescue => e
-              BayLog.error("Connect failed: %s", e)
-              @agent.send_error_letter(st, e, false)
-              return
+            err = st.rudder.io.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR).int
+            if err != 0
+              BayLog.error("Connect failed: errno=%d", err)
+              begin
+                raise SystemCallError.new("connect", err)
+              rescue SystemCallError => e
+                @agent.send_error_letter(st.id, st.rudder, self, e, false)
+              end
+            else
+              @agent.send_connected_letter(st.id, st.rudder, self, false)
             end
 
-            @agent.send_connected_letter(st, false)
           end
 
           def on_readable(st)
@@ -445,28 +469,9 @@ module Baykit
 
             begin
               if st.handshaking
-                begin
-                  # Calls accept API for client socket
-                  st.rudder.io.accept_nonblock
+                if handshake(st)
                   st.handshaking = false
-
-                  BayLog.debug("%s Handshake done (rd=%s)", self, st.rudder)
-                  app_protocols = st.rudder.io.context.alpn_protocols
-
-                  # HELP ME
-                  #   This code does not work!
-                  #   We cannot get application protocol name
-                  proto = nil
-                  if app_protocols != nil && app_protocols.length > 0
-                    proto = app_protocols[0]
-                  end
-
-                rescue IO::WaitReadable => e
-                  BayLog.debug("%s Handshake status: read more st=%s", self, st)
-                  return NextSocketAction::CONTINUE
-                rescue IO::WaitWritable => e
-                  BayLog.debug("%s Handshake status: write more st=%s", self, st)
-                  req_write(st.rudder, "", nil, nil)
+                else
                   return NextSocketAction::CONTINUE
                 end
               end
@@ -480,41 +485,63 @@ module Baykit
                 BayLog.debug("%s Read status: write more", self)
                 @channel_handler.ask_to_write(@ch)
                 return NextSocketAction::CONTINUE
-              rescue EOFError => e
-                BayLog.debug("%s EOF", self)
-                len = 0
               end
 
               BayLog.debug("%s read %d bytes", self, len)
-              @agent.send_read_letter(st, len, nil, false)
+              @agent.send_read_letter(st.id, st.rudder, self, len, nil, false)
 
             rescue Exception => e
               BayLog.debug_e(e, "%s Unhandled error", self)
-              @agent.send_error_letter(st, e, false)
+              @agent.send_error_letter(st.id, st.rudder, self, e, false)
               return
             end
           end
 
           def on_writable(st)
             begin
+              if st.handshaking
+                if handshake(st)
+                  st.handshaking = false
+                else
+                  return NextSocketAction::CONTINUE
+                end
+              end
+
               if st.write_queue.empty?
-                raise IOError.new(@agent.to_s + " No data to write: " + st.rudder.to_s)
+                #raise IOError.new(@agent.to_s + " No data to write: " + st.rudder.to_s)
+                BayLog.debug("%s No data to write: tp=%s rd=%s", self, st.transporter, st.rudder)
+                return
               end
 
-              wunit = st.write_queue[0]
+              st.write_queue.length.times do |i|
+                wunit = st.write_queue[i]
 
-              BayLog.debug("%s Try to write: rd=%s pkt=%s len=%d closed=%s adr=%s",
-                           self, st.rudder, wunit.tag, wunit.buf.length, st.closed, wunit.adr);
-              #BayLog.debug(this + " " + new String(wUnit.buf.array(), 0, wUnit.buf.limit()));
+                BayLog.debug("%s Try to write: rd=%s pkt=%s len=%d adr=%s",
+                             self, st.rudder, wunit.tag, wunit.buf.length, wunit.adr)
+                #BayLog.debug(this + " " + new String(wUnit.buf.array(), 0, wUnit.buf.limit()));
+
+                begin
+                  n = st.rudder.write(wunit.buf)
+                rescue OpenSSL::SSL::SSLErrorWaitWritable, IO::WaitWritable => e
+                  BayLog.debug_e(e, "%s Cannot write data", self)
+                  n = 0
+                end
 
-              n = st.rudder.write(wunit.buf)
-              #BayLog.debug("%s Wrote: rd=%s len=%d",self, st.rudder, n);
-              wunit.buf.slice!(0, n)
-              @agent.send_wrote_letter(st, n, false)
+                #BayLog.debug("%s Wrote: rd=%s len=%d",self, st.rudder, n);
+                @agent.send_wrote_letter(st.id, st.rudder, self, n, false)
+
+                len = wunit.buf.length
+                wunit.buf.slice!(0, n)
+
+                if n < len
+                  BayLog.debug("%s Wrote %d bytes (Data remains)", self, n)
+                  break
+                end
+              end
 
             rescue SystemCallError, IOError => e
               BayLog.debug_e(e, "%s IO error", self)
-              @agent.send_error_letter(st, e, false)
+              @agent.send_error_letter(st.id, st.rudder, self, e, false)
             end
           end
 
@@ -538,6 +565,33 @@ module Baykit
 
             return mode_str
           end
+
+          def handshake(st)
+            begin
+              # Calls accept API for client socket
+              st.rudder.io.accept_nonblock
+
+              BayLog.debug("%s Handshake done (rd=%s)", self, st.rudder)
+              app_protocols = st.rudder.io.context.alpn_protocols
+
+              # HELP ME
+              #   This code does not work!
+              #   We cannot get application protocol name
+              proto = nil
+              if app_protocols != nil && app_protocols.length > 0
+                proto = app_protocols[0]
+              end
+
+              return true
+            rescue IO::WaitReadable => e
+              BayLog.debug("%s Handshake status: read more st=%s", self, st)
+              return false
+            rescue IO::WaitWritable => e
+              BayLog.debug("%s Handshake status: write more st=%s", self, st)
+              req_write(st.rudder, "", nil, nil)
+              return false
+            end
+          end
         end
       end
     end

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