Changeset c8d1952

Timestamp:

Mar 19, 2010, 4:55:28 PM (15 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

91379c

Parents:

239987d

git-author:

Tillmann Crueger <crueger@…> (03/19/10 16:24:47)

git-committer:

Tillmann Crueger <crueger@…> (03/19/10 16:55:28)

Message:

Made the cacheable always recalculate when the owner is in the process of updating
(cherry picked from commit 6234ef6106a5d0b8c1d29976e4e4304c66bb5c8b)

File:

• molecuilder/src/Patterns/Cacheable.hpp (modified) (8 diffs)

molecuilder/src/Patterns/Cacheable.hpp

@@ -25 +25 @@
     public:
       State(Cacheable *_owner) :
-        owner(_owner),
-        busy(false)
-        {}
-      virtual T& getValue()=0;
+        busy(false),
+        owner(_owner)
+        {}
+      virtual T getValue()=0;
       virtual void invalidate()=0;
       virtual bool isValid()=0;
@@ -46 +46 @@
         {}
 
-      virtual T& getValue(){
+      virtual T getValue(){
         // set the state to valid
         State::owner->switchState(State::owner->validState);
@@ -72 +72 @@
         {}
 
-      virtual T& getValue(){
+      virtual T getValue(){
         return content;
       }
@@ -100 +100 @@
         {}
 
-      virtual T& getValue(){
+      virtual T getValue(){
         ASSERT(0,"Cannot get a value from a Cacheable after it's Observable has died");
         // we have to return a grossly invalid reference, because no value can be produced anymore
@@ -128 +128 @@
 
     const bool isValid() const;
-    const T& operator*() const;
+    const T operator*() const;
 
     // methods implemented for base-class Observer
@@ -173 +173 @@
 
   template<typename T>
-  const T& Cacheable<T>::operator*() const{
-    return state->getValue();
+  const T Cacheable<T>::operator*() const{
+    // we can only use the cacheable when the owner is not changing at the moment
+    if(!owner->isBlocked()){
+      return state->getValue();
+    }
+    else{
+      return recalcMethod();
+    }
   }
 
@@ -215 +221 @@
 
     const bool isValid() const;
-    const T& operator*() const;
+    const T operator*() const;
 
     // methods implemented for base-class Observer
@@ -231 +237 @@
 
   template<typename T>
-  const T& Cacheable<T>::operator*() const{
+  const T Cacheable<T>::operator*() const{
     return recalcMethod();
   }