Fix leaks inside ProfileDrawer and TimeProfiler.

rts/Game/UI/ProfileDrawer.cpp

@@ -30,7 +30,6 @@
 
 ProfileDrawer* ProfileDrawer::instance = nullptr;
 
-static constexpr float MAX_THREAD_HIST_TIME = 0.5f; // secs
 static constexpr float MAX_FRAMES_HIST_TIME = 0.5f; // secs
 
 static constexpr float  MIN_X_COOR = 0.6f;
@@ -139,17 +138,11 @@ static void DrawBufferStats(const float2 pos)
 
 static void DrawTimeSlices(
 	std::deque<TimeSlice>& frames,
-	const spring_time curTime,
 	const spring_time maxTime,
 	const float4& drawArea,
 	const float4& sliceColor
 ) {
 	RECOIL_DETAILED_TRACY_ZONE;
-	// remove old entries
-	while (!frames.empty() && (curTime - frames.front().second) > maxTime) {
-		frames.pop_front();
-	}
-
 	const float y1 = drawArea.y;
 	const float y2 = drawArea.w;
 
@@ -220,9 +213,10 @@ static void DrawThreadBarcode(TypedRenderBuffer<VA_TYPE_C   >& rb)
 		font->glFormat(drawArea[0], drawArea[3], 0.7f, FONT_TOP | DBG_FONT_FLAGS | FONT_BUFFERED, "ThreadPool (%.1f seconds :: %u threads)", MAX_THREAD_HIST_TIME, numThreads);
 	}
 	{
-		// need to lock; DrawTimeSlice pop_front()'s old entries from
-		// threadProf while ~ScopedMtTimer can modify it concurrently
+		// Need to lock; CleanupOldThreadProfiles pop_front()'s old entries
+		// from threadProf while ~ScopedMtTimer can modify it concurrently.
 		profiler.ToggleLock(true);
+		profiler.CleanupOldThreadProfiles();
 
 		// bars for each pool-thread profile
 		// Create a virtual row at the top to give some space to see the threads without the title getting in the way.
@@ -233,7 +227,7 @@ static void DrawThreadBarcode(TypedRenderBuffer<VA_TYPE_C   >& rb)
 			float drawArea2[4] = {drawArea[0], 0.0f, drawArea[2], 0.0f};
 			drawArea2[1] = drawArea[1] + ((drawArea[3] - drawArea[1]) / numRows) * i++;
 			drawArea2[3] = drawArea[1] + ((drawArea[3] - drawArea[1]) / numRows) * i - (4 * globalRendering->pixelY);
-			DrawTimeSlices(threadProf, curTime, maxTime, drawArea2, {1.0f, 0.0f, 0.0f, 0.6f});
+			DrawTimeSlices(threadProf, maxTime, drawArea2, {1.0f, 0.0f, 0.0f, 0.6f});
 		}
 
 		profiler.ToggleLock(false);
@@ -287,11 +281,11 @@ static void DrawFrameBarcode(TypedRenderBuffer<VA_TYPE_C   >& rb)
 		, MAX_FRAMES_HIST_TIME
 	);
 
-	DrawTimeSlices(lgcFrames, curTime, maxTime, drawArea, {1.0f, 0.5f, 1.0f, 0.55f}); // gc frames
-	DrawTimeSlices(uusFrames, curTime, maxTime, drawArea, {1.0f, 1.0f, 0.0f, 0.90f}); // unsynced-update frames
-	DrawTimeSlices(swpFrames, curTime, maxTime, drawArea, {0.0f, 0.0f, 1.0f, 0.55f}); // video swap frames
-	DrawTimeSlices(vidFrames, curTime, maxTime, drawArea, {0.0f, 1.0f, 0.0f, 0.55f}); // video frames
-	DrawTimeSlices(simFrames, curTime, maxTime, drawArea, {1.0f, 0.0f, 0.0f, 0.55f}); // sim frames
+	DrawTimeSlices(lgcFrames, maxTime, drawArea, {1.0f, 0.5f, 1.0f, 0.55f}); // gc frames
+	DrawTimeSlices(uusFrames, maxTime, drawArea, {1.0f, 1.0f, 0.0f, 0.90f}); // unsynced-update frames
+	DrawTimeSlices(swpFrames, maxTime, drawArea, {0.0f, 0.0f, 1.0f, 0.55f}); // video swap frames
+	DrawTimeSlices(vidFrames, maxTime, drawArea, {0.0f, 1.0f, 0.0f, 0.55f}); // video frames
+	DrawTimeSlices(simFrames, maxTime, drawArea, {1.0f, 0.0f, 0.0f, 0.55f}); // sim frames
 
 	{
 		// draw 'feeder' (indicates current time pos)
@@ -654,3 +648,31 @@ void ProfileDrawer::DbgTimingInfo(DbgTimingInfoType type, const spring_time star
 	}
 }
 
+static void DiscardOldTimeSlices(
+       std::deque<TimeSlice>& frames,
+       const spring_time curTime,
+       const spring_time maxTime
+) {
+	RECOIL_DETAILED_TRACY_ZONE;
+	// remove old entries
+	while (!frames.empty() && (curTime - frames.front().second) > maxTime) {
+		frames.pop_front();
+	}
+}
+
+void ProfileDrawer::Update()
+{
+	RECOIL_DETAILED_TRACY_ZONE;
+	const spring_time curTime = spring_now();
+	const spring_time maxTime = spring_secs(MAX_FRAMES_HIST_TIME);
+
+	// cleanup old frame records
+	DiscardOldTimeSlices(lgcFrames, curTime, maxTime);
+	DiscardOldTimeSlices(uusFrames, curTime, maxTime);
+	DiscardOldTimeSlices(swpFrames, curTime, maxTime);
+	DiscardOldTimeSlices(vidFrames, curTime, maxTime);
+	DiscardOldTimeSlices(simFrames, curTime, maxTime);
+
+	// old ThreadProfile records get cleaned up inside TimeProfiler and DrawThreadBarcode
+}
+

rts/Game/UI/ProfileDrawer.h

@@ -20,6 +20,7 @@ class ProfileDrawer : public CEventClient
 	virtual bool MousePress(int x, int y, int button) override;
 	virtual bool IsAbove(int x, int y) override;
 	virtual void DbgTimingInfo(DbgTimingInfoType type, const spring_time start, const spring_time end) override;
+	virtual void Update() override;
 
 private:
 	ProfileDrawer();

rts/System/TimeProfiler.cpp

@@ -229,6 +229,9 @@ void CTimeProfiler::Update()
 	UpdateRaw();
 	ResortProfilesRaw();
 	RefreshProfilesRaw();
+	// Now cleanup old thread profiles, no need to do it if
+	// disabled since won't be accepting data.
+	CleanupOldThreadProfiles();
 }
 
 void CTimeProfiler::UpdateRaw()
@@ -328,6 +331,22 @@ void CTimeProfiler::RefreshProfilesRaw()
 	}
 }
 
+void CTimeProfiler::CleanupOldThreadProfiles()
+{
+	#ifdef THREADPOOL
+	const spring_time curTime = spring_gettime();
+	const spring_time maxTime = spring_secs(MAX_THREAD_HIST_TIME);
+	const size_t numThreads = std::min(threadProfiles.size(), (size_t)ThreadPool::GetNumThreads());
+	size_t i = 0;
+
+	for (auto& threadProf: threadProfiles) {
+		if (i++ >= numThreads) break;
+		while (!threadProf.empty() && (curTime - threadProf.front().second) > maxTime) {
+			threadProf.pop_front();
+		}
+	}
+	#endif
+}
 
 const CTimeProfiler::TimeRecord& CTimeProfiler::GetTimeRecord(const char* name) const
 {

rts/System/TimeProfiler.h

@@ -30,6 +30,8 @@
 
 #define SCOPED_ONCE_TIMER(name) ZoneScopedNC(name, tracy::Color::Purple); ScopedOnceTimer __timer(name);
 
+static constexpr float MAX_THREAD_HIST_TIME = 0.5f; // secs
+
 class BasicTimer : public spring::noncopyable
 {
 public:
@@ -183,6 +185,7 @@ class CTimeProfiler
 	void ResortProfilesRaw();
 	void RefreshProfiles();
 	void RefreshProfilesRaw();
+	void CleanupOldThreadProfiles();
 
 	void SetEnabled(bool b) { enabled = b; }
 	void PrintProfilingInfo() const;