Commit: e37932a0d2387227928808ec86f49362ae29f9ea - shogi-server (git)

shogi-server source

Commit MetaInfo

• Revision: e37932a0d2387227928808ec86f49362ae29f9ea (tree)
• Time: 2020-10-02 01:36:08
• Author: Mizar <mizar.jp@gmai...>
• Commiter: Mizar

Log Message

tcp_keepalive

Change Summary

• modified: bin/usiToCsa.rb
• modified: shogi-server
• modified: shogi_server.rb

Incremental Difference

--- a/bin/usiToCsa.rb
+++ b/bin/usiToCsa.rb
@@ -28,6 +28,7 @@ $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), ".."))
 require 'shogi_server'
 require 'logger'
 require 'socket'
+require 'timeout'
 
 # Global variables
 
@@ -105,7 +106,12 @@ def parse_command_line
     ["--options",     GetoptLong::REQUIRED_ARGUMENT],
     ["--password",    GetoptLong::REQUIRED_ARGUMENT],
     ["--ponder",      GetoptLong::NO_ARGUMENT],
-    ["--port",        GetoptLong::REQUIRED_ARGUMENT])
+    ["--port",        GetoptLong::REQUIRED_ARGUMENT],
+    ["--ignoremultiselect",  GetoptLong::NO_ARGUMENT],
+    ["--tcpkeepalive",       GetoptLong::REQUIRED_ARGUMENT],
+    ["--tcpkeepalive-idle",  GetoptLong::REQUIRED_ARGUMENT],
+    ["--tcpkeepalive-intvl", GetoptLong::REQUIRED_ARGUMENT],
+    ["--tcpkeepalive-cnt",   GetoptLong::REQUIRED_ARGUMENT])
   parser.quiet = true
   begin
     parser.each_option do |name, arg|
@@ -132,6 +138,15 @@ def parse_command_line
   options[:ponder]      ||= ENV["PONDER"] || false
   options[:port]        ||= ENV["PORT"] || 4081
   options[:port]        = options[:port].to_i
+  options[:ignoremultiselect]  ||= ENV["IGNORE_MULTISELECT"] || false
+  options[:tcpkeepalive]       ||= ENV["TCPKEEPALIVE"] || 0
+  options[:tcpkeepalive]       = options[:tcpkeepalive].to_i
+  options[:tcpkeepalive_idle]  ||= ENV["TCPKEEPALIVE_IDLE"] || 50
+  options[:tcpkeepalive_idle]  = options[:tcpkeepalive_idle].to_i
+  options[:tcpkeepalive_intvl] ||= ENV["TCPKEEPALIVE_INTVL"] || 5
+  options[:tcpkeepalive_intvl] = options[:tcpkeepalive_intvl].to_i
+  options[:tcpkeepalive_cnt]   ||= ENV["TCPKEEPALIVE_CNT"] || 9
+  options[:tcpkeepalive_cnt]   = options[:tcpkeepalive_cnt].to_i
 
   return options
 end
@@ -424,7 +439,14 @@ class BridgeState
       throw "Bad state at event_engine_recv: #@state"
     end
 
-    str = $server.gets
+    str = nil
+    begin
+      Timeout.timeout(0.001){
+        str = $server.gets
+      }
+    rescue Timeout::Error
+      $logger.error "event_server_recv timeout"
+    end
     return if str.nil? || str.strip.empty?
     log_server_recv str
 
@@ -567,6 +589,30 @@ def login
   begin
     $server = TCPSocket.open($options[:host], $options[:port])
     $server.sync = true
+    if $options[:tcpkeepalive] > 0 &&
+      Socket.const_defined?(:SOL_SOCKET) &&
+      Socket.const_defined?(:SO_KEEPALIVE) &&
+      Socket.const_defined?(:IPPROTO_TCP)
+      $server.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
+      if Socket.const_defined?(:TCP_KEEPIDLE) &&
+        Socket.const_defined?(:TCP_KEEPINTVL) &&
+        Socket.const_defined?(:TCP_KEEPCNT)
+        $server.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPIDLE, $options[:tcpkeepalive_idle])
+        $server.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPINTVL, $options[:tcpkeepalive_intvl])
+        $server.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPCNT, $options[:tcpkeepalive_cnt])
+      elsif RUBY_PLATFORM.downcase =~ /mswin|mingw|cygwin|bccwin/
+        # Windows 10 (1709 or later) ws2ipdef.h
+        # https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-options
+        $server.setsockopt(Socket::IPPROTO_TCP, 3, $options[:tcpkeepalive_idle])
+        $server.setsockopt(Socket::IPPROTO_TCP, 17, $options[:tcpkeepalive_intvl])
+        $server.setsockopt(Socket::IPPROTO_TCP, 16, $options[:tcpkeepalive_cnt])
+      elsif RUBY_PLATFORM.downcase =~ /darwin/
+        # macOS 10.12.6 (Sierra) /usr/include/netinet/tcp.h
+        $server.setsockopt(Socket::IPPROTO_TCP, 0x10, $options[:tcpkeepalive_idle])
+        $server.setsockopt(Socket::IPPROTO_TCP, 0x101, $options[:tcpkeepalive_intvl])
+        $server.setsockopt(Socket::IPPROTO_TCP, 0x102, $options[:tcpkeepalive_cnt])
+      end
+    end
   rescue
     log_error "Failed to connect to the server"
     $server = nil
@@ -611,7 +657,7 @@ end
 #
 def main_loop
   while true
-    ret, = select([$server, $engine], nil, nil, 60)
+    ret, = select([$engine, $server], nil, nil, 60)
     unless ret
       # Send keep-alive
       if $bridge_state.too_quiet?
@@ -621,12 +667,14 @@ def main_loop
       next
     end
 
-    ret.each do |io|
-      case io
-      when $engine
-        $bridge_state.do_engine_recv
-      when $server
-        $bridge_state.do_sever_recv
+    ret.each_with_index do |io, idx|
+      if (!$options[:ignoremultiselect] || idx == 0)
+        case io
+        when $engine
+          $bridge_state.do_engine_recv
+        when $server
+          $bridge_state.do_sever_recv
+        end
       end
     end
 

--- a/shogi-server
+++ b/shogi-server
@@ -228,7 +228,10 @@ def parse_command_line
     ["--max-identifier",      GetoptLong::REQUIRED_ARGUMENT],
     ["--max-moves",           GetoptLong::REQUIRED_ARGUMENT],
     ["--pid-file",            GetoptLong::REQUIRED_ARGUMENT],
-    ["--player-log-dir",      GetoptLong::REQUIRED_ARGUMENT])
+    ["--player-log-dir",      GetoptLong::REQUIRED_ARGUMENT],
+    ["--tcpkeepalive-idle",   GetoptLong::REQUIRED_ARGUMENT],
+    ["--tcpkeepalive-intvl",  GetoptLong::REQUIRED_ARGUMENT],
+    ["--tcpkeepalive-cnt",    GetoptLong::REQUIRED_ARGUMENT])
   parser.quiet = true
   begin
     parser.each_option do |name, arg|
@@ -308,6 +311,15 @@ def check_command_line
 
   $options["least-time-per-move"] ||= ShogiServer::Default_Least_Time_Per_Move
   $options["least-time-per-move"] = $options["least-time-per-move"].to_i
+
+  $options["tcpkeepalive-idle"] ||= ShogiServer::Default_TcpKeepAlive_Idle
+  $options["tcpkeepalive-idle"] = $options["tcpkeepalive-idle"].to_i
+
+  $options["tcpkeepalive-intvl"] ||= ShogiServer::Default_TcpKeepAlive_Intvl
+  $options["tcpkeepalive-intvl"] = $options["tcpkeepalive-intvl"].to_i
+
+  $options["tcpkeepalive-cnt"] ||= ShogiServer::Default_TcpKeepAlive_Cnt
+  $options["tcpkeepalive-cnt"] = $options["tcpkeepalive-cnt"].to_i
 end
 
 # See if a file can be created in the directory.
@@ -489,8 +501,30 @@ def main
   server.start do |client|
     begin
       # client.sync = true # this is already set in WEBrick 
-      client.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
-        # Keepalive time can be set by /proc/sys/net/ipv4/tcp_keepalive_time
+      if Socket.const_defined?(:SOL_SOCKET) &&
+        Socket.const_defined?(:SO_KEEPALIVE) &&
+        Socket.const_defined?(:IPPROTO_TCP)
+        client.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
+          # Keepalive time can be set by /proc/sys/net/ipv4/tcp_keepalive_time
+        if Socket.const_defined?(:TCP_KEEPIDLE) &&
+          Socket.const_defined?(:TCP_KEEPINTVL) &&
+          Socket.const_defined?(:TCP_KEEPCNT)
+          client.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPIDLE, $options["tcpkeepalive-idle"])
+          client.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPINTVL, $options["tcpkeepalive-intvl"])
+          client.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_KEEPCNT, $options["tcpkeepalive-cnt"])
+        elsif RUBY_PLATFORM.downcase =~ /mswin|mingw|cygwin|bccwin/
+          # Windows 10 (1709 or later) ws2ipdef.h
+          # https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-options
+          client.setsockopt(Socket::IPPROTO_TCP, 3, $options["tcpkeepalive-idle"])
+          client.setsockopt(Socket::IPPROTO_TCP, 17, $options["tcpkeepalive-intvl"])
+          client.setsockopt(Socket::IPPROTO_TCP, 16, $options["tcpkeepalive-cnt"])
+        elsif RUBY_PLATFORM.downcase =~ /darwin/
+          # macOS 10.12.6 (Sierra) /usr/include/netinet/tcp.h
+          client.setsockopt(Socket::IPPROTO_TCP, 0x10, $options["tcpkeepalive-idle"])
+          client.setsockopt(Socket::IPPROTO_TCP, 0x101, $options["tcpkeepalive-intvl"])
+          client.setsockopt(Socket::IPPROTO_TCP, 0x102, $options["tcpkeepalive-cnt"])
+        end
+      end
       player, login = login_loop(client) # loop
       unless player
         log_error("Detected a timed out login attempt")

--- a/shogi_server.rb
+++ b/shogi_server.rb
@@ -51,6 +51,9 @@ Default_Timeout = 60            # for single socket operation
 Default_Game_Name = "default-1500-0"
 Default_Max_Moves = 256
 Default_Least_Time_Per_Move = 0
+Default_TcpKeepAlive_Idle = 50
+Default_TcpKeepAlive_Intvl = 5
+Default_TcpKeepAlive_Cnt = 9
 One_Time = 10
 Login_Time = 300                # time for LOGIN
 Revision = "20180825"