Get rid of struct Time

We just need the milliseconds of current system
time for our needs. This allows to simplify the
API.

No functional change.

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 5fcaa88738f21305dc66e4934f877c5b3a76288e..f59ded730d6f3f6f0751a568a7f55e476927994e 100644 (file)
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -111,7 +111,7 @@ void benchmark(const Position& current, istream& is) {
 
   int64_t nodes = 0;
   Search::StateStackPtr st;
-  Time time = Time::now();
+  Time::point t = Time::now();
 
   for (size_t i = 0; i < fens.size(); i++)
   {
@@ -133,7 +133,7 @@ void benchmark(const Position& current, istream& is) {
       }
   }
 
-  int e = time.elapsed() + 1; // Assure positive to avoid a 'divide by zero'
+  int e = Time::now() - t + 1; // Assure positive to avoid a 'divide by zero'
 
   cerr << "\n==========================="
        << "\nTotal time (ms) : " << e

diff --git a/src/book.cpp b/src/book.cpp
index cdf1bd913a773a0dd86473f52995ae87f6b7270e..77bdc740a7c0ed294b3c93f97effbd6cfaa19edd 100644 (file)
--- a/src/book.cpp
+++ b/src/book.cpp
@@ -340,7 +340,7 @@ namespace {
 
 Book::Book() {
 
-  for (int i = Time::now().msec() % 10000; i > 0; i--)
+  for (int i = Time::now() % 10000; i > 0; i--)
       RKiss.rand<unsigned>(); // Make random number generation less deterministic
 }
 

diff --git a/src/misc.cpp b/src/misc.cpp
index 75a294a1c1a182c0487c8773129d4b2dc8a160cb..fefa8d4f33cbd2dd7a74ff57f6a481e14468025b 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -68,6 +68,13 @@ const string engine_info(bool to_uci) {
 }
 
 
+/// Convert system time to milliseconds. That's all we need.
+
+Time::point Time::now() {
+  sys_time_t t; system_time(&t); return time_to_msec(t);
+}
+
+
 /// Debug functions used mainly to collect run-time statistics
 
 static uint64_t hits[2], means[2];
@@ -201,7 +208,7 @@ void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
   int tm = msec;
 #else
   timespec ts, *tm = &ts;
-  uint64_t ms = Time::now().msec() + msec;
+  uint64_t ms = Time::now() + msec;
 
   ts.tv_sec = ms / 1000;
   ts.tv_nsec = (ms % 1000) * 1000000LL;

diff --git a/src/misc.h b/src/misc.h
index 02ae8b3890f728a3a6537bb6aebea4ee3f5e4413..9650f06eb3c88a2623e9824ca48e569ed8ece46f 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -44,15 +44,10 @@ struct Log : public std::ofstream {
 };
 
 
-struct Time {
-  int64_t msec() const { return time_to_msec(t); }
-  int elapsed() const { return int(now().msec() - msec()); }
-
-  static Time now() { Time t; system_time(&t.t); return t; }
-
-private:
-  sys_time_t t;
-};
+namespace Time {
+  typedef int64_t point;
+  point now();
+}
 
 
 template<class Entry, int Size>

diff --git a/src/search.cpp b/src/search.cpp
index 827f074787ed879407d3f51c5253ab75dfe367f8..1cf9428ef43e47c5610e611350386877d2257edf 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -42,7 +42,7 @@ namespace Search {
   LimitsType Limits;
   std::vector<RootMove> RootMoves;
   Position RootPosition;
-  Time SearchTime;
+  Time::point SearchTime;
   StateStackPtr SetupStates;
 }
 
@@ -290,7 +290,7 @@ void Search::think() {
 
   if (Options["Use Search Log"])
   {
-      int e = SearchTime.elapsed();
+      int e = Time::now() - SearchTime;
 
       Log log(Options["Search Log Filename"]);
       log << "Nodes: "          << pos.nodes_searched()
@@ -398,7 +398,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) || SearchTime.elapsed() > 2000)
+                if ((bestValue > alpha && bestValue < beta) || Time::now() - SearchTime > 2000)
                     sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
 
                 // In case of failing high/low increase aspiration window and
@@ -431,7 +431,7 @@ namespace {
         if (!Signals.stop && Options["Use Search Log"])
         {
             Log log(Options["Search Log Filename"]);
-            log << pretty_pv(pos, depth, bestValue, SearchTime.elapsed(), &RootMoves[0].pv[0])
+            log << pretty_pv(pos, depth, bestValue, Time::now() - SearchTime, &RootMoves[0].pv[0])
                 << std::endl;
         }
 
@@ -451,14 +451,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 (SearchTime.elapsed() > (TimeMgr.available_time() * 62) / 100)
+            if (Time::now() - SearchTime > (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())
-                    || SearchTime.elapsed() > (TimeMgr.available_time() * 40) / 100))
+                    || Time::now() - SearchTime > (TimeMgr.available_time() * 40) / 100))
             {
                 Value rBeta = bestValue - EasyMoveMargin;
                 (ss+1)->excludedMove = RootMoves[0].pv[0];
@@ -827,7 +827,7 @@ split_point_start: // At split points actual search starts from here
       {
           Signals.firstRootMove = (moveCount == 1);
 
-          if (thisThread == Threads.main_thread() && SearchTime.elapsed() > 2000)
+          if (thisThread == Threads.main_thread() && Time::now() - SearchTime > 2000)
               sync_cout << "info depth " << depth / ONE_PLY
                         << " currmove " << move_to_uci(move, Chess960)
                         << " currmovenumber " << moveCount + PVIdx << sync_endl;
@@ -1494,7 +1494,7 @@ split_point_start: // At split points actual search starts from here
     static RKISS rk;
 
     // PRNG sequence should be not deterministic
-    for (int i = Time::now().msec() % 50; i > 0; i--)
+    for (int i = Time::now() % 50; i > 0; i--)
         rk.rand<unsigned>();
 
     // RootMoves are already sorted by score in descending order
@@ -1536,7 +1536,7 @@ split_point_start: // At split points actual search starts from here
   string uci_pv(const Position& pos, int depth, Value alpha, Value beta) {
 
     std::stringstream s;
-    int t = SearchTime.elapsed();
+    int t = Time::now() - SearchTime;
     int selDepth = 0;
 
     for (size_t i = 0; i < Threads.size(); i++)
@@ -1749,9 +1749,9 @@ void Thread::idle_loop() {
 
 void check_time() {
 
-  static Time lastInfoTime = Time::now();
+  static Time::point lastInfoTime = Time::now();
 
-  if (lastInfoTime.elapsed() >= 1000)
+  if (Time::now() - lastInfoTime >= 1000)
   {
       lastInfoTime = Time::now();
       dbg_print();
@@ -1760,7 +1760,7 @@ void check_time() {
   if (Limits.ponder)
       return;
 
-  int e = SearchTime.elapsed();
+  int e = Time::now() - SearchTime;
   bool stillAtFirstMove =    Signals.firstRootMove
                          && !Signals.failedLowAtRoot
                          &&  e > TimeMgr.available_time();

diff --git a/src/search.h b/src/search.h
index 63b9b3264a7fb1f138bbe7e6705e119602069251..5f9b74d7e530e4b0df12bc6e851678b9bc845249 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -99,7 +99,7 @@ extern volatile SignalsType Signals;
 extern LimitsType Limits;
 extern std::vector<RootMove> RootMoves;
 extern Position RootPosition;
-extern Time SearchTime;
+extern Time::point SearchTime;
 extern StateStackPtr SetupStates;
 
 extern void init();