Merge pull request #404 from spacetelescope/bugfix/ServiceRunCleanup

Bugfix/service run cleanup

Author: lanemeier7

catkit2/bindings.cpp

@@ -562,8 +562,15 @@ PYBIND11_MODULE(catkit_bindings, m)
 		.def_property_readonly("config", &Service::GetConfig)
 		.def("run", [](Service &service)
 		{
-			service.Run(error_check_python);
-		}, py::call_guard<py::gil_scoped_release>())
+			{
+				py::gil_scoped_release release;
+				service.Run(error_check_python);
+			}
+			// CleanupAttributes must be called with GIL held because
+			// m_Properties and m_Commands contain Python callbacks wrapped
+			// in std::function. Destroying them without the GIL causes crashes.
+			service.CleanupAttributes();
+		})
 		.def("open", &Service::Open)
 		.def("main", &Service::Main)
 		.def("close", &Service::Close)

catkit_core/Service.cpp

@@ -243,9 +243,6 @@ void Service::Run(void (*error_check)())
 
 	ArrayInfo info{'u', '=', 8, 1, {1, 1, 1, 1}, {8, 1, 1, 1}};
 	m_Testbed->GetMessageBroker()->PublishArray(m_ServiceId + "/heartbeat/get", {info, &timestamp});
-
-
-	CleanupAttributes();
 }
 
 void Service::CleanupAttributes()