unify(subsystem): Merge SubsystemInterface code (TheSuperHackers#2180)

Author: xezon

Generals/Code/GameEngine/Include/Common/SubsystemInterface.h

@@ -35,7 +35,7 @@
 class Xfer;
 
 //-------------------------------------------------------------------------------------------------
-/** This is the abstract base class from which all game engine subsytems should derive from.
+/** This is the abstract base class from which all game engine subsystems should derive from.
 	* In order to provide consistent behaviors across all these systems, any implementation
 	* must obey the rules defined in here
 	*
@@ -114,6 +114,8 @@ class SubsystemInterface
 	void DRAW(void);
 	Real getUpdateTime(void) {return m_curUpdateTime;}
 	Real getDrawTime(void) {return m_curDrawTime;}
+	Bool doDumpUpdate(void) {return m_dumpUpdate;}
+	Bool doDumpDraw(void) {return m_dumpDraw;}
 	static Real getTotalTime(void) {return s_msConsumed;}
 	static void clearTotalTime(void) {s_msConsumed = 0;}
 protected:
@@ -123,6 +125,8 @@ class SubsystemInterface
 
 	Real m_startDrawTimeConsumed;
 	Real m_curDrawTime;
+	Bool m_dumpUpdate;
+	Bool m_dumpDraw;
 #else
 	void UPDATE(void) {update();}
 	void DRAW(void) {draw();}

Generals/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp

@@ -43,7 +43,9 @@ SubsystemInterface::SubsystemInterface()
 :m_curDrawTime(0),
 m_startDrawTimeConsumed(0),
 m_startTimeConsumed(0),
-m_curUpdateTime(0)
+m_curUpdateTime(0),
+m_dumpUpdate(false),
+m_dumpDraw(false)
 #endif
 {
 	if (TheSubsystemList) {
@@ -60,6 +62,7 @@ SubsystemInterface::~SubsystemInterface()
 }
 
 #ifdef DUMP_PERF_STATS
+static const Real MIN_TIME_THRESHOLD = 0.0002f; // .2 msec. [8/13/2003]
 void SubsystemInterface::UPDATE(void)
 {
 	__int64 startTime64;
@@ -72,8 +75,11 @@ void SubsystemInterface::UPDATE(void)
 	m_curUpdateTime = ((double)(endTime64-startTime64))/((double)(freq64));
 	Real subTime = s_msConsumed - m_startTimeConsumed;
 	if (m_name.isEmpty()) return;
-	if (m_curUpdateTime > 0.00001) {
-		//DEBUG_LOG(("Subsys %s total time %.2f, subTime %.2f, net time %.2f",
+	if (m_curUpdateTime>MIN_TIME_THRESHOLD) {
+		m_dumpUpdate = true;
+	}
+	if (m_curUpdateTime > MIN_TIME_THRESHOLD/10.0f) {
+		//DLOG(Debug::Format("Subsys %s total time %.2f, subTime %.2f, net time %.2f\n",
 		//	m_name.str(), m_curUpdateTime*1000, subTime*1000, (m_curUpdateTime-subTime)*1000	));
 
 		m_curUpdateTime -= subTime;
@@ -95,8 +101,11 @@ void SubsystemInterface::DRAW(void)
 	m_curDrawTime = ((double)(endTime64-startTime64))/((double)(freq64));
 	Real subTime = s_msConsumed - m_startDrawTimeConsumed;
 	if (m_name.isEmpty()) return;
-	if (m_curDrawTime > 0.00001) {
-		//DEBUG_LOG(("Subsys %s total time %.2f, subTime %.2f, net time %.2f",
+	if (m_curDrawTime>MIN_TIME_THRESHOLD) {
+		m_dumpDraw = true;
+	}
+	if (m_curDrawTime > MIN_TIME_THRESHOLD/10.0f) {
+		//DLOG(Debug::Format("Subsys %s total time %.2f, subTime %.2f, net time %.2f\n",
 		//	m_name.str(), m_curUpdateTime*1000, subTime*1000, (m_curUpdateTime-subTime)*1000	));
 
 		m_curDrawTime -= subTime;
@@ -203,15 +212,15 @@ AsciiString SubsystemInterfaceList::dumpTimesForAll()
 	{
 		SubsystemInterface* sys = *it;
 		total += sys->getUpdateTime();
-		if (sys->getUpdateTime()>0.00001f) {
+		if (sys->doDumpUpdate()) {
 			AsciiString curLine;
 			curLine.format("  Time %02.2f MS update() %s \n", sys->getUpdateTime()*1000.0f, sys->getName().str());
 			buffer.concat(curLine);
 		}	else {
 			misc += sys->getUpdateTime();
 		}
 		total += sys->getDrawTime();
-		if (sys->getDrawTime()>0.00001f) {
+		if (sys->doDumpDraw()) {
 			AsciiString curLine;
 			curLine.format("  Time %02.2f MS  draw () %s \n", sys->getDrawTime()*1000.0f, sys->getName().str());
 			buffer.concat(curLine);

GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h

@@ -154,7 +154,7 @@ class SubsystemInterfaceList
 	void resetAll();
 	void shutdownAll();
 #ifdef DUMP_PERF_STATS
- 	AsciiString dumpTimesForAll();
+	AsciiString dumpTimesForAll();
 #endif
 
 private: