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>
vector<string> fens;
Search::LimitsType limits;
vector<string> fens;
Search::LimitsType limits;
int64_t nodes = 0;
// Assign default values to missing arguments
int64_t nodes = 0;
// Assign default values to missing arguments
else
fens.assign(Defaults, Defaults + 16);
else
fens.assign(Defaults, Defaults + 16);
+ Time time = Time::current_time();
for (size_t i = 0; i < fens.size(); i++)
{
for (size_t i = 0; i < fens.size(); i++)
{
- time = system_time() - time;
+ int e = time.elapsed();
cerr << "\n==========================="
cerr << "\n==========================="
- << "\nTotal time (ms) : " << time
+ << "\nTotal time (ms) : " << e
<< "\nNodes searched : " << nodes
<< "\nNodes searched : " << nodes
- << "\nNodes/second : " << int(nodes / (time / 1000.0)) << endl;
+ << "\nNodes/second : " << int(nodes / (e / 1000.0)) << endl;
- for (int i = abs(system_time() % 10000); i > 0; i--)
+ for (int i = Time::current_time().msec() % 10000; i > 0; i--)
RKiss.rand<unsigned>(); // Make random number generation less deterministic
}
RKiss.rand<unsigned>(); // Make random number generation less deterministic
}
#if defined(_WIN32) || defined(_WIN64)
#if defined(_WIN32) || defined(_WIN64)
-#define _CRT_SECURE_NO_DEPRECATE
#define NOMINMAX // disable macros min() and max()
#include <windows.h>
#define NOMINMAX // disable macros min() and max()
#include <windows.h>
-# include <sys/time.h>
-# include <sys/types.h>
# include <unistd.h>
# if defined(__hpux)
# include <sys/pstat.h>
# include <unistd.h>
# if defined(__hpux)
# include <sys/pstat.h>
s << "Stockfish " << Tag
<< setfill('0') << " " << year.substr(2)
<< setw(2) << (1 + months.find(month) / 4)
s << "Stockfish " << Tag
<< setfill('0') << " " << year.substr(2)
<< setw(2) << (1 + months.find(month) / 4)
- << setw(2) << day << cpu64 << popcnt;
- s << "Stockfish " << Version << cpu64 << popcnt;
+ s << "Stockfish " << Version;
- s << (to_uci ? "\nid author ": " by ")
+ s << cpu64 << popcnt << (to_uci ? "\nid author ": " by ")
<< "Tord Romstad, Marco Costalba and Joona Kiiski";
return s.str();
<< "Tord Romstad, Marco Costalba and Joona Kiiski";
return s.str();
-/// system_time() returns the current system time, measured in milliseconds
-
-int system_time() {
-
-#if defined(_WIN32) || defined(_WIN64)
- struct _timeb t;
- _ftime(&t);
- return int(t.time * 1000 + t.millitm);
-#else
- struct timeval t;
- gettimeofday(&t, NULL);
- return t.tv_sec * 1000 + t.tv_usec / 1000;
-#endif
-}
-
-
/// cpu_count() tries to detect the number of CPU cores
int cpu_count() {
/// cpu_count() tries to detect the number of CPU cores
int cpu_count() {
#include "types.h"
extern const std::string engine_info(bool to_uci = false);
#include "types.h"
extern const std::string engine_info(bool to_uci = false);
-extern int system_time();
extern int cpu_count();
extern void timed_wait(WaitCondition&, Lock&, int);
extern void prefetch(char* addr);
extern int cpu_count();
extern void timed_wait(WaitCondition&, Lock&, int);
extern void prefetch(char* addr);
extern const std::string move_to_uci(Move m, bool chess960);
extern const std::string move_to_san(Position& pos, Move m);
extern const std::string move_to_uci(Move m, bool chess960);
extern const std::string move_to_san(Position& pos, Move m);
struct Log : public std::ofstream {
Log(const std::string& f = "log.txt") : std::ofstream(f.c_str(), std::ios::out | std::ios::app) {}
~Log() { if (is_open()) close(); }
};
struct Log : public std::ofstream {
Log(const std::string& f = "log.txt") : std::ofstream(f.c_str(), std::ios::out | std::ios::app) {}
~Log() { if (is_open()) close(); }
};
+
+class Time {
+public:
+ void restart() { system_time(&t); }
+ uint64_t msec() const { return time_to_msec(t); }
+ int elapsed() const { return int(current_time().msec() - time_to_msec(t)); }
+
+ static Time current_time() { Time t; t.restart(); return t; }
+
+private:
+ my_time_t t;
+};
+
#endif // !defined(MISC_H_INCLUDED)
#endif // !defined(MISC_H_INCLUDED)
size_t MultiPV, UCIMultiPV, PVIdx;
TimeManager TimeMgr;
size_t MultiPV, UCIMultiPV, PVIdx;
TimeManager TimeMgr;
int BestMoveChanges;
int SkillLevel;
bool SkillLevelEnabled, Chess960;
int BestMoveChanges;
int SkillLevel;
bool SkillLevelEnabled, Chess960;
bool connected_threat(const Position& pos, Move m, Move threat);
Value refine_eval(const TTEntry* tte, Value defaultEval, int ply);
Move do_skill_level();
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);
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);
Position& pos = RootPosition;
Chess960 = pos.is_chess960();
Position& pos = RootPosition;
Chess960 = pos.is_chess960();
TimeMgr.init(Limits, pos.startpos_ply_counter());
TT.new_search();
H.clear();
TimeMgr.init(Limits, pos.startpos_ply_counter());
TT.new_search();
H.clear();
if (Options["Use Search Log"])
{
if (Options["Use Search Log"])
{
- int e = elapsed_time();
+ int e = SearchTime.elapsed();
Log log(Options["Search Log Filename"]);
log << "Nodes: " << pos.nodes_searched()
Log log(Options["Search Log Filename"]);
log << "Nodes: " << pos.nodes_searched()
// 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.
// 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
pv_info_to_uci(pos, depth, alpha, beta);
// In case of failing high/low increase aspiration window and
skillBest = do_skill_level();
if (!Signals.stop && Options["Use Search Log"])
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)
// Filter out startup noise when monitoring best move stability
if (depth > 2 && BestMoveChanges)
// 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.
// 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())
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];
{
Value rBeta = bestValue - EasyMoveMargin;
(ss+1)->excludedMove = RootMoves[0].pv[0];
{
Signals.firstRootMove = (moveCount == 1);
{
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;
cout << "info depth " << depth / ONE_PLY
<< " currmove " << move_to_uci(move, Chess960)
<< " currmovenumber " << moveCount + PVIdx << endl;
- // 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:
//
// score_to_uci() converts a value to a string suitable for use with the UCI
// protocol specifications:
//
void pv_info_to_uci(const Position& pos, int depth, Value alpha, Value beta) {
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++)
int selDepth = 0;
for (int i = 0; i < Threads.size(); i++)
static RKISS rk;
// PRNG sequence should be not deterministic
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
rk.rand<unsigned>();
// RootMoves are already sorted by score in descending order
- 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;
dbg_print();
}
if (Limits.ponder)
return;
+ int e = SearchTime.elapsed();
bool stillAtFirstMove = Signals.firstRootMove
&& !Signals.failedLowAtRoot
&& e > TimeMgr.available_time();
bool stillAtFirstMove = Signals.firstRootMove
&& !Signals.failedLowAtRoot
&& e > TimeMgr.available_time();
#pragma warning(disable: 4127) // Conditional expression is constant
#pragma warning(disable: 4146) // Unary minus operator applied to unsigned type
#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
#pragma warning(disable: 4127) // Conditional expression is constant
#pragma warning(disable: 4146) // Unary minus operator applied to unsigned type
#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
+#pragma warning(disable: 4996) // Function _ftime() may be unsafe
// MSVC does not support <inttypes.h>
typedef signed __int8 int8_t;
// MSVC does not support <inttypes.h>
typedef signed __int8 int8_t;
# include <inttypes.h>
#endif
# include <inttypes.h>
#endif
+#if defined(_WIN32) || defined(_WIN64)
+# include <sys/timeb.h>
+typedef _timeb my_time_t;
+
+inline void system_time(my_time_t* t) { _ftime(t); }
+inline uint64_t time_to_msec(const my_time_t& t) { return t.time * 1000 + t.millitm; }
+#else
+# include <sys/time.h>
+typedef timeval my_time_t;
+
+inline void system_time(my_time_t* t) { gettimeofday(t, NULL); }
+inline uint64_t time_to_msec(const my_time_t& t) { return t.tv_sec * 1000 + t.tv_usec / 1000; }
+#endif
+
#if defined(_WIN64)
# include <intrin.h> // MSVC popcnt and bsfq instrinsics
# define IS_64BIT
#if defined(_WIN64)
# include <intrin.h> // MSVC popcnt and bsfq instrinsics
# define IS_64BIT
void perft(Position& pos, istringstream& is) {
void perft(Position& pos, istringstream& is) {
if (!(is >> depth))
return;
if (!(is >> depth))
return;
+ Time time = Time::current_time();
int64_t n = Search::perft(pos, depth * ONE_PLY);
int64_t n = Search::perft(pos, depth * ONE_PLY);
- time = system_time() - time;
+ int e = time.elapsed();
std::cout << "\nNodes " << n
std::cout << "\nNodes " << n
- << "\nTime (ms) " << time
- << "\nNodes/second " << int(n / (time / 1000.0)) << std::endl;
+ << "\nTime (ms) " << e
+ << "\nNodes/second " << int(n / (e / 1000.0)) << std::endl;