Changes in src/Patterns/Observer.cpp [033a05:112b09]

File:

• src/Patterns/Observer.cpp (modified) (13 diffs)

src/Patterns/Observer.cpp

@@ -6 +6 @@
  */
 
+#include "Helpers/MemDebug.hpp"
+
 #include "Observer.hpp"
 
@@ -12 +14 @@
 
 #include "Helpers/Assert.hpp"
+#include "Helpers/MemDebug.hpp"
 
 using namespace std;
@@ -43 +46 @@
   // if no entry for this observable is found, an new one is created
   // by the STL and initialized to 0 (see STL documentation)
+#ifdef LOG_OBSERVER
+  observerLog().addMessage(depth[publisher]) << ">> Locking " << observerLog().getName(publisher) << endl;
+#endif
   depth[publisher]++;
 }
@@ -60 +66 @@
   // if zero is reached all observed blocks are done and we can
   // start to notify our observers
-  if(--(depth[publisher])){}
+  --depth[publisher];
+#ifdef LOG_OBSERVER
+  observerLog().addMessage(depth[publisher]) << "<< Unlocking " << observerLog().getName(publisher) << endl;
+#endif
+  if(depth[publisher]){}
   else{
     publisher->notifyAll();
@@ -82 +92 @@
 Observable::_Observable_protector::_Observable_protector(Observable *_protege) :
   protege(_protege)
+{
+  start_observer_internal(protege);
+}
+
+Observable::_Observable_protector::_Observable_protector(const _Observable_protector &dest) :
+    protege(dest.protege)
 {
   start_observer_internal(protege);
@@ -117 +133 @@
       callees_t::iterator iter;
       for(iter=callees.begin();iter!=callees.end();++iter){
+#ifdef LOG_OBSERVER
+        observerLog().addMessage() << "-> Sending update from " << observerLog().getName(this)
+                                   << " to " << observerLog().getName((*iter).second)
+                                   << " (priority=" << (*iter).first << ")"<< endl;
+#endif
         (*iter).second->update(this);
       }
@@ -159 +180 @@
     // we do not need to publish all the changes at each time we are called
     if(depth.find(this)==depth.end()) {
+#ifdef LOG_OBSERVER
+      observerLog().addMessage() << "-* Update from " << observerLog().getName(publisher)
+                                 << " propagated by " << observerLog().getName(this) << endl;
+#endif
       notifyAll();
+    }
+    else{
+#ifdef LOG_OBSERVER
+      observerLog().addMessage() << "-| Update from " <<  observerLog().getName(publisher)
+                                 << " not propagated by " << observerLog().getName(this) << endl;
+#endif
     }
   }
@@ -171 +202 @@
 void Observable::signOn(Observer *target,int priority) {
   ASSERT(priority>=-20 && priority<=+20, "Priority out of range [-20:+20] when signing on Observer");
+#ifdef LOG_OBSERVER
+  observerLog().addMessage() << "@@ Signing on " << observerLog().getName(target) << " to " << observerLog().getName(this) << endl;
+#endif
   bool res = false;
   callees_t &callees = callTable[this];
@@ -188 +222 @@
 void Observable::signOff(Observer *target) {
   ASSERT(callTable.count(this),"SignOff called for an Observable without Observers.");
+#ifdef LOG_OBSERVER
+  observerLog().addMessage() << "** Signing off " << observerLog().getName(target) << " from " << observerLog().getName(this) << endl;
+#endif
   callees_t &callees = callTable[this];
+
   callees_t::iterator iter;
   callees_t::iterator deliter;
@@ -231 +269 @@
 /** Constructor for class Observable.
  */
-Observable::Observable()
-{}
+Observable::Observable(string name) :
+  Observer(Observer::BaseConstructor())
+{
+#ifdef LOG_OBSERVER
+  observerLog().addName(this,name);
+  observerLog().addMessage() << "++ Creating Observable " << observerLog().getName(this) << endl;
+#endif
+}
 
 /** Destructor for class Observable.
@@ -239 +283 @@
 Observable::~Observable()
 {
+#ifdef LOG_OBSERVER
+  observerLog().addMessage() << "-- Destroying Observable " << observerLog().getName(this) << endl;
+#endif
   if(callTable.count(this)) {
     // delete all entries for this observable
@@ -252 +299 @@
 /** Constructor for class Observer.
  */
-Observer::Observer()
-{}
+Observer::Observer(string name)
+{
+#ifdef LOG_OBSERVER
+  observerLog().addName(this,name);
+  observerLog().addMessage() << "++ Creating Observer " << observerLog().getName(this) << endl;
+#endif
+}
+
+/**
+ * Base Constructor for class Observer
+ *
+ * only called from Observable Constructor
+ */
+Observer::Observer(Observer::BaseConstructor){
+#ifdef LOG_OBSERVER
+  observerLog().addObservable(this);
+#endif
+}
 
 /** Destructor for class Observer.
  */
 Observer::~Observer()
-{}
+{
+#ifdef LOG_OBSERVER
+  if(!observerLog().isObservable(this)){
+    observerLog().addMessage() << "-- Destroying Observer " << observerLog().getName(this) << endl;
+  }
+#endif
+}
 
 /**
@@ -289 +358 @@
   }
 }
+
+#ifdef LOG_OBSERVER
+
+/************************* Methods to do logging of the Observer Mechanism *********/
+
+// The log needs to exist fairly early, so we make it construct on first use,
+// and never destroy it
+ObserverLog &observerLog(){
+  // yes, this memory is never freed... we need it around for the whole programm,
+  // so no freeing is possible
+  static ObserverLog *theLog = Memory::ignore(new ObserverLog());
+  return *theLog;
+}
+
+
+ObserverLog::ObserverLog() :
+  count (0)
+{}
+
+ObserverLog::~ObserverLog(){}
+
+string ObserverLog::getLog(){return log.str();}
+
+std::string ObserverLog::getName(void* obj){
+  return names[obj];
+}
+
+bool ObserverLog::isObservable(void* obj){
+  return observables.count(obj);
+}
+
+void ObserverLog::addName(void* obj , string name){
+  stringstream sstr;
+  sstr << name << "_" << count++;
+  names[obj] = sstr.str();
+}
+
+void ObserverLog::addObservable(void* obj){
+  observables.insert(obj);
+}
+
+void ObserverLog::deleteName(void* obj){
+  names.erase(obj);
+}
+
+void ObserverLog::deleteObservable(void* obj){
+  observables.erase(obj);
+}
+
+stringstream &ObserverLog::addMessage(int depth){
+  for(int i=depth;i--;)
+    log << "  ";
+  return log;
+}
+
+#endif