Changeset 2c11c1 for src/Patterns/Observer/Observable.cpp

Timestamp:

Dec 13, 2011, 10:45:00 AM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

d85532

Parents:

40f2e6

git-author:

Frederik Heber <heber@…> (12/02/11 13:05:49)

git-committer:

Frederik Heber <heber@…> (12/13/11 10:45:00)

Message:

Modified ObserverLog: Singleton and both output to screen and internal Log.

• ObserverLog can now either be printed concurrently or later requested as string (e.g. on exit as has been done before). This should ease debugging Observer code.
• enable/disableLogging() (dis)activate printing to screen.
• ObserverLog is now a true singleton.

Details:

• Implemented helper class ObserverLog::Log which is returned as boost::shared_ptr on addMessage() and can be streamed to.
• On dstor the logged message is appended with endl, placed into ObserverLog's internal log and printed on screen if enableLogging().
• NOTE: streaming std::endl is not working, and not necessary.

File:

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

src/Patterns/Observer/Observable.cpp

@@ -77 +77 @@
   // by the STL and initialized to 0 (see STL documentation)
 #ifdef LOG_OBSERVER
-  observerLog().addMessage(depth[publisher]) << ">> Locking " << observerLog().getName(publisher) << std::endl;
+  observerLog().addMessage(depth[publisher]) << ">> Locking " << observerLog().getName(publisher);
 #endif
   depth[publisher]++;
@@ -98 +98 @@
   --depth[publisher];
 #ifdef LOG_OBSERVER
-  observerLog().addMessage(depth[publisher]) << "<< Unlocking " << observerLog().getName(publisher) << std::endl;
+  observerLog().addMessage(depth[publisher]) << "<< Unlocking " << observerLog().getName(publisher);
 #endif
   if(depth[publisher]){}
@@ -165 +165 @@
         observerLog().addMessage() << "-> Sending update from " << observerLog().getName(this)
                                    << " to " << observerLog().getName((*iter).second)
-                                   << " (priority=" << (*iter).first << ")"<< std::endl;
+                                   << " (priority=" << (*iter).first << ")";
 #endif
         (*iter).second->update(this);
@@ -211 +211 @@
 #ifdef LOG_OBSERVER
       observerLog().addMessage() << "-* Update from " << observerLog().getName(publisher)
-                                 << " propagated by " << observerLog().getName(this) << std::endl;
+                                 << " propagated by " << observerLog().getName(this);
 #endif
       notifyAll();
@@ -218 +218 @@
 #ifdef LOG_OBSERVER
       observerLog().addMessage() << "-| Update from " <<  observerLog().getName(publisher)
-                                 << " not propagated by " << observerLog().getName(this) << std::endl;
+                                 << " not propagated by " << observerLog().getName(this);
 #endif
     }
@@ -232 +232 @@
 {
 #ifdef LOG_OBSERVER
-  observerLog().addMessage() << "@@ Signing on " << observerLog().getName(target) << " to " << observerLog().getName(const_cast<Observable *>(this)) << std::endl;
+  observerLog().addMessage() << "@@ Signing on " << observerLog().getName(target) << " to " << observerLog().getName(const_cast<Observable *>(this));
 #endif
   bool res = false;
@@ -254 +254 @@
       "SignOff called for an Observable without Observers.");
 #ifdef LOG_OBSERVER
-  observerLog().addMessage() << "** Signing off " << observerLog().getName(target) << " from " << observerLog().getName(const_cast<Observable *>(this)) << std::endl;
+  observerLog().addMessage() << "** Signing off " << observerLog().getName(target) << " from " << observerLog().getName(const_cast<Observable *>(this));
 #endif
   callees_t &callees = callTable[const_cast<Observable *>(this)];
@@ -315 +315 @@
 #ifdef LOG_OBSERVER
   observerLog().addName(this,name);
-  observerLog().addMessage() << "++ Creating Observable " << observerLog().getName(this) << std::endl;
+  observerLog().addMessage() << "++ Creating Observable " << observerLog().getName(this);
 #endif
 }
@@ -325 +325 @@
 {
 #ifdef LOG_OBSERVER
-  observerLog().addMessage() << "-- Destroying Observable " << observerLog().getName(this) << std::endl;
+  observerLog().addMessage() << "-- Destroying Observable " << observerLog().getName(this);
 #endif
   if(callTable.count(this)) {