From: Marco Costalba <mcostalba@gmail.com>
Date: Sat, 3 Aug 2013 16:30:43 +0000 (+0200)
Subject: Streamline time computation
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=f31847302d4ec62f4da7d22447d6c9fbf36230dc;ds=sidebyside

Streamline time computation

No functional change.
---

diff --git a/src/misc.cpp b/src/misc.cpp
index 28eff708..5bf7bae8 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -59,13 +59,6 @@ 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];
diff --git a/src/misc.h b/src/misc.h
index f14308af..82baa580 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -45,7 +45,7 @@ struct Log : public std::ofstream {
 
 namespace Time {
   typedef int64_t point;
-  point now();
+  inline point now() { return system_time_to_msec(); }
 }
 
 
diff --git a/src/platform.h b/src/platform.h
index af7795b9..ee038984 100644
--- a/src/platform.h
+++ b/src/platform.h
@@ -45,10 +45,12 @@ typedef unsigned __int64 uint64_t;
 #ifndef _WIN32 // Linux - Unix
 
 #  include <sys/time.h>
-typedef timeval sys_time_t;
 
-inline void system_time(sys_time_t* t) { gettimeofday(t, NULL); }
-inline int64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000LL + t.tv_usec / 1000; }
+inline int64_t system_time_to_msec() {
+  timeval t;
+  gettimeofday(&t, NULL);
+  return t.tv_sec * 1000LL + t.tv_usec / 1000;
+}
 
 #  include <pthread.h>
 typedef pthread_mutex_t Lock;
@@ -71,10 +73,12 @@ typedef void*(*pt_start_fn)(void*);
 #else // Windows and MinGW
 
 #  include <sys/timeb.h>
-typedef _timeb sys_time_t;
 
-inline void system_time(sys_time_t* t) { _ftime(t); }
-inline int64_t time_to_msec(const sys_time_t& t) { return t.time * 1000LL + t.millitm; }
+inline int64_t system_time_to_msec() {
+  _timeb t;
+  _ftime(&t);
+  return t.time * 1000LL + t.millitm;
+}
 
 #ifndef NOMINMAX
 #  define NOMINMAX // disable macros min() and max()