Rename current_time() to now()

Follow C++11 naming conventions.

No functional change.

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 9dc103ed1992681b0fdef8252d3cc36cd73cb140..5fcaa88738f21305dc66e4934f877c5b3a76288e 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;
 
   int64_t nodes = 0;
   Search::StateStackPtr st;

-  Time time = Time::current_time();
+  Time time = Time::now();

 
   for (size_t i = 0; i < fens.size(); i++)
   {
 
   for (size_t i = 0; i < fens.size(); i++)
   {

diff --git a/src/book.cpp b/src/book.cpp
index ba56e777e0b13203c8743413b8fe29fa6fa8eba3..cdf1bd913a773a0dd86473f52995ae87f6b7270e 100644 (file)
--- a/src/book.cpp
+++ b/src/book.cpp
@@ -340,7 +340,7 @@ namespace {
 
 Book::Book() {
 
 
 Book::Book() {
 

-  for (int i = Time::current_time().msec() % 10000; i > 0; i--)
+  for (int i = Time::now().msec() % 10000; i > 0; i--)

       RKiss.rand<unsigned>(); // Make random number generation less deterministic
 }
 
       RKiss.rand<unsigned>(); // Make random number generation less deterministic
 }
 

diff --git a/src/misc.cpp b/src/misc.cpp
index ababdbc1d7df8d4276e0de838a0ef34e5faf3071..75a294a1c1a182c0487c8773129d4b2dc8a160cb 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -201,7 +201,7 @@ void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
   int tm = msec;
 #else
   timespec ts, *tm = &ts;
   int tm = msec;
 #else
   timespec ts, *tm = &ts;

-  uint64_t ms = Time::current_time().msec() + msec;
+  uint64_t ms = Time::now().msec() + msec;

 
   ts.tv_sec = ms / 1000;
   ts.tv_nsec = (ms % 1000) * 1000000LL;
 
   ts.tv_sec = ms / 1000;
   ts.tv_nsec = (ms % 1000) * 1000000LL;

diff --git a/src/misc.h b/src/misc.h
index 1241503ffb6f892ecc3d2a0d13b392720cd891b9..02ae8b3890f728a3a6537bb6aebea4ee3f5e4413 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -46,9 +46,9 @@ struct Log : public std::ofstream {
 
 struct Time {
   int64_t msec() const { return time_to_msec(t); }
 
 struct Time {
   int64_t msec() const { return time_to_msec(t); }

-  int elapsed() const { return int(current_time().msec() - msec()); }
+  int elapsed() const { return int(now().msec() - msec()); }

 
 

-  static Time current_time() { Time t; system_time(&t.t); return t; }
+  static Time now() { Time t; system_time(&t.t); return t; }

 
 private:
   sys_time_t t;
 
 private:
   sys_time_t t;

diff --git a/src/search.cpp b/src/search.cpp
index 53a99f66036f66932ccc6e01b1ade81f81b51ca3..827f074787ed879407d3f51c5253ab75dfe367f8 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1494,7 +1494,7 @@ split_point_start: // At split points actual search starts from here
     static RKISS rk;
 
     // PRNG sequence should be not deterministic
     static RKISS rk;
 
     // PRNG sequence should be not deterministic

-    for (int i = Time::current_time().msec() % 50; i > 0; i--)
+    for (int i = Time::now().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


@@ -1749,11 +1749,11 @@ void Thread::idle_loop() {
 
 void check_time() {
 
 
 void check_time() {
 

-  static Time lastInfoTime = Time::current_time();
+  static Time lastInfoTime = Time::now();

 
   if (lastInfoTime.elapsed() >= 1000)
   {
 
   if (lastInfoTime.elapsed() >= 1000)
   {

-      lastInfoTime = Time::current_time();
+      lastInfoTime = Time::now();

       dbg_print();
   }
 
       dbg_print();
   }
 

diff --git a/src/thread.cpp b/src/thread.cpp
index d9fa9c512c53cc1a5919ebdf2926035876b793a3..8d522fa2bed9638b8375a859a18e9705ce1b45b6 100644 (file)
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -417,7 +417,7 @@ void ThreadPool::start_searching(const Position& pos, const LimitsType& limits,
                                  const std::vector<Move>& searchMoves, StateStackPtr& states) {
   wait_for_search_finished();
 
                                  const std::vector<Move>& searchMoves, StateStackPtr& states) {
   wait_for_search_finished();
 

-  SearchTime = Time::current_time(); // As early as possible
+  SearchTime = Time::now(); // As early as possible

 
   Signals.stopOnPonderhit = Signals.firstRootMove = false;
   Signals.stop = Signals.failedLowAtRoot = false;
 
   Signals.stopOnPonderhit = Signals.firstRootMove = false;
   Signals.stop = Signals.failedLowAtRoot = false;