Added debug logging for crash investigation

Author: ccw808

Client/mods/deathmatch/logic/CClientEntity.cpp

@@ -60,6 +60,7 @@ CClientEntity::CClientEntity(ElementID ID) : ClassInit(this)
     g_pCore->UpdateDummyProgress();
 }
 
+#pragma inline_depth(0)
 CClientEntity::~CClientEntity(void)
 {
     // Make sure we won't get deleted later by the element deleter if we've been requested so
@@ -164,6 +165,7 @@ CClientEntity::~CClientEntity(void)
     g_pCore->GetGraphics()->GetRenderItemManager()->RemoveClientEntityRefs(this);
     g_pCore->UpdateDummyProgress();
 }
+#pragma inline_depth(254)
 
 // Static function
 // bool CClientEntity::IsValidEntity ( CClientEntity* pEntity )

Client/mods/deathmatch/logic/CClientMarkerManager.cpp

@@ -53,15 +53,43 @@ void CClientMarkerManager::DeleteAll(void)
 
 void CClientMarkerManager::DoPulse(void)
 {
-    bool bDisableCrashFix = (g_pCore->GetDiagnosticDebug() == EDiagnosticDebug::MARKER_PULSE);
-    if (!bDisableCrashFix)
-        m_Markers.SuspendModifyOperations();
+    uint uiSkipCount = 0;
+    uint uiAddCount = 0;
+    m_Markers.SuspendModifyOperations();
     // Pulse all our markers
     CFastList<CClientMarker*>::const_iterator iter = m_Markers.begin();
     for (; iter != m_Markers.end(); iter++)
     {
-        (*iter)->DoPulse();
+        bool bSkip = false;
+        for (auto suspended : m_Markers.m_SuspendedOperationList)
+        {
+            if (suspended.item == (*iter))
+                bSkip = true;
+        }
+        if (!bSkip)
+            (*iter)->DoPulse();
+        else
+            uiSkipCount++;
+    }
+
+    for (uint i = 0; i < m_Markers.m_SuspendedOperationList.size(); i++)   
+    {
+        auto suspended = m_Markers.m_SuspendedOperationList[i];
+        if (suspended.operation != CFastList<CClientMarker*>::EOperation::Remove)
+        {
+            suspended.item->DoPulse();
+            uiAddCount++;
+        }
+    }
+    m_Markers.ResumeModifyOperations();
+
+    // Debug logging
+    static uint uiSkipCountNonZeroes = 0;
+    static uint uiAddCountNonZeroes = 0;
+    if ((uiSkipCount && uiSkipCountNonZeroes < 5) || (uiAddCount && uiAddCountNonZeroes < 5))
+    {
+        uiSkipCountNonZeroes += (uiSkipCount ? 1 : 0);
+        uiAddCountNonZeroes += (uiAddCount ? 1 : 0);
+        AddReportLog(4450, SString("CClientMarkerManager::DoPulse uiSkipCount:%d uiAddCount:%d", uiSkipCount, uiAddCount));
     }
-    if (!bDisableCrashFix)
-        m_Markers.ResumeModifyOperations();
 }