Do not fill value if we have no search info.

[stockfish] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index a5ed56ec3b77cba9d195e24ed705c0c18793f5b2..d20d8df4b3dc8af0eb5fe90d7f2c63b900b9dac2 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -108,7 +108,9 @@ public:
 
                        response->set_depth(entry->depth());
                        FillValue(eval, response->mutable_eval());
-                       FillValue(value, response->mutable_value());
+                       if (entry->depth() > DEPTH_NONE) {
+                               FillValue(value, response->mutable_value());
+                       }
                        response->set_bound(HashProbeLine::ValueBound(bound));
 
                        // Follow the PV until we hit an illegal move.
@@ -142,19 +144,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 +183,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);