LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Packages Projects Releases 32 Wiki Activity

fix tsan: utiltime race on nMockTime

Browse source
This commit is contained in:
Pieter Wuille 2017-02-11 12:37:05 -08:00
parent 321bbc2079
commit 1d31093d4d
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/utiltime.cpp
View file

@ -9,14 +9,17 @@
#include "utiltime.h" #include "utiltime.h"
#include <atomic>
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
static int64_t nMockTime = 0; //!< For unit testing static std::atomic<int64_t> nMockTime(0); //!< For unit testing
int64_t GetTime() int64_t GetTime()
{ {
if (nMockTime) return nMockTime; int64_t mocktime = nMockTime.load(std::memory_order_relaxed);
if (mocktime) return mocktime;
time_t now = time(NULL); time_t now = time(NULL);
assert(now > 0); assert(now > 0);
@ -25,7 +28,7 @@ int64_t GetTime()
void SetMockTime(int64_t nMockTimeIn) void SetMockTime(int64_t nMockTimeIn)
{ {
nMockTime = nMockTimeIn; nMockTime.store(nMockTimeIn, std::memory_order_relaxed);
} }
int64_t GetTimeMillis() int64_t GetTimeMillis()
@ -52,7 +55,8 @@ int64_t GetSystemTimeInSeconds()
/** Return a time useful for the debug log */ /** Return a time useful for the debug log */
int64_t GetLogTimeMicros() int64_t GetLogTimeMicros()
{ {
if (nMockTime) return nMockTime*1000000; int64_t mocktime = nMockTime.load(std::memory_order_relaxed);
if (mocktime) return mocktime*1000000;
return GetTimeMicros(); return GetTimeMicros();
} }