Changeset 1f96ec for src

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

dd7c44

Parents:

959c82

git-author:

Frederik Heber <heber@…> (07/10/15 08:28:17)

git-committer:

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

Message:

Channels has its own mutex now, too.

Location:

src

Files:

• CodePatterns/Observer/Channels.hpp (modified) (2 diffs)
• Observer/Channels.cpp (modified) (7 diffs)

src/CodePatterns/Observer/Channels.hpp

@@ -15 +15 @@
 
 #include <map>
+
+#include <boost/thread/recursive_mutex.hpp>
 
 #include "CodePatterns/Observer/defs.hpp"
@@ -64 +66 @@
 
   NotificationTypetoRefMap ChannelMap;
+
+  mutable boost::recursive_mutex ChannelLock; //!< a lock for the pointer of the instance
 };
 

src/Observer/Channels.cpp

@@ -20 +20 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include <boost/thread/locks.hpp>
+
 #include "CodePatterns/Assert.hpp"
 
@@ -31 +33 @@
 Channels::~Channels()
 {
+  boost::recursive_mutex::scoped_lock guard(ChannelLock);
   // free all present Notifications
   for(NotificationTypetoRefMap::iterator iter = ChannelMap.begin();
@@ -40 +43 @@
 void Channels::addChannel(size_t no)
 {
+  boost::recursive_mutex::scoped_lock guard(ChannelLock);
 #ifndef NDEBUG
   NotificationTypetoRefMap::const_iterator iter = ChannelMap.find(no);
@@ -50 +54 @@
 void Channels::removeChannel(size_t no)
 {
+  boost::recursive_mutex::scoped_lock guard(ChannelLock);
   NotificationTypetoRefMap::iterator iter = ChannelMap.find(no);
   ASSERT(iter != ChannelMap.end(),
@@ -59 +64 @@
 void Channels::subjectKilled(Observable * const publisher)
 {
+  boost::recursive_mutex::scoped_lock guard(ChannelLock);
   for(NotificationTypetoRefMap::iterator iter = ChannelMap.begin();
       iter != ChannelMap.end();++iter) {
@@ -67 +73 @@
 Notification_ptr Channels::getChannel(size_t no) const
 {
+  boost::recursive_mutex::scoped_lock guard(ChannelLock);
   NotificationTypetoRefMap::const_iterator iter = ChannelMap.find(no);
   ASSERT(iter != ChannelMap.end(),
@@ -75 +82 @@
 size_t Channels::getType(Notification_ptr channel) const
 {
+  boost::recursive_mutex::scoped_lock guard(ChannelLock);
   return channel->getChannelNo();
 }