ParallelAlgo/Gadget : Fix Python 3.10 shutdown crash

GafferHQ · Feb 12, 2024 · 265be18 · 265be18
1 parent 13255e0
commit 265be18
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/Gaffer/ParallelAlgo.cpp b/src/Gaffer/ParallelAlgo.cpp
@@ -53,8 +53,12 @@ using UIThreadCallHandlers = std::stack<ParallelAlgo::UIThreadCallHandler>;
 std::unique_lock<std::mutex> lockUIThreadCallHandlers( UIThreadCallHandlers *&handlers )
 {
 	static std::mutex g_mutex;
-	static UIThreadCallHandlers g_handlers;
-	handlers = &g_handlers;
+	// Deliberately leaking `g_handlers` here as otherwise we get crashes
+	// when it contains handlers implemented in Python, because Python has
+	// already shut down before static destructors are run, and we can't
+	// destroy a Python object after Python has shut down.
+	static UIThreadCallHandlers *g_handlers = new UIThreadCallHandlers;
+	handlers = g_handlers;
 	return std::unique_lock<std::mutex>( g_mutex );
 }
 

diff --git a/src/GafferUI/Gadget.cpp b/src/GafferUI/Gadget.cpp
@@ -485,8 +485,9 @@ Gadget::IdleSignal &Gadget::idleSignal()
 
 Gadget::IdleSignal &Gadget::idleSignalAccessedSignal()
 {
-	static IdleSignal g_idleSignalAccessedSignal;
-	return g_idleSignalAccessedSignal;
+	// See above.
+	static IdleSignal *g_idleSignalAccessedSignal = new IdleSignal;
+	return *g_idleSignalAccessedSignal;
 }
 
 void Gadget::styleChanged()