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/profiler.h | |
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/profiler.h')
-rw-r--r-- | src/profiler.h | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/src/profiler.h b/src/profiler.h index 6da115972..ce60c6262 100644 --- a/src/profiler.h +++ b/src/profiler.h @@ -193,48 +193,8 @@ class ScopeProfiler { public: ScopeProfiler(Profiler *profiler, const std::string &name, - enum ScopeProfilerType type = SPT_ADD): - m_profiler(profiler), - m_name(name), - m_timer(NULL), - m_type(type) - { - if(m_profiler) - m_timer = new TimeTaker(m_name.c_str()); - } - // name is copied - ScopeProfiler(Profiler *profiler, const char *name, - enum ScopeProfilerType type = SPT_ADD): - m_profiler(profiler), - m_name(name), - m_timer(NULL), - m_type(type) - { - if(m_profiler) - m_timer = new TimeTaker(m_name.c_str()); - } - ~ScopeProfiler() - { - if(m_timer) - { - float duration_ms = m_timer->stop(true); - float duration = duration_ms / 1000.0; - if(m_profiler){ - switch(m_type){ - case SPT_ADD: - m_profiler->add(m_name, duration); - break; - case SPT_AVG: - m_profiler->avg(m_name, duration); - break; - case SPT_GRAPH_ADD: - m_profiler->graphAdd(m_name, duration); - break; - } - } - delete m_timer; - } - } + ScopeProfilerType type = SPT_ADD); + ~ScopeProfiler(); private: Profiler *m_profiler; std::string m_name; |