Changeset 1c291d for src/Observer

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().

Location:

src/Observer

Files:

• Channels.cpp (modified) (3 diffs)
• Notification.cpp (modified) (1 diff)
• Observable.cpp (modified) (5 diffs)
• unittests/ObserverUnitTest.cpp (modified) (2 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);
+  }
 }
 

src/Observer/Notification.cpp

@@ -47 +47 @@
   }
 }
+
+void Notification::subjectKilled(Observable * const publisher)
+{
+  for(std::set<Observer*>::iterator it=targets.begin();
+      it!=targets.end();++it){
+    (*it)->subjectKilled(publisher);
+  }
+}

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);

src/Observer/unittests/ObserverUnitTest.cpp

@@ -298 +298 @@
 
   RelayNotified->wasNotified=false;
+  notificationObserver1->wasNotified=false;
 
   // operation2
   notificationObservable->operation2();
   CPPUNIT_ASSERT(!RelayNotified->wasNotified);
-  CPPUNIT_ASSERT(notificationObserver1->wasNotified);
+  CPPUNIT_ASSERT(!notificationObserver1->wasNotified);
 
   // signOff relay from 1 and operation1
@@ -313 +314 @@
 
   // test kill subject
+  RelayNotifier->signOff(RelayNotified, NotificationObservable::Operation1Notify);
   delete RelayNotified;
   RelayNotified = NULL; // delete in tearDown is allowed for NULL
   notificationObservable->operation1();
+  notificationObservable->signOff(RelayNotifier, NotificationObservable::Operation2Notify);
   delete notificationObservable;
   notificationObservable = NULL; // delete in tearDown is allowed for NULL