Changes in src/Patterns/Observer.hpp [d5f216:50fc88c]

File:

• src/Patterns/Observer.hpp (modified) (3 diffs)

src/Patterns/Observer.hpp

@@ -16 +16 @@
  *
  * Observers register themselves with the observables to be notified when something changes.
- * In the Observable code that changes attributes should be wrapped in
- * START_OBSERVER ... END_OBSERVER blocks. If other methods are called that also contain
- * Observation blocks from there, these functions wont trigger notifications. Only the end
- * of the final observation block triggers the update of Observers.
+ * In the Observable code that changes attributes should be started with OBSERVE;. This macro
+ * locks the observer mechanism while changes are done. At the end of the scope in which the
+ * macro was placed the lock is released. When the last lock is released all changes are
+ * propagated to the observers.
  *
  * Each observerable can have sub-observables. When one of these sub-observables changes and
@@ -47 +47 @@
   virtual ~Observable();
 
-  virtual void signOn(Observer *target);
+  virtual void signOn(Observer *target, int priority=0);
   virtual void signOff(Observer *target);
 
@@ -59 +59 @@
   /**
    * Internal method.
-   * Do not call directly. Use START_OBSERVER macro instead
+   * Do not call directly. Use OBSERVE macro instead
    */
   static void start_observer_internal(Observable *publisher);
   /**
    * Internal method.
-   * Do not call directly. Use FINISH_OBSERVER macro instead
+   * Do not call directly. Use OBSERVE macro instead
    */
   static void finish_observer_internal(Observable *publisher);
 
 private:
+  typedef std::multimap<int,Observer*> callees_t;
   static std::map<Observable*, int> depth;
-  static std::multimap<Observable*,Observer*> callTable;
+  static std::map<Observable*,callees_t*> callTable;
   static std::set<Observable*> busyObservables;
+
+  // Structure for RAII-Style notification
+protected:
+  class _Observable_protector {
+  public:
+    _Observable_protector(Observable *);
+    ~_Observable_protector();
+  private:
+    Observable *protege;
+  };
 };
 
-
-
-#define START_OBSERVER Observable::start_observer_internal(this);do{do{}while(0)
-#define FINISH_OBSERVER }while(0);Observable::finish_observer_internal(this)
+// extra macro is necessary to work with __LINE__
+#define PASTE(a,b) PASTE_HELPER(a,b)
+#define PASTE_HELPER(a,b) a ## b
+#define OBSERVE Observable::_Observable_protector PASTE(_scope_obs_protector_,__LINE__)(this)
+// deprecated macros from before RAII was used
+//#define START_OBSERVER Observable::start_observer_internal(this);do{do{}while(0)
+//#define FINISH_OBSERVER }while(0);Observable::finish_observer_internal(this)
+//#define RETURN_OBSERVER( retval ) do{Observable::finish_observer_internal(this); return (retval);}while(0)
 #endif /* OBSERVER_HPP_ */