fix BehaviorTree#114

facontidavide · facontidavide · commit 01ab2b7720a9 · 2019-07-30T16:41:04.000+02:00
diff --git a/src/loggers/bt_minitrace_logger.cpp b/src/loggers/bt_minitrace_logger.cpp
@@ -24,7 +24,7 @@ MinitraceLogger::~MinitraceLogger()
 {
     minitrace::mtr_flush();
     minitrace::mtr_shutdown();
-	ref_count = false;
+    ref_count = false;
 }
 
 void MinitraceLogger::callback(Duration /*timestamp*/,
diff --git a/src/loggers/bt_zmq_publisher.cpp b/src/loggers/bt_zmq_publisher.cpp
@@ -28,12 +28,8 @@ PublisherZMQ::PublisherZMQ(const BT::Tree& tree, int max_msg_per_second)
   , send_pending_(false)
   , zmq_(new Pimpl())
 {
-    static bool first_instance = true;
-    if (first_instance)
-    {
-        first_instance = false;
-    }
-    else
+    bool expected = false;
+    if (!ref_count.compare_exchange_strong(expected, true))
     {
         throw LogicError("Only one instance of PublisherZMQ shall be created");
     }
@@ -86,7 +82,7 @@ PublisherZMQ::~PublisherZMQ()
     }
     flush();
     delete zmq_;
-	ref_count = false;
+    ref_count = false;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ MinitraceLogger::~MinitraceLogger()`
`24`	`24`	`{`
`25`	`25`	`minitrace::mtr_flush();`
`26`	`26`	`minitrace::mtr_shutdown();`
`27`		`- ref_count = false;`
	`27`	`+ ref_count = false;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`void MinitraceLogger::callback(Duration /timestamp/,`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,8 @@ PublisherZMQ::PublisherZMQ(const BT::Tree& tree, int max_msg_per_second)`
`28`	`28`	`, send_pending_(false)`
`29`	`29`	`, zmq_(new Pimpl())`
`30`	`30`	`{`
`31`		`- static bool first_instance = true;`
`32`		`- if (first_instance)`
`33`		`- {`
`34`		`- first_instance = false;`
`35`		`- }`
`36`		`- else`
	`31`	`+ bool expected = false;`
	`32`	`+ if (!ref_count.compare_exchange_strong(expected, true))`
`37`	`33`	`{`
`38`	`34`	`throw LogicError("Only one instance of PublisherZMQ shall be created");`
`39`	`35`	`}`
`@@ -86,7 +82,7 @@ PublisherZMQ::~PublisherZMQ()`
`86`	`82`	`}`
`87`	`83`	`flush();`
`88`	`84`	`delete zmq_;`
`89`		`- ref_count = false;`
	`85`	`+ ref_count = false;`
`90`	`86`	`}`
`91`	`87`
`92`	`88`