From dd17edbdc1f6a05f21a2af35cc9d10096dc5d6db Mon Sep 17 00:00:00 2001
From: Stephen Saunders <srsaunders@rogers.com>
Date: Thu, 28 Dec 2023 09:41:18 -0500
Subject: [PATCH] Simplify OPTICK_THREAD() instrumentation and fix scope for
 common_frame

---
 neo/framework/File_SaveGame.cpp | 8 --------
 neo/framework/common_frame.cpp  | 6 ------
 neo/idlib/ParallelJobList.cpp   | 2 --
 neo/idlib/Thread.cpp            | 6 ++++++
 neo/sys/common/savegame.cpp     | 2 --
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/neo/framework/File_SaveGame.cpp b/neo/framework/File_SaveGame.cpp
index 65e2e94b..dc54eb65 100644
--- a/neo/framework/File_SaveGame.cpp
+++ b/neo/framework/File_SaveGame.cpp
@@ -71,8 +71,6 @@ class idSGFcompressThread : public idSysThread
 public:
 	virtual int			Run()
 	{
-		OPTICK_THREAD( "idSGFcompressThread" );
-
 		sgf->CompressBlock();
 		return 0;
 	}
@@ -83,8 +81,6 @@ class idSGFdecompressThread : public idSysThread
 public:
 	virtual int			Run()
 	{
-		OPTICK_THREAD( "idSGFdecompressThread" );
-
 		sgf->DecompressBlock();
 		return 0;
 	}
@@ -95,8 +91,6 @@ class idSGFwriteThread : public idSysThread
 public:
 	virtual int			Run()
 	{
-		OPTICK_THREAD( "idSGFwriteThread" );
-
 		sgf->WriteBlock();
 		return 0;
 	}
@@ -107,8 +101,6 @@ class idSGFreadThread : public idSysThread
 public:
 	virtual int			Run()
 	{
-		OPTICK_THREAD( "idSGFreadThread" );
-
 		sgf->ReadBlock();
 		return 0;
 	}
diff --git a/neo/framework/common_frame.cpp b/neo/framework/common_frame.cpp
index 1591458c..3062c5ba 100644
--- a/neo/framework/common_frame.cpp
+++ b/neo/framework/common_frame.cpp
@@ -90,12 +90,6 @@ be called directly in the foreground thread for comparison.
 */
 int idGameThread::Run()
 {
-	if( com_smp.GetBool() )
-	{
-		// SRS - label thread in smp mode only, otherwise CPU frame number is missing
-		OPTICK_THREAD( "idGameThread" );
-	}
-
 	commonLocal.frameTiming.startGameTime = Sys_Microseconds();
 
 	// debugging tool to test frame dropping behavior
diff --git a/neo/idlib/ParallelJobList.cpp b/neo/idlib/ParallelJobList.cpp
index 54b14c5d..c05857c9 100644
--- a/neo/idlib/ParallelJobList.cpp
+++ b/neo/idlib/ParallelJobList.cpp
@@ -1145,8 +1145,6 @@ idJobThread::Run
 */
 int idJobThread::Run()
 {
-	OPTICK_THREAD( GetName() );
-
 	threadJobListState_t threadJobListState[MAX_JOBLISTS];
 	int numJobLists = 0;
 	int lastStalledJobList = -1;
diff --git a/neo/idlib/Thread.cpp b/neo/idlib/Thread.cpp
index 1be284cd..5405284d 100644
--- a/neo/idlib/Thread.cpp
+++ b/neo/idlib/Thread.cpp
@@ -237,12 +237,18 @@ int idSysThread::ThreadProc( idSysThread* thread )
 					break;
 				}
 
+				// SRS - generalize thread instrumentation with correct Run() scope
+				OPTICK_THREAD( thread->GetName() );
+
 				retVal = thread->Run();
 			}
 			thread->signalWorkerDone.Raise();
 		}
 		else
 		{
+			// SRS - generalize thread instrumentation with correct Run() scope
+			OPTICK_THREAD( thread->GetName() );
+
 			retVal = thread->Run();
 		}
 	}
diff --git a/neo/sys/common/savegame.cpp b/neo/sys/common/savegame.cpp
index e5c63e49..1cdfa4f6 100644
--- a/neo/sys/common/savegame.cpp
+++ b/neo/sys/common/savegame.cpp
@@ -747,8 +747,6 @@ idSaveGameThread::Run
 */
 int idSaveGameThread::Run()
 {
-	OPTICK_THREAD( "idSaveGameThread" );
-
 	int ret = ERROR_SUCCESS;
 
 	try