Changeset 1c291d for src/Observer/Channels.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/Channels.cpp (modified) (3 diffs)

src/Observer/Channels.cpp

@@ -34 +34 @@
   for(NotificationTypetoRefMap::iterator iter = ChannelMap.begin();
       !ChannelMap.empty(); iter = ChannelMap.begin()) {
-    delete iter->second;
-    ChannelMap.erase(iter);
+    removeChannel(iter->first);
   }
 }
@@ -41 +40 @@
 void Channels::addChannel(size_t no)
 {
+#ifdef NDEBUG
   NotificationTypetoRefMap::const_iterator iter = ChannelMap.find(no);
   ASSERT(iter == ChannelMap.end(),
       "Channels::addChannel() - channel "+toString(int(no))+" is already present in ChannelMap.");
+#endif
   ChannelMap.insert( std::make_pair(no, new Notification(no)) );
 }
@@ -54 +55 @@
   delete iter->second;
   ChannelMap.erase(iter);
+}
+
+void Channels::subjectKilled(Observable * const publisher)
+{
+  for(NotificationTypetoRefMap::iterator iter = ChannelMap.begin();
+      iter != ChannelMap.end();++iter) {
+    iter->second->subjectKilled(publisher);
+  }
 }