Fix for profiler initialization on Linux (#8824)

defold · Apr 22, 2024 · bf9b9ff · bf9b9ff
1 parent 1c78e39
commit bf9b9ff
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/engine/dlib/src/dlib/profile/profile_remotery.cpp b/engine/dlib/src/dlib/profile/profile_remotery.cpp
@@ -220,16 +220,36 @@ namespace dmProfile
 
     void SetSampleTreeCallback(void* ctx, FSampleTreeCallback callback)
     {
-        DM_SPINLOCK_SCOPED_LOCK(g_ProfilerLock);
+        // This function is called both before the profiler is initialized, and during
+        if (IsInitialized())
+        {
+            dmSpinlock::Lock(&g_ProfilerLock);
+        }
+
         g_SampleTreeCallback = callback;
         g_SampleTreeCallbackCtx = ctx;
+
+        if (IsInitialized())
+        {
+            dmSpinlock::Unlock(&g_ProfilerLock);
+        }
     }
 
     void SetPropertyTreeCallback(void* ctx, FPropertyTreeCallback callback)
     {
-        DM_SPINLOCK_SCOPED_LOCK(g_ProfilerLock);
+        // This function is called both before the profiler is initialized, and during
+        if (IsInitialized())
+        {
+            dmSpinlock::Lock(&g_ProfilerLock);
+        }
+
         g_PropertyTreeCallback = callback;
         g_PropertyTreeCallbackCtx = ctx;
+
+        if (IsInitialized())
+        {
+            dmSpinlock::Unlock(&g_ProfilerLock);
+        }
     }
 
     void ProfileScope::StartScope(const char* name, uint64_t* name_hash)