diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dirs.cpp | 2 | ||||
| -rw-r--r-- | src/progs/dyecmd/client.cpp | 2 | ||||
| -rw-r--r-- | src/progs/manaverse/client.cpp | 2 | ||||
| -rw-r--r-- | src/utils/performance.cpp | 19 |
4 files changed, 14 insertions, 11 deletions
diff --git a/src/dirs.cpp b/src/dirs.cpp index 131e8a090..4729b4d79 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -376,7 +376,7 @@ void Dirs::initLocalDataDir() "Exiting."), settings.localDataDir.c_str())); } #ifdef USE_PROFILER - Perfomance::init(pathJoin(settings.localDataDir, "profiler.log")); + Performance::init(pathJoin(settings.localDataDir, "profiler.log")); #endif // USE_PROFILER } diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp index a892b758c..860022fad 100644 --- a/src/progs/dyecmd/client.cpp +++ b/src/progs/dyecmd/client.cpp @@ -507,7 +507,7 @@ void Client::gameClear() logger->log1("Quitting11"); #ifdef USE_PROFILER - Perfomance::clear(); + Performance::clear(); #endif // USE_PROFILER #ifdef DEBUG_OPENGL_LEAKS diff --git a/src/progs/manaverse/client.cpp b/src/progs/manaverse/client.cpp index ece3c9d8d..91439d589 100644 --- a/src/progs/manaverse/client.cpp +++ b/src/progs/manaverse/client.cpp @@ -754,7 +754,7 @@ void Client::gameClear() logger->log1("Quitting11"); #ifdef USE_PROFILER - Perfomance::clear(); + Performance::clear(); #endif // USE_PROFILER #ifdef DEBUG_OPENGL_LEAKS diff --git a/src/utils/performance.cpp b/src/utils/performance.cpp index ccc232aa4..e18e848e4 100644 --- a/src/utils/performance.cpp +++ b/src/utils/performance.cpp @@ -28,6 +28,7 @@ #include "configuration.h" #include "game.h" +#include "utils/cast.h" #include "utils/timer.h" #include <algorithm> @@ -41,8 +42,8 @@ static const clockid_t clockType = CLOCK_MONOTONIC; -#define timeData ((static_cast<long long int>(time.tv_sec) * 1000000000LL \ - + static_cast<long long int>(time.tv_nsec)) / 1) +#define timeData \ + (CAST_U64(time.tv_sec) * 1000000000LL + CAST_U64(time.tv_nsec)) namespace Performance { @@ -69,24 +70,26 @@ namespace Performance { timespec time; clock_gettime(clockType, &time); - temp.append(toString(timeData - startTime)).append( - " __init__\n"); + temp.append(toString(CAST_U64(timeData - startTime))) + .append(" __init__\n"); } void blockStart(const std::string &name) { timespec time; clock_gettime(clockType, &time); - temp.append(toString(timeData - startTime)).append( - " start: ").append(name).append("\n"); + temp.append(toString(CAST_U64(timeData - startTime))) + .append(" start: ") + .append(name).append("\n"); } void blockEnd(const std::string &name) { timespec time; clock_gettime(clockType, &time); - temp.append(toString(timeData - startTime)).append( - " end: ").append(name).append("\n"); + temp.append(toString(CAST_U64(timeData - startTime))) + .append(" end: ") + .append(name).append("\n"); } void flush() |