Skip to content

FORMUS3IC_LAS3 / embb

Go to a project
Commit 965cefbd by Marcus Winter
Options

mtapi_cpp: fixed automatic initialization

parent 3926d7a1
Inline Side-by-side
Showing with 8 additions and 3 deletions
mtapi_cpp/src/node.cc
...@@ -32,7 +32,7 @@ namespace mtapi { ...@@ -32,7 +32,7 @@ namespace mtapi {
embb::mtapi::Node * embb::mtapi::Node::node_instance_ = NULL; embb::mtapi::Node * embb::mtapi::Node::node_instance_ = NULL;
#if MTAPI_CPP_AUTOMATIC_INITIALIZE #if MTAPI_CPP_AUTOMATIC_INITIALIZE
static embb_spinlock_t init_mutex = { { 0 } }; static EMBB_BASE_BASIC_TYPE_SIZE_4 init_mutex = 0;
#endif #endif
void Node::Initialize( void Node::Initialize(
...@@ -68,13 +68,18 @@ void Node::Initialize( ...@@ -68,13 +68,18 @@ void Node::Initialize(
Node & Node::GetInstance() { Node & Node::GetInstance() {
#if MTAPI_CPP_AUTOMATIC_INITIALIZE #if MTAPI_CPP_AUTOMATIC_INITIALIZE
if (!IsInitialized()) { if (!IsInitialized()) {
embb_spin_lock(&init_mutex); EMBB_BASE_BASIC_TYPE_SIZE_4 compare = 0;
while (0 == embb_internal__atomic_compare_and_swap_4(
&init_mutex, &compare, 1)) {
compare = 0;
embb_thread_yield();
}
if (!IsInitialized()) { if (!IsInitialized()) {
Node::Initialize( Node::Initialize(
MTAPI_CPP_AUTOMATIC_DOMAIN_ID, MTAPI_CPP_AUTOMATIC_NODE_ID); MTAPI_CPP_AUTOMATIC_DOMAIN_ID, MTAPI_CPP_AUTOMATIC_NODE_ID);
atexit(Node::Finalize); atexit(Node::Finalize);
} }
embb_spin_unlock(&init_mutex); embb_internal__atomic_store_4(&init_mutex, 0);
} }
return *node_instance_; return *node_instance_;
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment