Browse Source

Merge pull request #7094

1bb289f Assert now > 0 in GetTime GetTimeMillis GetTimeMicros (Patick Strateman)
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
34e02e0147
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 12
      src/utiltime.cpp

12
src/utiltime.cpp

@ -20,7 +20,9 @@ int64_t GetTime() @@ -20,7 +20,9 @@ int64_t GetTime()
{
if (nMockTime) return nMockTime;
return time(NULL);
time_t now = time(NULL);
assert(now > 0);
return now;
}
void SetMockTime(int64_t nMockTimeIn)
@ -30,14 +32,18 @@ void SetMockTime(int64_t nMockTimeIn) @@ -30,14 +32,18 @@ void SetMockTime(int64_t nMockTimeIn)
int64_t GetTimeMillis()
{
return (boost::posix_time::microsec_clock::universal_time() -
int64_t now = (boost::posix_time::microsec_clock::universal_time() -
boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_milliseconds();
assert(now > 0);
return now;
}
int64_t GetTimeMicros()
{
return (boost::posix_time::microsec_clock::universal_time() -
int64_t now = (boost::posix_time::microsec_clock::universal_time() -
boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_microseconds();
assert(now > 0);
return now;
}
/** Return a time useful for the debug log */

Loading…
Cancel
Save