Further simplify aspiration code

[stockfish] / src / search.h

diff --git a/src/search.h b/src/search.h
index 3262c757cbe05aa4ff50e07ad3711ac3ec453aab..02c209b1646fd4ab92469178a2127ffe30eb9787 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -20,20 +20,21 @@
 #if !defined(SEARCH_H_INCLUDED)
 #define SEARCH_H_INCLUDED
 
-#include "move.h"
-#include "types.h"
-
+#include <cstring>
 #include <vector>
 
+#include "types.h"
+
 class Position;
 struct SplitPoint;
 
-/// The SearchStack struct keeps track of the information we need to remember
-/// from nodes shallower and deeper in the tree during the search.  Each
-/// search thread has its own array of SearchStack objects, indexed by the
-/// current ply.
+namespace Search {
+
+/// The Stack struct keeps track of the information we need to remember from
+/// nodes shallower and deeper in the tree during the search. Each search thread
+/// has its own array of Stack objects, indexed by the current ply.
 
-struct SearchStack {
+struct Stack {
   SplitPoint* sp;
   int ply;
   Move currentMove;
@@ -47,25 +48,35 @@ struct SearchStack {
 };
 
 
-/// The SearchLimits struct stores information sent by GUI about available time
+/// The LimitsType struct stores information sent by GUI about available time
 /// to search the current move, maximum depth/time, if we are in analysis mode
 /// or if we have to ponder while is our opponent's side to move.
 
-struct SearchLimits {
+struct LimitsType {
 
+  LimitsType() {  memset(this, 0, sizeof(LimitsType)); }
   bool useTimeManagement() const { return !(maxTime | maxDepth | maxNodes | infinite); }
 
   int time, increment, movesToGo, maxTime, maxDepth, maxNodes, infinite, ponder;
 };
 
-extern SearchLimits Limits;
+
+/// The SignalsType struct stores volatile flags updated during the search
+/// typically in an async fashion, for instance to stop the search by the GUI.
+
+struct SignalsType {
+  bool stopOnPonderhit, firstRootMove, stop, failedLowAtRoot;
+};
+
+extern volatile SignalsType Signals;
+extern LimitsType Limits;
 extern std::vector<Move> SearchMoves;
-extern Position* RootPosition;
+extern Position RootPosition;
 
-extern void init_search();
+extern void init();
 extern int64_t perft(Position& pos, Depth depth);
 extern void think();
-extern void uci_async_command(const std::string& cmd);
-extern void do_timer_event();
+
+} // namespace
 
 #endif // !defined(SEARCH_H_INCLUDED)