Changeset 3681dd for src/CodePatterns

Timestamp:

Oct 30, 2015, 11:44:33 AM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

315a1e

Parents:

6e2f3b

git-author:

Frederik Heber <heber@…> (10/30/15 11:40:59)

git-committer:

Frederik Heber <heber@…> (10/30/15 11:44:33)

Message:

FIX: Equipped Cacheable with mutex locking read&write to owner.

File:

• src/CodePatterns/Cacheable.hpp (modified) (7 diffs)

src/CodePatterns/Cacheable.hpp

@@ -18 +18 @@
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/thread/locks.hpp>
+#include <boost/thread/recursive_mutex.hpp>
 
 #include "CodePatterns/Assert.hpp"
@@ -166 +168 @@
     state_ptr validState;
     // destroyed state is not predefined, because we rarely enter that state and never leave
+
+    //!> mutex to ensure access is only per-thread
+    mutable boost::recursive_mutex ownerLock;
 
     const Observable * const owner;
@@ -195 +200 @@
     // we sign on with the best(=lowest) priority, so cached values are recalculated before
     // anybody else might ask for updated values
+    boost::lock_guard<boost::recursive_mutex> guard(ownerLock);
     if (owner != NULL) {
       if (channels.empty()) {
@@ -215 +221 @@
   const T Cacheable<T>::operator*() const{
     // we can only use the cacheable when the owner is not changing at the moment
+    boost::lock_guard<boost::recursive_mutex> guard(ownerLock);
     if ((owner == NULL) || (!owner->isBlocked())) {
       return state->getValue();
@@ -226 +233 @@
   Cacheable<T>::~Cacheable()
   {
+    boost::lock_guard<boost::recursive_mutex> guard(ownerLock);
     if (owner != NULL) {
       if (channels.empty()) {
@@ -252 +260 @@
   template<typename T>
   void Cacheable<T>::recieveNotification(Observable *publisher, Notification_ptr notification) {
+    boost::lock_guard<boost::recursive_mutex> guard(ownerLock);
     if (publisher == owner) {
       ASSERT( !channels.empty(),
@@ -266 +275 @@
     state_ptr destroyed = state_ptr(new DestroyedState(this));
     switchState(destroyed);
+    boost::lock_guard<boost::recursive_mutex> guard(ownerLock);
+    const_cast<const Observable *&>(owner) = NULL;
   }