Fix #5369

ScopedOnceTimer doesn't need no stinkin' hash
spring · Oct 21, 2016 · 3328bdf · 3328bdf
1 parent d2c19e9
commit 3328bdf
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/rts/System/TimeProfiler.cpp b/rts/System/TimeProfiler.cpp
@@ -127,10 +127,29 @@ ScopedTimer::~ScopedTimer()
 		profiler.AddTime(GetName(), GetDuration(), autoShowGraph);
 }
 
+ScopedOnceTimer::ScopedOnceTimer(const char* name_)
+ : starttime(spring_gettime())
+ , name(name_)
+{ }
+
+ScopedOnceTimer::ScopedOnceTimer(const std::string& name_)
+ : starttime(spring_gettime())
+ , name(name_)
+{ }
+
+const std::string& ScopedOnceTimer::GetName() const
+{
+	return name;
+}
+
+spring_time ScopedOnceTimer::GetDuration() const
+{
+	return spring_difftime(spring_gettime(), starttime);
+}
+
 ScopedOnceTimer::~ScopedOnceTimer()
 {
 	LOG("%s: %i ms", GetName().c_str(), int(GetDuration().toMilliSecsi()));
-	hashToName.erase(nameIterator);
 }
 
 

diff --git a/rts/System/TimeProfiler.h b/rts/System/TimeProfiler.h
@@ -71,12 +71,18 @@ class ScopedMtTimer : public BasicTimer
 /**
  * @brief print passed time to infolog
  */
-class ScopedOnceTimer : public BasicTimer
+class ScopedOnceTimer
 {
 public:
-	ScopedOnceTimer(const std::string& name): BasicTimer(name) {}
-	ScopedOnceTimer(const char* name): BasicTimer(name) {}
+	ScopedOnceTimer(const std::string& name);
+	ScopedOnceTimer(const char* name);
 	~ScopedOnceTimer();
+	const std::string& GetName() const;
+	spring_time GetDuration() const;
+
+protected:
+	const spring_time starttime;
+	std::string name;
 };