Changeset 6e2f3b for src/Observer/ObserverLog.cpp

Timestamp:

Oct 30, 2015, 11:43:20 AM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

3681dd

Parents:

dd7c44

git-author:

Frederik Heber <heber@…> (08/04/15 19:57:52)

git-committer:

Frederik Heber <heber@…> (10/30/15 11:43:20)

Message:

ObserverLog is also protected with mutexes.

File:

• src/Observer/ObserverLog.cpp (modified) (8 diffs)

src/Observer/ObserverLog.cpp

@@ -24 +24 @@
 #include <sstream>
 
+#include <boost/thread/locks.hpp>
+
 #include "CodePatterns/Observer/ObserverLog.hpp"
 #include "CodePatterns/Singleton_impl.hpp"
@@ -33 +35 @@
     count(0)
 {
+  boost::lock_guard<boost::recursive_mutex> guard(mutex);
   nullstream = new std::ofstream("/dev/null");
   outstream = nullstream;
@@ -39 +42 @@
 ObserverLog::~ObserverLog()
 {
+  boost::lock_guard<boost::recursive_mutex> guard(mutex);
   outstream = NULL;
   delete nullstream;
@@ -69 +73 @@
 void ObserverLog::disableLogging()
 {
+  boost::lock_guard<boost::recursive_mutex> guard(mutex);
   outstream = nullstream;
 }
@@ -74 +79 @@
 void ObserverLog::enableLogging()
 {
+  boost::lock_guard<boost::recursive_mutex> guard(mutex);
   outstream = &std::cout;
 }
@@ -80 +86 @@
 
 std::string ObserverLog::getName(void* obj){
+  boost::lock_guard<boost::recursive_mutex> guard(mutex);
   return names[obj];
 }
 
 bool ObserverLog::isObservable(void* obj){
+  boost::lock_guard<boost::recursive_mutex> guard(mutex);
   return observables.count(obj);
 }
 
 void ObserverLog::addName(void* obj , std::string name){
+  boost::lock_guard<boost::recursive_mutex> guard(mutex);
   std::stringstream sstr;
   sstr << name << "_" << count++;
@@ -94 +103 @@
 
 void ObserverLog::addObservable(void* obj){
+  boost::lock_guard<boost::recursive_mutex> guard(mutex);
   observables.insert(obj);
 }
 
 void ObserverLog::deleteName(void* obj){
+  boost::lock_guard<boost::recursive_mutex> guard(mutex);
   names.erase(obj);
 }
 
 void ObserverLog::deleteObservable(void* obj){
+  boost::lock_guard<boost::recursive_mutex> guard(mutex);
   observables.erase(obj);
 }
@@ -114 +126 @@
  */
 boost::shared_ptr<ObserverLog::Log> ObserverLog::addMessage(int depth){
+  boost::lock_guard<boost::recursive_mutex> guard(mutex);
   boost::shared_ptr<ObserverLog::Log> L(new Log(this));
   for(int i=depth;i--;)