diff options
author | SmallJoker <SmallJoker@users.noreply.github.com> | 2017-05-26 14:03:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-26 14:03:36 +0200 |
commit | d99b6fed5517797bfafe4bbb307963967f0ca749 (patch) | |
tree | 0a4ff946a9d8bbcd1e921d3981eec96e988bc5c8 /src/util/timetaker.cpp | |
parent | 4d5ce8478c959a4ee5b13ef9ba7e46b28d089a21 (diff) | |
download | minetest-d99b6fed5517797bfafe4bbb307963967f0ca749.tar.gz minetest-d99b6fed5517797bfafe4bbb307963967f0ca749.tar.bz2 minetest-d99b6fed5517797bfafe4bbb307963967f0ca749.zip |
Time: Change old `u32` timestamps to 64-bit (#5818)
MacOSX build fix + cleanups
Diffstat (limited to 'src/util/timetaker.cpp')
-rw-r--r-- | src/util/timetaker.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/util/timetaker.cpp b/src/util/timetaker.cpp index 0e92696ac..ac686c3a3 100644 --- a/src/util/timetaker.cpp +++ b/src/util/timetaker.cpp @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "../log.h" #include <ostream> -TimeTaker::TimeTaker(const char *name, u32 *result, TimePrecision prec) +TimeTaker::TimeTaker(const std::string &name, u64 *result, TimePrecision prec) { m_name = name; m_result = result; @@ -32,18 +32,13 @@ TimeTaker::TimeTaker(const char *name, u32 *result, TimePrecision prec) m_time1 = porting::getTime(prec); } -u32 TimeTaker::stop(bool quiet) +u64 TimeTaker::stop(bool quiet) { - if(m_running) - { - u32 time2 = porting::getTime(m_precision); - u32 dtime = time2 - m_time1; - if(m_result != NULL) - { + if (m_running) { + u64 dtime = porting::getTime(m_precision) - m_time1; + if (m_result != NULL) { (*m_result) += dtime; - } - else - { + } else { if (!quiet) { static const char* const units[] = { "s" /* PRECISION_SECONDS */, @@ -62,10 +57,8 @@ u32 TimeTaker::stop(bool quiet) return 0; } -u32 TimeTaker::getTimerTime() +u64 TimeTaker::getTimerTime() { - u32 time2 = porting::getTime(m_precision); - u32 dtime = time2 - m_time1; - return dtime; + return porting::getTime(m_precision) - m_time1; } |