Changeset 65b413 for molecuilder/src/Patterns/Observer.cpp

Timestamp:

Apr 25, 2010, 12:48:24 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

dd43a7

Parents:

c0332d

Message:

Small improvements to Observer code

File:

• molecuilder/src/Patterns/Observer.cpp (modified) (9 diffs)

molecuilder/src/Patterns/Observer.cpp

@@ -26 +26 @@
 
 map<Observable*, int> Observable::depth;  //!< Map of Observables to the depth of the DAG of Observers
-map<Observable*,multimap<int,Observer*>*> Observable::callTable; //!< Table for each Observable of all its Observers
+map<Observable*,multimap<int,Observer*> > Observable::callTable; //!< Table for each Observable of all its Observers
 std::map<Observable*,std::set<Notification*> > Observable::notifications;
 set<Observable*> Observable::busyObservables; //!< Set of Observables that are currently busy notifying their sign-on'ed Observers
@@ -103 +103 @@
  * and removes from busy list.
  */
-void Observable::notifyAll() try {
+void Observable::notifyAll() {
   // we are busy notifying others right now
   // add ourselves to the list of busy subjects to enable circle detection
@@ -109 +109 @@
   // see if anyone has signed up for observation
   // and call all observers
-  if(callTable.count(this)) {
-    // elements are stored sorted by keys in the multimap
-    // so iterating over it gives us a the callees sorted by
-    // the priorities
-    callees_t *callees = callTable[this];
-    callees_t::iterator iter;
-    for(iter=callees->begin();iter!=callees->end();++iter){
-      (*iter).second->update(this);
-    }
-  }
+  try {
+    if(callTable.count(this)) {
+      // elements are stored sorted by keys in the multimap
+      // so iterating over it gives us a the callees sorted by
+      // the priorities
+      callees_t callees = callTable[this];
+      callees_t::iterator iter;
+      for(iter=callees.begin();iter!=callees.end();++iter){
+        (*iter).second->update(this);
+      }
+    }
+  }
+  ASSERT_NOCATCH("Exception thrown from Observer Update");
 
   // send out all notifications that need to be done
@@ -133 +136 @@
   busyObservables.erase(this);
 }
-ASSERT_NOCATCH("Exception thrown from Observer Update")
+
 
 /** Handles passing on updates from sub-Observables.
@@ -169 +172 @@
   ASSERT(priority>=-20 && priority<=+20, "Priority out of range [-20:+20] when signing on Observer");
   bool res = false;
-  callees_t *callees = 0;
-  if(callTable.count(this)){
-    callees = callTable[this];
-  }
-  else {
-    callees = new multimap<int,Observer*>;
-    callTable.insert(pair<Observable*,callees_t*>(this,callees));
-  }
+  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){
     res |= ((*iter).second == target);
   }
   if(!res)
-    callees->insert(pair<int,Observer*>(priority,target));
+    callees.insert(pair<int,Observer*>(priority,target));
 }
 
@@ -192 +188 @@
 void Observable::signOff(Observer *target) {
   ASSERT(callTable.count(this),"SignOff called for an Observable without Observers.");
-  callees_t *callees = callTable[this];
+  callees_t &callees = callTable[this];
   callees_t::iterator iter;
   callees_t::iterator deliter;
-  for(iter=callees->begin();iter!=callees->end();) {
+  for(iter=callees.begin();iter!=callees.end();) {
     if((*iter).second == target) {
-      callees->erase(iter++);
+      callees.erase(iter++);
     }
     else {
@@ -203 +199 @@
     }
   }
-  if(callees->empty()){
+  if(callees.empty()){
     callTable.erase(this);
-    delete callees;
   }
 }
@@ -246 +241 @@
   if(callTable.count(this)) {
     // delete all entries for this observable
-    callees_t *callees = callTable[this];
+    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);
-    delete callees;
   }
 }
@@ -272 +266 @@
  */
 void Observer::recieveNotification(Observable *publisher, Notification_ptr notification){
+  ASSERT(0,"Notification received by object that did not sign on for it.");
 }