Ticket #1939: fix-profiler-corruption-recovery.patch

trunk/source/ps/Profile.h

@@ -150 +150 @@
 {
 public:
     CProfileSample(const char* name)
+        : n(name)
     {
         if (CProfileManager::IsInitialised())
         {
@@ -161 +162 @@
     }
     ~CProfileSample()
     {
-        if (CProfileManager::IsInitialised())
-            g_Profiler.Stop();
+        if (!CProfileManager::IsInitialised() || !ThreadUtil::IsMainThread())
+            return;
+        if (n != g_Profiler.GetCurrent()->GetName())
+        {
+            debug_printf(L"PROFILER: Current not right: Should be \"%s\" but is \"%s\"\n", n, g_Profiler.GetCurrent()->GetName());
+
+            do {
+                debug_printf(L"PROFILER: Skip \"%s\". This profiler was not stopped correctly!\n", g_Profiler.GetCurrent()->GetName());
+                g_Profiler.Stop();
+            }
+            while (n != g_Profiler.GetCurrent()->GetName() && g_Profiler.GetCurrent() != g_Profiler.GetRoot());
+
+            if (g_Profiler.GetCurrent() == g_Profiler.GetRoot() && n != g_Profiler.GetRoot()->GetName())
+            {
+                // This should only happen when stop is called more often than start was called.
+                debug_printf(L"PROFILER: Did not find the right callee in the stack but reached root: Performing reset.\n");
+                g_Profiler.StructuralReset();
+            }
+        }
+        g_Profiler.Stop();
     }
+private:
+    const char *n;
 };
 
 class CProfileSampleScript
 {
 public:
-    CProfileSampleScript( const char* name )
+    CProfileSampleScript(const char* name)
+        : n(name)
     {
         if (CProfileManager::IsInitialised())
         {
@@ -184 +206 @@
     }
     ~CProfileSampleScript()
     {
-        if (CProfileManager::IsInitialised())
-            if (ThreadUtil::IsMainThread())
+        if (!CProfileManager::IsInitialised() || !ThreadUtil::IsMainThread())
+            return;
+        if (n != g_Profiler.GetCurrent()->GetName())
+        {
+            debug_printf(L"PROFILER: Current not right: Should be \"%s\" but is \"%s\"\n", n, g_Profiler.GetCurrent()->GetName());
+
+            do {
+                debug_printf(L"PROFILER: Skip \"%s\". This profiler was not stopped correctly!\n", g_Profiler.GetCurrent()->GetName());
                 g_Profiler.Stop();
+            }
+            while (n != g_Profiler.GetCurrent()->GetName() && g_Profiler.GetCurrent() != g_Profiler.GetRoot());
+
+            if (g_Profiler.GetCurrent() == g_Profiler.GetRoot() && n != g_Profiler.GetRoot()->GetName())
+            {
+                // This should only happen when stop is called more often than start was called.
+                debug_printf(L"PROFILER: Did not find the right callee in the stack but reached root: Performing reset.\n");
+                g_Profiler.StructuralReset();
+            }
+        }
+        g_Profiler.Stop();
     }
+private:
+    const char *n;
+
 };
 
 // Put a PROFILE("xyz") block at the start of all code to be profiled.