[engine] Fix sv_parallel_sendsnapshot crashing

RaphaelIT7 · RaphaelIT7 · commit e0c5d9c1f635 · 2024-12-07T16:07:57.000+01:00
Origin: RaphaelIT7@87f2ca1
diff --git a/engine/framesnapshot.h b/engine/framesnapshot.h
@@ -166,6 +166,7 @@ class CFrameSnapshotManager
 private:
 	void	DeleteFrameSnapshot( CFrameSnapshot* pSnapshot );
 
+	CThreadFastMutex									m_FrameSnapshotsWriteMutex;
 	CUtlLinkedList<CFrameSnapshot*, unsigned short>		m_FrameSnapshots;
 	CClassMemoryPool< PackedEntity >					m_PackedEntitiesPool;
 
diff --git a/engine/sv_framesnapshot.cpp b/engine/sv_framesnapshot.cpp
@@ -100,7 +100,9 @@ CFrameSnapshot*	CFrameSnapshotManager::CreateEmptySnapshot( int tickcount, int m
 		entry++;
 	}
 
+	m_FrameSnapshotsWriteMutex.Lock();
 	snap->m_ListIndex = m_FrameSnapshots.AddToTail( snap );
+	m_FrameSnapshotsWriteMutex.Unlock();
 	return snap;
 }
 
@@ -190,7 +192,9 @@ void CFrameSnapshotManager::DeleteFrameSnapshot( CFrameSnapshot* pSnapshot )
 		}
 	}
 
+	m_FrameSnapshotsWriteMutex.Lock();
 	m_FrameSnapshots.Remove( pSnapshot->m_ListIndex );
+	m_FrameSnapshotsWriteMutex.Unlock();
 	delete pSnapshot;
 }
 
diff --git a/engine/sv_main.cpp b/engine/sv_main.cpp
@@ -1788,7 +1788,9 @@ void CGameServer::CopyTempEntities( CFrameSnapshot* pSnapshot )
 //   are running many instances anyway. It's off in Dota and CSGO dedicated servers.
 //
 // Bruce also had a patch to disable this in //ValveGames/staging/game/tf/cfg/unencrypted/print_instance_config.py
-static ConVar sv_parallel_sendsnapshot( "sv_parallel_sendsnapshot", "0" );
+//
+// NOTE: The crash should be fixed.
+static ConVar sv_parallel_sendsnapshot( "sv_parallel_sendsnapshot", "1" );
 
 static void SV_ParallelSendSnapshot( CGameClient *& pClient )
 {

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,9 @@ CFrameSnapshot* CFrameSnapshotManager::CreateEmptySnapshot( int tickcount, int m`
`100`	`100`	`entry++;`
`101`	`101`	`}`
`102`	`102`
	`103`	`+ m_FrameSnapshotsWriteMutex.Lock();`
`103`	`104`	`snap->m_ListIndex = m_FrameSnapshots.AddToTail( snap );`
	`105`	`+ m_FrameSnapshotsWriteMutex.Unlock();`
`104`	`106`	`return snap;`
`105`	`107`	`}`
`106`	`108`
`@@ -190,7 +192,9 @@ void CFrameSnapshotManager::DeleteFrameSnapshot( CFrameSnapshot* pSnapshot )`
`190`	`192`	`}`
`191`	`193`	`}`
`192`	`194`
	`195`	`+ m_FrameSnapshotsWriteMutex.Lock();`
`193`	`196`	`m_FrameSnapshots.Remove( pSnapshot->m_ListIndex );`
	`197`	`+ m_FrameSnapshotsWriteMutex.Unlock();`
`194`	`198`	`delete pSnapshot;`
`195`	`199`	`}`
`196`	`200`