Changeset 1c291d for src/Observer/Observable.cpp

Timestamp:

Mar 18, 2013, 6:29:41 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

3f30cc

Parents:

b9273a

git-author:

Frederik Heber <heber@…> (03/18/13 18:22:47)

git-committer:

Frederik Heber <heber@…> (03/18/13 18:29:41)

Message:

Channels and Notifications pass on subjectKilled().

• if we only sign on to a single notification channel, we miss on subjectKilled() completely. Hence, we have to chance of properly signing off again or, at least, to know that we must not anymore.
• Hence, Observable's dstor now calls subjectKilled() on its Channels which passes the call on to all its Notifications that in turn use the subjectKilled() slot of their targets along with the passed-through Observable instance.
• also added observerLog verbosity when signing on/off to channels.
• explained this in header documentation of Observable, Channels, and Notification.
• TESTFIX: ObserverUnitTest did not properly signOff() before deleting instances in relayNotificationTest().

File:

• src/Observer/Observable.cpp (modified) (5 diffs)

src/Observer/Observable.cpp

@@ -276 +276 @@
 {
   Notification_ptr notification = getChannel(channelno);
+#ifdef LOG_OBSERVER
+  observerLog().addMessage() << "@@ Signing on " << observerLog().getName(target)
+      << " to " << observerLog().getName(const_cast<Observable *>(this))
+      << "'s channel no." << channelno << ".";
+#endif
   notification->addObserver(target);
 }
@@ -282 +287 @@
 {
   Notification_ptr notification = getChannel(channelno);
+#ifdef LOG_OBSERVER
+  observerLog().addMessage() << "** Signing off " << observerLog().getName(target)
+      << " from " << observerLog().getName(const_cast<Observable *>(this))
+      << "'s channel no." << channelno << ".";
+#endif
   notification->removeObserver(target);
 }
@@ -315 +325 @@
 #ifdef LOG_OBSERVER
   observerLog().addName(this,name);
-  observerLog().addMessage() << "++ Creating Observable " << observerLog().getName(this);
+  observerLog().addMessage() << "++ Creating Observable "
+      << observerLog().getName(static_cast<Observable *>(this));
 #endif
 }
@@ -325 +336 @@
 {
 #ifdef LOG_OBSERVER
-  observerLog().addMessage() << "-- Destroying Observable " << observerLog().getName(this);
+  observerLog().addMessage() << "-- Destroying Observable "
+      << observerLog().getName(static_cast<Observable *>(this));
 #endif
   if(callTable.count(this)) {
@@ -331 +343 @@
     callees_t callees = callTable[this];
     callees_t::iterator iter;
-    for(iter=callees.begin();iter!=callees.end();++iter){
+    for(iter=callees.begin();iter!=callees.end();++iter)
       (*iter).second->subjectKilled(this);
-    }
     callTable.erase(this);
   }
 
   // also kill instance in static Channels map if present
-  ChannelMap::iterator iter = NotificationChannels.find(this);
+  ChannelMap::iterator iter = NotificationChannels.find(static_cast<Observable *>(this));
   if (iter != NotificationChannels.end()) {
+    iter->second->subjectKilled(static_cast<Observable *>(this));
     delete iter->second;
     NotificationChannels.erase(iter);