X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmain.cpp;h=2117497f2436be1173235d5e782039feab59677d;hp=a5ed56ec3b77cba9d195e24ed705c0c18793f5b2;hb=078767d6dfe9a1fec9614634e4e2c493ccabe4bc;hpb=4a7f980c9970e4f2ad26b43a8e43a620841ce315

diff --git a/src/main.cpp b/src/main.cpp
index a5ed56ec..2117497f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <deque>
 #include <iostream>
+#include <stack>
 #include <thread>
 
 #include "bitboard.h"
@@ -32,6 +34,7 @@
 #include <grpc/grpc.h>
 #include <grpc++/server.h>
 #include <grpc++/server_builder.h>
+#include "hashprobe.h"
 #include "hashprobe.grpc.pb.h"
 
 using grpc::Server;
@@ -41,119 +44,188 @@ using grpc::Status;
 using grpc::StatusCode;
 using namespace hashprobe;
 
-class HashProbeImpl final : public HashProbe::Service {
-public:
-	Status Probe(ServerContext* context,
-	             const HashProbeRequest* request,
-	             HashProbeResponse *response) {
-		Position pos(request->fen(), /*isChess960=*/false, Threads.main());
-		if (!pos.pos_is_ok()) {
-			return Status(StatusCode::INVALID_ARGUMENT, "Invalid FEN");
-		}
+Status HashProbeImpl::Probe(ServerContext* context,
+                            const HashProbeRequest* request,
+			    HashProbeResponse *response) {
+	Position pos;
+	StateInfo st;
+	pos.set(request->fen(), /*isChess960=*/false, &st, Threads.main());
+	if (!pos.pos_is_ok()) {
+		return Status(StatusCode::INVALID_ARGUMENT, "Invalid FEN");
+	}
 
-		bool invert = (pos.side_to_move() == BLACK);
-		Search::StateStackPtr setup_states = Search::StateStackPtr(new std::stack<StateInfo>);
+	bool invert = (pos.side_to_move() == BLACK);
+	StateListPtr setup_states = StateListPtr(new std::deque<StateInfo>(1));
 
-		ProbeMove(&pos, setup_states.get(), invert, response->mutable_root());
+	ProbeMove(&pos, setup_states.get(), invert, response->mutable_root());
 
-		MoveList<LEGAL> moves(pos);
-		for (const ExtMove* em = moves.begin(); em != moves.end(); ++em) {
-			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);
-		}
+	MoveList<LEGAL> moves(pos);
+	for (const ExtMove* em = moves.begin(); em != moves.end(); ++em) {
+		HashProbeLine *line = response->add_line();
+		FillMove(&pos, em->move, line->mutable_move());
+		setup_states->push_back(StateInfo());
+		pos.do_move(em->move, setup_states->back());
+		ProbeMove(&pos, setup_states.get(), !invert, line);
+		pos.undo_move(em->move);
+	}
+
+	return Status::OK;
+}
+
+void HashProbeImpl::FillMove(Position *pos, Move move, HashProbeMove* decoded) {
+	if (!is_ok(move)) return;
+
+	Square from = from_sq(move);
+	Square to = to_sq(move);
 
-		return Status::OK;
+	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));
 
-	void FillMove(Move move, HashProbeMove* decoded) {
-		if (!is_ok(move)) return;
+	if (type_of(move) == PROMOTION) {
+		decoded->set_promotion(std::string() + " PNBRQK"[promotion_type(move)]);
+	}
 
-		Square from = from_sq(move);
-		Square to = to_sq(move);
+	Piece moved_piece = pos->moved_piece(move);
+	std::string pretty;
+	if (type_of(move) == CASTLING) {
+		if (to > from) {
+			pretty = "O-O";
+		} else {
+			pretty = "O-O-O";
+		}
+	} else if (type_of(moved_piece) == PAWN) {
+		if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) {
+			// Capture.
+			pretty = char('a' + file_of(from));
+			pretty += "x";
+		}
+		pretty += UCI::square(to);
+		if (type_of(move) == PROMOTION) {
+			pretty += "=";
+			pretty += " PNBRQK"[promotion_type(move)];
+		}
+	} else {
+		pretty = " PNBRQK"[type_of(moved_piece)];
+		Bitboard attackers = pos->attackers_to(to) & pos->pieces(color_of(moved_piece), type_of(moved_piece));
+		if (more_than_one(attackers)) {
+			// Remove all illegal moves to disambiguate.
+			Bitboard att_copy = attackers;
+			while (att_copy) {
+				Square s = pop_lsb(&att_copy);
+				Move m = make_move(s, to);
+				if (!pos->pseudo_legal(m) || !pos->legal(m)) {
+					attackers &= ~SquareBB[s];
+				}
+			}
+		}
+		if (more_than_one(attackers)) {
+			// Disambiguate by file if possible.
+			Bitboard attackers_this_file = attackers & file_bb(file_of(from));
+			if (attackers != attackers_this_file) {
+				pretty += char('a' + file_of(from));
+				attackers = attackers_this_file;
+			}
+			if (more_than_one(attackers)) {
+				// Still ambiguous, so need to disambiguate by rank.
+				pretty += char('1' + rank_of(from));
+			}
+		}
 
-		if (type_of(move) == CASTLING) {
-			to = make_square(to > from ? FILE_G : FILE_C, rank_of(from));
+		if (type_of(move) == ENPASSANT || pos->piece_on(to) != NO_PIECE) {
+			pretty += "x";
 		}
-			
-		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)]);
+		pretty += UCI::square(to);
+	}
+
+	if (pos->gives_check(move)) {
+		// Check if mate.
+		StateInfo si;
+		pos->do_move(move, si, true);
+		if (MoveList<LEGAL>(*pos).size() > 0) {
+			pretty += "+";
+		} else {
+			pretty += "#";
 		}
+		pos->undo_move(move);
 	}
 
-	void ProbeMove(Position* pos, std::stack<StateInfo>* setup_states, bool invert, HashProbeLine* response) {
-		bool found;
-		TTEntry *entry = TT.probe(pos->key(), found);
-		response->set_found(found);
-		if (found) {
-			Value value = entry->value();
-			Value eval = entry->eval();
-			Bound bound = entry->bound();
-
-			if (invert) {
-				value = -value;
-				eval = -eval;
-				if (bound == BOUND_UPPER) {
-					bound = BOUND_LOWER;
-				} else if (bound == BOUND_LOWER) {
-					bound = BOUND_UPPER;
-				}
+	decoded->set_pretty(pretty);
+}
+
+void HashProbeImpl::ProbeMove(Position* pos, std::deque<StateInfo>* setup_states, bool invert, HashProbeLine* response) {
+	bool found;
+	TTEntry *entry = TT.probe(pos->key(), found);
+	response->set_found(found);
+	if (found) {
+		Value value = entry->value();
+		Value eval = entry->eval();
+		Bound bound = entry->bound();
+
+		if (invert) {
+			value = -value;
+			eval = -eval;
+			if (bound == BOUND_UPPER) {
+				bound = BOUND_LOWER;
+			} else if (bound == BOUND_LOWER) {
+				bound = BOUND_UPPER;
 			}
+		}
 
-			response->set_depth(entry->depth());
-			FillValue(eval, response->mutable_eval());
+		response->set_depth(entry->depth());
+		FillValue(eval, response->mutable_eval());
+		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.
-			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);
-			}
+		}
+		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()) &&
+		       pos->pseudo_legal(entry->move()) &&
+		       pos->legal(entry->move())) {
+			FillMove(pos, entry->move(), response->add_pv());
+			if (seen.count(pos->key())) break;
+			pv.push(entry->move());
+			seen.insert(pos->key());
+			setup_states->push_back(StateInfo());
+			pos->do_move(entry->move(), setup_states->back());
+			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();
-			}
+		// 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 HashProbeImpl::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;
-
-	ServerBuilder builder;
+}
+
+HashProbeThread::HashProbeThread(const std::string &server_address) {
 	builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
 	builder.RegisterService(&service);
-	std::unique_ptr<Server> server(builder.BuildAndStart());
+	server = std::move(builder.BuildAndStart());
 	std::cout << "Server listening on " << server_address << std::endl;
-	server->Wait();
+	std::thread([this]{ server->Wait(); }).detach();
+}
+
+void HashProbeThread::Shutdown() {
+	server->Shutdown();
 }
 
 namespace PSQT {
@@ -174,8 +246,6 @@ int main(int argc, char* argv[]) {
   Threads.set(Options["Threads"]);
   Search::clear(); // After threads are up
 
-  std::thread(&rpc_thread).detach();
-
   UCI::loop(argc, argv);
 
   Threads.set(0);