mtapi_cpp: used double-checked locking pattern in Node::GetInstance

58c86fef · Marcus Winter · 049b3b00 · 58c86fef
Commit 58c86fef authored Oct 20, 2014 by Marcus Winter
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

mtapi_cpp/src/node.cc
+7 -5

No files found.
--- a/mtapi_cpp/src/node.cc
+++ b/mtapi_cpp/src/node.cc
@@ -198,13 +198,15 @@ bool Node::IsInitialized() {

 Node & Node::GetInstance() {
 #if MTAPI_CPP_AUTOMATIC_INITIALIZE
-  init_mutex.Lock();
  if (!IsInitialized()) {
-    Node::Initialize(
-      MTAPI_CPP_AUTOMATIC_DOMAIN_ID, MTAPI_CPP_AUTOMATIC_NODE_ID);
-    atexit(Node::Finalize);
+    init_mutex.Lock();
+    if (!IsInitialized()) {
+      Node::Initialize(
+        MTAPI_CPP_AUTOMATIC_DOMAIN_ID, MTAPI_CPP_AUTOMATIC_NODE_ID);
+      atexit(Node::Finalize);
+    }
+    init_mutex.Unlock();
  }
-  init_mutex.Unlock();
  return *node_instance;
 #else
  if (IsInitialized()) {