X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=39c5ce58f3b507233ad590deae37ab0c97ca2146;hp=0e3e3abbb0a8b57c129bf62f39d901fe1ff2a16d;hb=74b11e3868ac68e912d14030305ee01e222e8e15;hpb=4c1a8ff9da057987e34936af8743a4d179a472dc

diff --git a/src/main.cpp b/src/main.cpp
index 0e3e3abb..39c5ce58 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,6 +39,7 @@ using grpc::ServerBuilder;
 using grpc::ServerContext;
 using grpc::Status;
 using grpc::StatusCode;
+using namespace hashprobe;
 
 class HashProbeImpl final : public HashProbe::Service {
 public:
@@ -51,24 +52,44 @@ public:
 		}
 
 		bool invert = (pos.side_to_move() == BLACK);
+		Search::StateStackPtr setup_states = Search::StateStackPtr(new std::stack<StateInfo>);
 
-		HashProbeMove *root_move = response->add_move();
-		root_move->set_move(MOVE_NONE);
-		ProbeMove(pos.key(), invert, root_move);
+		ProbeMove(&pos, setup_states.get(), invert, response->mutable_root());
 
 		MoveList<LEGAL> moves(pos);
 		for (const ExtMove* em = moves.begin(); em != moves.end(); ++em) {
-			HashProbeMove *move = response->add_move();
-			move->set_move(em->move);
-			ProbeMove(pos.key_after(em->move), !invert, move);
+			HashProbeLine *line = response->add_line();
+			FillMove(em->move, line->mutable_move());
+			setup_states->push(StateInfo());
+			pos.do_move(em->move, setup_states->top(), pos.gives_check(em->move, CheckInfo(pos)));
+			ProbeMove(&pos, setup_states.get(), !invert, line);
+			pos.undo_move(em->move);
 		}
 
 		return Status::OK;
 	}
 
-	void ProbeMove(const int64_t key, bool invert, HashProbeMove* response) {
+	void FillMove(Move move, HashProbeMove* decoded) {
+		if (!is_ok(move)) return;
+
+		Square from = from_sq(move);
+		Square to = to_sq(move);
+
+		if (type_of(move) == CASTLING) {
+			to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
+		}
+			
+		decoded->set_from_sq(UCI::square(from));
+		decoded->set_to_sq(UCI::square(to));
+
+		if (type_of(move) == PROMOTION) {
+			decoded->set_promotion(std::string() + " PNBRQK"[promotion_type(move)]);
+		}
+	}
+
+	void ProbeMove(Position* pos, std::stack<StateInfo>* setup_states, bool invert, HashProbeLine* response) {
 		bool found;
-		TTEntry *entry = TT.probe(key, found);
+		TTEntry *entry = TT.probe(pos->key(), found);
 		response->set_found(found);
 		if (found) {
 			Value value = entry->value();
@@ -85,27 +106,62 @@ public:
 				}
 			}
 
-			response->set_pv_move(entry->move());
 			response->set_depth(entry->depth());
-			response->set_eval(eval);
-			response->set_value(value);
-			response->set_bound(HashProbeMove::ValueBound(bound));
+			FillValue(eval, response->mutable_eval());
+			FillValue(value, response->mutable_value());
+			response->set_bound(HashProbeLine::ValueBound(bound));
+
+			// Follow the PV until we hit an illegal move.
+			std::stack<Move> pv;
+			std::set<Key> seen;
+			while (found && is_ok(entry->move())) {
+				FillMove(entry->move(), response->add_pv());
+				if (seen.count(pos->key())) break;
+				pv.push(entry->move());
+				seen.insert(pos->key());
+				setup_states->push(StateInfo());
+				pos->do_move(entry->move(), setup_states->top(), pos->gives_check(entry->move(), CheckInfo(*pos)));
+				entry = TT.probe(pos->key(), found);
+			}
+
+			// Unroll the PV back again, so the Position object remains unchanged.
+			while (!pv.empty()) {
+				pos->undo_move(pv.top());
+				pv.pop();
+			}
+		}
+	}
+
+	void FillValue(Value value, HashProbeScore* score) {
+		if (abs(value) < VALUE_MATE - MAX_PLY) {
+			score->set_score_type(HashProbeScore::SCORE_CP);
+			score->set_score_cp(value * 100 / PawnValueEg);
+		} else {
+			score->set_score_type(HashProbeScore::SCORE_MATE);
+			score->set_score_mate((value > 0 ? VALUE_MATE - value + 1 : -VALUE_MATE - value) / 2);
 		}
 	}
 };
-	
-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();
@@ -125,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);