Changeset f3d16a

Timestamp:

Jul 14, 2014, 8:36:58 PM (11 years ago)

Author:

Frederik Heber <heber@…>

Children:

e93bfe

Parents:

44f368

git-author:

Frederik Heber <heber@…> (10/15/13 13:31:42)

git-committer:

Frederik Heber <heber@…> (07/14/14 20:36:58)

Message:

FIX: Fixes to Graveyard and Zombies.

Location:

src

Files:

• CodePatterns/Observer/Observable.hpp (modified) (2 diffs)
• CodePatterns/Observer/Zombie.hpp (modified) (1 diff)
• Observer/Graveyard.cpp (modified) (3 diffs)
• Observer/Notification.cpp (modified) (2 diffs)
• Observer/Observable.cpp (modified) (3 diffs)

src/CodePatterns/Observer/Observable.hpp

@@ -141 +141 @@
   typedef boost::function<void (const Observable*)> graveyard_informer_t;
 
-  //!> bound function to call when Observer are signing off
-  graveyard_informer_t &graveyard_informer;
+  /** Bound function to call when Observer are signing off (needs to be a ptr
+   * as we must be able to rebound it.
+   *
+   * \warning Do not delete this pointer, the instance is either a static one
+   * or handled someplace else (e.g. in the Graveyard).
+   */
+  graveyard_informer_t * graveyard_informer;
 
   //!> default informer that does nothing
@@ -149 +154 @@
   /** Sets the bound function for over-time life-time management.
    *
-   * \param _graveyard Graveyard to inform of leaving Observers
+   * \param _graveyard ptr Graveyard to inform of leaving Observers
    */
-  void setGraveyardInformer(graveyard_informer_t &_graveyard_informer)
+  void setGraveyardInformer(graveyard_informer_t * _graveyard_informer)
   {
     graveyard_informer = _graveyard_informer;

src/CodePatterns/Observer/Zombie.hpp

@@ -34 +34 @@
    *
    * Is private to allow only Graveyard to instantiate them.
+   *
+   * \param _observable observable to wrap, ptr is NULL'd
+   * \param _graveyard_informer callback when Observers are signOff()'ing
    */
   Zombie(
       Observable *& _observable,
-      Observable::graveyard_informer_t _graveyard_informer) :
+      Observable::graveyard_informer_t *_graveyard_informer) :
     m_observable(_observable)
   {

src/Observer/Graveyard.cpp

@@ -36 +36 @@
 
 #include "CodePatterns/Observer/Graveyard.hpp"
+#include "CodePatterns/Observer/ObserverLog.hpp"
 
 #include <boost/bind.hpp>
@@ -54 +55 @@
 {
 //  LOG(1, "Adding Observable "+toString(_observable)+".");
-  Zombie::ptr newzombie(new Zombie(_observable, graveyard_informer));
+#ifdef LOG_OBSERVER
+  observerLog().addMessage(0) << "++ Turning " << observerLog().getName(_observable)
+      << " into a Zombie.";
+#endif
+  Zombie::ptr newzombie(new Zombie(_observable, &graveyard_informer));
   if (newzombie->getNumberOfObservers() != 0)
     graveyard.insert( std::make_pair(newzombie->getPtr(), newzombie) );
@@ -63 +68 @@
   graveyard_t::iterator iter = graveyard.find(_observable);
   if (iter != graveyard.end()) {
+#ifdef LOG_OBSERVER
+  observerLog().addMessage(0) << "++ Zombie " << observerLog().getName(const_cast<Observable *>(_observable))
+      << " has " << iter->second->getNumberOfObservers() << " Observers left.";
+#endif
     // remove zombie if no Observers are left
     if (iter->second->getNumberOfObservers() == 0)

src/Observer/Notification.cpp

@@ -22 +22 @@
 #include "CodePatterns/Observer/Notification.hpp"
 #include "CodePatterns/Observer/Observer.hpp"
-
+#include "CodePatterns/Observer/ObserverLog.hpp"
 
 Notification::Notification(size_t _channelno) :
@@ -44 +44 @@
   for(std::set<Observer*>::iterator it=targets.begin();
       it!=targets.end();++it){
+#ifdef LOG_OBSERVER
+    observerLog().addMessage() << "-> Sending update from " << observerLog().getName(publisher)
+                               << " for channel " << channelno
+                               << " to " << observerLog().getName(*it);
+#endif
     (*it)->recieveNotification(publisher,this);
   }

src/Observer/Observable.cpp

@@ -276 +276 @@
     callTable.erase(const_cast<Observable *>(this));
   }
-  graveyard_informer(this);
+  (*graveyard_informer)(this);
 }
 
@@ -299 +299 @@
 #endif
   notification->removeObserver(target);
-  graveyard_informer(this);
+  (*graveyard_informer)(this);
 }
 
@@ -352 +352 @@
 Observable::Observable(std::string name) :
   Observer(Observer::BaseConstructor()),
-  graveyard_informer(noop_informer)
+  graveyard_informer(&noop_informer)
 {
 #ifdef LOG_OBSERVER