[logging] log system time and mock time

John Newbery · John Newbery · commit 761392db3a72 · 2017-05-10T15:49:00.000-04:00
diff --git a/src/util.cpp b/src/util.cpp
@@ -310,10 +310,14 @@ static std::string LogTimestampStr(const std::string &str, std::atomic_bool *fSt
         return str;
 
     if (*fStartedNewLine) {
-        int64_t nTimeMicros = GetLogTimeMicros();
+        int64_t nTimeMicros = GetTimeMicros();
         strStamped = DateTimeStrFormat("%Y-%m-%d %H:%M:%S", nTimeMicros/1000000);
         if (fLogTimeMicros)
             strStamped += strprintf(".%06d", nTimeMicros%1000000);
+        int64_t mocktime = GetMockTime();
+        if (mocktime) {
+            strStamped += " (mocktime: " + DateTimeStrFormat("%Y-%m-%d %H:%M:%S", mocktime) + ")";
+        }
         strStamped += ' ' + str;
     } else
         strStamped = str;
diff --git a/src/utiltime.cpp b/src/utiltime.cpp
@@ -31,6 +31,11 @@ void SetMockTime(int64_t nMockTimeIn)
     nMockTime.store(nMockTimeIn, std::memory_order_relaxed);
 }
 
+int64_t GetMockTime()
+{
+    return nMockTime.load(std::memory_order_relaxed);
+}
+
 int64_t GetTimeMillis()
 {
     int64_t now = (boost::posix_time::microsec_clock::universal_time() -
@@ -52,15 +57,6 @@ int64_t GetSystemTimeInSeconds()
     return GetTimeMicros()/1000000;
 }
 
-/** Return a time useful for the debug log */
-int64_t GetLogTimeMicros()
-{
-    int64_t mocktime = nMockTime.load(std::memory_order_relaxed);
-    if (mocktime) return mocktime*1000000;
-
-    return GetTimeMicros();
-}
-
 void MilliSleep(int64_t n)
 {
 
diff --git a/src/utiltime.h b/src/utiltime.h
@@ -23,8 +23,8 @@ int64_t GetTime();
 int64_t GetTimeMillis();
 int64_t GetTimeMicros();
 int64_t GetSystemTimeInSeconds(); // Like GetTime(), but not mockable
-int64_t GetLogTimeMicros();
 void SetMockTime(int64_t nMockTimeIn);
+int64_t GetMockTime();
 void MilliSleep(int64_t n);
 
 std::string DateTimeStrFormat(const char* pszFormat, int64_t nTime);

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,11 @@ void SetMockTime(int64_t nMockTimeIn)`
`31`	`31`	`nMockTime.store(nMockTimeIn, std::memory_order_relaxed);`
`32`	`32`	`}`
`33`	`33`
	`34`	`+int64_t GetMockTime()`
	`35`	`+{`
	`36`	`+ return nMockTime.load(std::memory_order_relaxed);`
	`37`	`+}`
	`38`	`+`
`34`	`39`	`int64_t GetTimeMillis()`
`35`	`40`	`{`
`36`	`41`	`int64_t now = (boost::posix_time::microsec_clock::universal_time() -`
`@@ -52,15 +57,6 @@ int64_t GetSystemTimeInSeconds()`
`52`	`57`	`return GetTimeMicros()/1000000;`
`53`	`58`	`}`
`54`	`59`
`55`		`-/** Return a time useful for the debug log */`
`56`		`-int64_t GetLogTimeMicros()`
`57`		`-{`
`58`		`- int64_t mocktime = nMockTime.load(std::memory_order_relaxed);`
`59`		`- if (mocktime) return mocktime*1000000;`
`60`		`-`
`61`		`- return GetTimeMicros();`
`62`		`-}`
`63`		`-`
`64`	`60`	`void MilliSleep(int64_t n)`
`65`	`61`	`{`
`66`	`62`