diff options
author | Patick Strateman <patrick.strateman@gmail.com> | 2015-11-24 18:39:19 -0800 |
---|---|---|
committer | Patick Strateman <patrick.strateman@gmail.com> | 2015-11-24 18:39:19 -0800 |
commit | 1bb289fe1b7d240e0d58ef13da30e45590231078 (patch) | |
tree | 5531277d67f4d5bef89be7069d95626e08ce540e /src/utiltime.cpp | |
parent | b19fe277dd6208b80fea837adf9e64631b07f946 (diff) |
Assert now > 0 in GetTime GetTimeMillis GetTimeMicros
Previously all of these functions could return negative values (for different
readons). Large portions of the codebase currently assume that these
functions return positive values.
Diffstat (limited to 'src/utiltime.cpp')
-rw-r--r-- | src/utiltime.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/utiltime.cpp b/src/utiltime.cpp index 3202c47f1d..7d9f6210eb 100644 --- a/src/utiltime.cpp +++ b/src/utiltime.cpp @@ -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) int64_t GetTimeMillis() { - return (boost::posix_time::microsec_clock::universal_time() - - boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_milliseconds(); + 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() - - boost::posix_time::ptime(boost::gregorian::date(1970,1,1))).total_microseconds(); + 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 */ |