HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-20 00:56:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite time measurement code

Browse Source 
Introduce and use a new Time class designed after
QTime, from Qt framework. Should be a more clear and
self documented code.

As an added benefit we now use 64 bits internally to get
millisecs from system time. This avoids to wrap around
to 0 every 2^32 milliseconds, which is 49.71 days.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba
2012-03-03 09:35:56 +01:00
parent b966adf103
commit 161c6b025e
7 changed files with 56 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/search.cpp
View File

@@ -117,6 +117,7 @@ namespace {
size_t MultiPV, UCIMultiPV, PVIdx;
TimeManager TimeMgr;
Time SearchTime;
int BestMoveChanges;
int SkillLevel;
bool SkillLevelEnabled, Chess960;
@@ -138,7 +139,6 @@ namespace {
bool connected_threat(const Position& pos, Move m, Move threat);
Value refine_eval(const TTEntry* tte, Value defaultEval, int ply);
Move do_skill_level();
int elapsed_time(bool reset = false);
string score_to_uci(Value v, Value alpha = -VALUE_INFINITE, Value beta = VALUE_INFINITE);
void pv_info_to_log(Position& pos, int depth, Value score, int time, Move pv[]);
void pv_info_to_uci(const Position& pos, int depth, Value alpha, Value beta);
@@ -251,7 +251,7 @@ void Search::think() {
Position& pos = RootPosition;
Chess960 = pos.is_chess960();
elapsed_time(true);
SearchTime.restart();
TimeMgr.init(Limits, pos.startpos_ply_counter());
TT.new_search();
H.clear();
@@ -325,7 +325,7 @@ void Search::think() {
if (Options["Use Search Log"])
{
int e = elapsed_time();
int e = SearchTime.elapsed();
Log log(Options["Search Log Filename"]);
log << "Nodes: " << pos.nodes_searched()
@@ -433,7 +433,7 @@ namespace {
// Send full PV info to GUI if we are going to leave the loop or
// if we have a fail high/low and we are deep in the search.
if ((bestValue > alpha && bestValue < beta) || elapsed_time() > 2000)
if ((bestValue > alpha && bestValue < beta) || SearchTime.elapsed() > 2000)
pv_info_to_uci(pos, depth, alpha, beta);
// In case of failing high/low increase aspiration window and
@@ -464,7 +464,7 @@ namespace {
skillBest = do_skill_level();
if (!Signals.stop && Options["Use Search Log"])
pv_info_to_log(pos, depth, bestValue, elapsed_time(), &RootMoves[0].pv[0]);
pv_info_to_log(pos, depth, bestValue, SearchTime.elapsed(), &RootMoves[0].pv[0]);
// Filter out startup noise when monitoring best move stability
if (depth > 2 && BestMoveChanges)
@@ -482,14 +482,14 @@ namespace {
// Stop search if most of available time is already consumed. We
// probably don't have enough time to search the first move at the
// next iteration anyway.
if (elapsed_time() > (TimeMgr.available_time() * 62) / 100)
if (SearchTime.elapsed() > (TimeMgr.available_time() * 62) / 100)
stop = true;
// Stop search early if one move seems to be much better than others
if ( depth >= 12
&& !stop
&& ( (bestMoveNeverChanged && pos.captured_piece_type())
|| elapsed_time() > (TimeMgr.available_time() * 40) / 100))
|| SearchTime.elapsed() > (TimeMgr.available_time() * 40) / 100))
{
Value rBeta = bestValue - EasyMoveMargin;
(ss+1)->excludedMove = RootMoves[0].pv[0];
@@ -858,7 +858,7 @@ split_point_start: // At split points actual search starts from here
{
Signals.firstRootMove = (moveCount == 1);
if (pos.thread() == 0 && elapsed_time() > 2000)
if (pos.thread() == 0 && SearchTime.elapsed() > 2000)
cout << "info depth " << depth / ONE_PLY
<< " currmove " << move_to_uci(move, Chess960)
<< " currmovenumber " << moveCount + PVIdx << endl;
@@ -1524,20 +1524,6 @@ split_point_start: // At split points actual search starts from here
}
// current_search_time() returns the number of milliseconds which have passed
// since the beginning of the current search.
int elapsed_time(bool reset) {
static int searchStartTime;
if (reset)
searchStartTime = system_time();
return system_time() - searchStartTime;
}
// score_to_uci() converts a value to a string suitable for use with the UCI
// protocol specifications:
//
@@ -1566,7 +1552,7 @@ split_point_start: // At split points actual search starts from here
void pv_info_to_uci(const Position& pos, int depth, Value alpha, Value beta) {
int t = elapsed_time();
int t = SearchTime.elapsed();
int selDepth = 0;
for (int i = 0; i < Threads.size(); i++)
@@ -1698,7 +1684,7 @@ split_point_start: // At split points actual search starts from here
static RKISS rk;
// PRNG sequence should be not deterministic
for (int i = abs(system_time() % 50); i > 0; i--)
for (int i = Time::current_time().msec() % 50; i > 0; i--)
rk.rand<unsigned>();
// RootMoves are already sorted by score in descending order
@@ -1902,18 +1888,18 @@ void Thread::idle_loop(SplitPoint* sp_master) {
void check_time() {
static int lastInfoTime;
int e = elapsed_time();
static Time lastInfoTime = Time::current_time();
if (system_time() - lastInfoTime >= 1000 || !lastInfoTime)
if (lastInfoTime.elapsed() >= 1000)
{
lastInfoTime = system_time();
lastInfoTime.restart();
dbg_print();
}
if (Limits.ponder)
return;
int e = SearchTime.elapsed();
bool stillAtFirstMove = Signals.firstRootMove
&& !Signals.failedLowAtRoot
&& e > TimeMgr.available_time();