Manually control lifetime of observer pointer data

This avoids a potential issue with global shutdown order. The controlled lifetime resource itself could previously be destroyed before all observer pointers referring to its resources were destroyed.
mikke89 · Oct 20, 2024 · 3c10d0f · 3c10d0f
1 parent 4120031
commit 3c10d0f
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/Source/Core/ObserverPtr.cpp b/Source/Core/ObserverPtr.cpp
@@ -27,8 +27,6 @@
  */
 
 #include "../../Include/RmlUi/Core/ObserverPtr.h"
-#include "../../Include/RmlUi/Core/Log.h"
-#include "ControlledLifetimeResource.h"
 #include "Pool.h"
 
 namespace Rml {
@@ -37,7 +35,7 @@ struct ObserverPtrData {
 	bool is_shutdown = false;
 	Pool<Detail::ObserverPtrBlock> block_pool{128, true};
 };
-static ControlledLifetimeResource<ObserverPtrData> observer_ptr_data;
+static ObserverPtrData* observer_ptr_data = nullptr;
 
 void Detail::DeallocateObserverPtrBlockIfEmpty(ObserverPtrBlock* block)
 {
@@ -47,22 +45,25 @@ void Detail::DeallocateObserverPtrBlockIfEmpty(ObserverPtrBlock* block)
 		observer_ptr_data->block_pool.DestroyAndDeallocate(block);
 		if (observer_ptr_data->is_shutdown && observer_ptr_data->block_pool.GetNumAllocatedObjects() == 0)
 		{
-			observer_ptr_data.Shutdown();
+			delete observer_ptr_data;
+			observer_ptr_data = nullptr;
 		}
 	}
 }
+
 void Detail::InitializeObserverPtrPool()
 {
-	observer_ptr_data.InitializeIfEmpty();
+	if (!observer_ptr_data)
+		observer_ptr_data = new ObserverPtrData;
 	observer_ptr_data->is_shutdown = false;
 }
 
 void Detail::ShutdownObserverPtrPool()
 {
-	const int num_objects = observer_ptr_data->block_pool.GetNumAllocatedObjects();
-	if (num_objects == 0)
+	if (observer_ptr_data->block_pool.GetNumAllocatedObjects() == 0)
 	{
-		observer_ptr_data.Shutdown();
+		delete observer_ptr_data;
+		observer_ptr_data = nullptr;
 	}
 	else
 	{