* static initialization order change

MutexFactory and SecureMemoryRegistry are now manually instantiated to ensure a graceful destruction when process stops
opendnssec · Sep 19, 2015 · 3b087c7 · 3b087c7
1 parent 08ffa75
commit 3b087c7
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 14 deletions.
diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp
@@ -69,6 +69,22 @@
 
 #include <stdlib.h>
 
+// Initialise the one-and-only instance
+
+#ifdef HAVE_CXX11
+std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
+#else
+std::auto_ptr<MutexFactory> MutexFactory::instance(NULL);
+#endif
+
+#ifdef HAVE_CXX11
+std::unique_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(nullptr);
+#else
+std::auto_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(NULL);
+#endif
+
+
+
 static CK_RV newP11Object(CK_OBJECT_CLASS objClass, CK_KEY_TYPE keyType, CK_CERTIFICATE_TYPE certType, P11Object **p11object)
 {
 	switch(objClass) {

diff --git a/src/lib/common/MutexFactory.cpp b/src/lib/common/MutexFactory.cpp
@@ -92,13 +92,6 @@ MutexLocker::~MutexLocker()
  MutexFactory implementation
  *****************************************************************************/
 
-// Initialise the one-and-only instance
-#ifdef HAVE_CXX11
-std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
-#else
-std::auto_ptr<MutexFactory> MutexFactory::instance(NULL);
-#endif
-
 // Constructor
 MutexFactory::MutexFactory()
 {

diff --git a/src/lib/crypto/test/cryptotest.cpp b/src/lib/crypto/test/cryptotest.cpp
@@ -36,6 +36,19 @@
 #include "CryptoFactory.h"
 #include "SecureMemoryRegistry.h"
 
+// Initialise the one-and-only instance
+#ifdef HAVE_CXX11
+std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
+#else
+std::auto_ptr<MutexFactory> MutexFactory::instance(NULL);
+#endif
+
+#ifdef HAVE_CXX11
+std::unique_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(nullptr);
+#else
+std::auto_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(NULL);
+#endif
+
 int main(int /*argc*/, char** /*argv*/)
 {
 	CppUnit::TextUi::TestRunner runner;

diff --git a/src/lib/data_mgr/SecureMemoryRegistry.cpp b/src/lib/data_mgr/SecureMemoryRegistry.cpp
@@ -37,13 +37,6 @@
 #include "log.h"
 #include "SecureMemoryRegistry.h"
 
-// Initialise the one-and-only instance
-#ifdef HAVE_CXX11
-std::unique_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(nullptr);
-#else
-std::auto_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(NULL);
-#endif
-
 // Constructor
 SecureMemoryRegistry::SecureMemoryRegistry()
 {

diff --git a/src/lib/data_mgr/test/datamgrtest.cpp b/src/lib/data_mgr/test/datamgrtest.cpp
@@ -36,6 +36,19 @@
 #include "CryptoFactory.h"
 #include "SecureMemoryRegistry.h"
 
+// Initialise the one-and-only instance
+#ifdef HAVE_CXX11
+std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
+#else
+std::auto_ptr<MutexFactory> MutexFactory::instance(NULL);
+#endif
+
+#ifdef HAVE_CXX11
+std::unique_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(nullptr);
+#else
+std::auto_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(NULL);
+#endif
+
 int main(int /*argc*/, char** /*argv*/)
 {
 	CppUnit::TextUi::TestRunner runner;

diff --git a/src/lib/handle_mgr/test/HandleManagerTests.cpp b/src/lib/handle_mgr/test/HandleManagerTests.cpp
@@ -35,6 +35,13 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include "HandleManagerTests.h"
 
+#ifdef HAVE_CXX11
+std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
+#else
+std::auto_ptr<MutexFactory> MutexFactory::instance(NULL);
+#endif
+
+
 CPPUNIT_TEST_SUITE_REGISTRATION(HandleManagerTests);
 
 void HandleManagerTests::setUp()

diff --git a/src/lib/handle_mgr/test/handlemgrtest.cpp b/src/lib/handle_mgr/test/handlemgrtest.cpp
@@ -33,6 +33,8 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
 
+
+
 int main(int /*argc*/, char** /*argv*/)
 {
 	CppUnit::TextUi::TestRunner runner;

diff --git a/src/lib/object_store/test/ObjectStoreTests.cpp b/src/lib/object_store/test/ObjectStoreTests.cpp
@@ -41,6 +41,20 @@
 #include "OSAttributes.h"
 #include "cryptoki.h"
 
+// Initialise the one-and-only instance
+#ifdef HAVE_CXX11
+std::unique_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(nullptr);
+#else
+std::auto_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(NULL);
+#endif
+
+#ifdef HAVE_CXX11
+std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
+#else
+std::auto_ptr<MutexFactory> MutexFactory::instance(NULL);
+#endif
+
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ObjectStoreTests);
 
 // FIXME: all pathnames in this file are *NIX/BSD specific

diff --git a/src/lib/slot_mgr/test/SlotManagerTests.cpp b/src/lib/slot_mgr/test/SlotManagerTests.cpp
@@ -45,6 +45,18 @@
 #include "CryptoFactory.h"
 #include "cryptoki.h"
 
+#ifdef HAVE_CXX11
+std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr);
+#else
+std::auto_ptr<MutexFactory> MutexFactory::instance(NULL);
+#endif
+
+#ifdef HAVE_CXX11
+std::unique_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(nullptr);
+#else
+std::auto_ptr<SecureMemoryRegistry> SecureMemoryRegistry::instance(NULL);
+#endif
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SlotManagerTests);
 
 void SlotManagerTests::setUp()