Refactor the RPC thread into a shutdown-able class.

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index a5ed56ec3b77cba9d195e24ed705c0c18793f5b2..39c5ce58f3b507233ad590deae37ab0c97ca2146 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -142,19 +142,26 @@ public:
                }
        }
 };
-       
-void rpc_thread()
-{
-       std::string server_address("0.0.0.0:50051");
-       HashProbeImpl service;
 
+class HashProbeThread {
+public:
+       HashProbeThread(const std::string &server_address) {
+               builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
+               builder.RegisterService(&service);
+               server = std::move(builder.BuildAndStart());
+               std::cout << "Server listening on " << server_address << std::endl;
+               std::thread([this]{ server->Wait(); }).detach();
+       }
+
+       void Shutdown() {
+               server->Shutdown();
+       }
+
+private:
+       HashProbeImpl service;
        ServerBuilder builder;
-       builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
-       builder.RegisterService(&service);
-       std::unique_ptr<Server> server(builder.BuildAndStart());
-       std::cout << "Server listening on " << server_address << std::endl;
-       server->Wait();
-}
+       std::unique_ptr<Server> server;
+};
 
 namespace PSQT {
   void init();
@@ -174,7 +181,7 @@ int main(int argc, char* argv[]) {
   Threads.set(Options["Threads"]);
   Search::clear(); // After threads are up
 
-  std::thread(&rpc_thread).detach();
+  HashProbeThread thr("0.0.0.0:50051");
 
   UCI::loop(argc, argv);