Changes in src/Patterns/Observer.hpp [033a05:cd5047]

File:

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

src/Patterns/Observer.hpp

@@ -11 +11 @@
 #include <map>
 #include <set>
+#include <string>
+#include <sstream>
 
 /**
@@ -28 +30 @@
  */
 
+// Deactivate any logging when we are not in debug mode
+#ifdef NDEBUG
+#undef LOG_OBSERVER
+#endif
+
 class Observable;
 class Notification;
@@ -35 +42 @@
 // identification process
 typedef Notification *const Notification_ptr;
+
+template<class _Set>
+class ObservedIterator;
 
 /**
@@ -53 +63 @@
   friend class Observable;
   friend class Notification;
-public:
-  Observer();
+  template<class> friend class ObservedIterator;
+
+  // indicates the constructor called from Observables
+  struct BaseConstructor{};
+
+public:
+  Observer(BaseConstructor);
+  Observer(std::string);
   virtual ~Observer();
 
@@ -86 +102 @@
 class Observable : public Observer {
 public:
-  Observable();
+  Observable(std::string _name);
   virtual ~Observable();
 
@@ -152 +168 @@
   static std::set<Observable*> busyObservables;
 
-
   //! @cond
   // Structure for RAII-Style notification
@@ -164 +179 @@
   public:
     _Observable_protector(Observable *);
+    _Observable_protector(const _Observable_protector&);
     ~_Observable_protector();
   private:
@@ -187 +203 @@
 };
 
+#ifdef LOG_OBSERVER
+
+/**
+ * This class is used to log the working of the observer mechanism
+ *
+ * TODO: make this conditional dependent on compiler Flag.
+ */
+class ObserverLog{
+  friend class Observable;
+  friend class Observer;
+  template <typename> friend class Cacheable;
+public:
+  ObserverLog();
+  ~ObserverLog();
+  std::string getLog();                        // get everything that has been logged
+  std::string getName(void*);                  // get the name of an actor
+  bool isObservable(void*);
+private:
+  int count;                                   // number to reference each actor in this framework
+  std::map<void*,std::string> names;           // List of names assigned to actors
+  std::set<void*> observables;                 // List of pointers to Observables. Needed to distinguish Observers and Observables
+  void addName(void*, std::string);            // Assign a name to an Actor
+  void addObservable(void*);
+  void deleteName(void*);                      // delete the name of an Actor
+  void deleteObservable(void*);
+  std::stringstream &addMessage(int depth=0);  // Add a Message to the logging
+  std::stringstream log;                       // The internal log object
+};
+
+ObserverLog &observerLog();
+
+#endif
+
 // extra macro is necessary to work with __LINE__
 #define PASTE(a,b) PASTE_HELPER(a,b)