From: Steinar H. Gunderson Date: Mon, 21 Mar 2016 23:41:52 +0000 (+0100) Subject: Move the hash probe class definition into a header file. X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=62ae6157a36e926c087b0303973e404a05e6de09;hp=f7e14f8032cd390610d8a0a7d7e5cbcb6743bc65 Move the hash probe class definition into a header file. --- diff --git a/src/hashprobe.h b/src/hashprobe.h new file mode 100644 index 00000000..4d0afec9 --- /dev/null +++ b/src/hashprobe.h @@ -0,0 +1,37 @@ +#ifndef HASHPROBE_H_INCLUDED +#define HASHPROBE_H_INCLUDED + +#include "types.h" + +#include +#include + +#include +#include +#include +#include "hashprobe.grpc.pb.h" + +class HashProbeImpl final : public hashprobe::HashProbe::Service { +public: + grpc::Status Probe(grpc::ServerContext* context, + const hashprobe::HashProbeRequest* request, + hashprobe::HashProbeResponse *response); + +private: + void FillMove(Move move, hashprobe::HashProbeMove* decoded); + void ProbeMove(Position* pos, std::stack* setup_states, bool invert, hashprobe::HashProbeLine* response); + void FillValue(Value value, hashprobe::HashProbeScore* score); +}; + +class HashProbeThread { +public: + HashProbeThread(const std::string &server_address); + void Shutdown(); + +private: + HashProbeImpl service; + grpc::ServerBuilder builder; + std::unique_ptr server; +}; + +#endif diff --git a/src/main.cpp b/src/main.cpp index d20d8df4..e80d066d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,6 +32,7 @@ #include #include #include +#include "hashprobe.h" #include "hashprobe.grpc.pb.h" using grpc::Server; @@ -41,129 +42,118 @@ 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"); - } - - bool invert = (pos.side_to_move() == BLACK); - Search::StateStackPtr setup_states = Search::StateStackPtr(new std::stack); +Status HashProbeImpl::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"); + } - ProbeMove(&pos, setup_states.get(), invert, response->mutable_root()); + bool invert = (pos.side_to_move() == BLACK); + Search::StateStackPtr setup_states = Search::StateStackPtr(new std::stack); - MoveList 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); - } + ProbeMove(&pos, setup_states.get(), invert, response->mutable_root()); - return Status::OK; + MoveList 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); } - void FillMove(Move move, HashProbeMove* decoded) { - if (!is_ok(move)) return; + return Status::OK; +} - Square from = from_sq(move); - Square to = to_sq(move); +void HashProbeImpl::FillMove(Move move, HashProbeMove* decoded) { + if (!is_ok(move)) return; - 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)); + Square from = from_sq(move); + Square to = to_sq(move); - if (type_of(move) == PROMOTION) { - decoded->set_promotion(std::string() + " PNBRQK"[promotion_type(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)); - void ProbeMove(Position* pos, std::stack* 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; - } - } + if (type_of(move) == PROMOTION) { + decoded->set_promotion(std::string() + " PNBRQK"[promotion_type(move)]); + } +} - 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 pv; - std::set 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); +void HashProbeImpl::ProbeMove(Position* pos, std::stack* 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; } + } - // Unroll the PV back again, so the Position object remains unchanged. - while (!pv.empty()) { - pos->undo_move(pv.top()); - pv.pop(); - } + 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 pv; + std::set 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); } - } - 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); + // Unroll the PV back again, so the Position object remains unchanged. + while (!pv.empty()) { + pos->undo_move(pv.top()); + pv.pop(); } } -}; - -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(); +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); } +} -private: - HashProbeImpl service; - ServerBuilder builder; - std::unique_ptr server; -}; +HashProbeThread::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 HashProbeThread::Shutdown() { + server->Shutdown(); +} namespace PSQT { void init();