Changeset 8776

Timestamp:

Jul 25, 2011, 1:05:04 PM (13 years ago)

Author:

landauf

Message:

in OutputManager: getInstance now only creates an instance of OutputManager, while getInstanceAndCreateListeners does additional stuff. the latter ins only used in OutputStream to ensure the default listeners (LogWriter, etc) get created. This should avoid circular calls.

Location:

code/branches/output/src/libraries/util/output

Files:

• LogWriter.cc (modified) (1 diff)
• OutputListener.cc (modified) (3 diffs)
• OutputManager.cc (modified) (2 diffs)
• OutputManager.h (modified) (1 diff)
• OutputStream.cc (modified) (2 diffs)

code/branches/output/src/libraries/util/output/LogWriter.cc

@@ -83 +83 @@
 
         if (this->bDefaultPath_)
-            OutputManager::getInstanceInternal().pushMessage(level::user_info, context::output, "Opening log file " + name);
+            OutputManager::getInstance().pushMessage(level::user_info, context::output, "Opening log file " + name);
 
         this->file_.open(name.c_str(), std::fstream::out);

code/branches/output/src/libraries/util/output/OutputListener.cc

@@ -40 +40 @@
         this->contextMask_ = context::all;
 
-        OutputManager::getInstanceInternal().registerListener(this);
+        OutputManager::getInstance().registerListener(this);
     }
 
     OutputListener::~OutputListener()
     {
-        OutputManager::getInstanceInternal().unregisterListener(this);
+        OutputManager::getInstance().unregisterListener(this);
     }
 
@@ -67 +67 @@
         this->levelMask_ = mask;
 
-        OutputManager::getInstanceInternal().updateCombinedLevelMask();
+        OutputManager::getInstance().updateCombinedLevelMask();
     }
 
@@ -74 +74 @@
         this->contextMask_ = mask;
 
-        OutputManager::getInstanceInternal().updateCombinedContextMask();
+        OutputManager::getInstance().updateCombinedContextMask();
     }
 }

code/branches/output/src/libraries/util/output/OutputManager.cc

@@ -69 +69 @@
     /*static*/ OutputManager& OutputManager::getInstance()
     {
-        static OutputManager& instance = OutputManager::getInstanceInternal();
+        static OutputManager instance;
+        return instance;
+    }
+
+    /*static*/ OutputManager& OutputManager::getInstanceAndCreateListeners()
+    {
+        static OutputManager& instance = OutputManager::getInstance();
 
         static ConsoleOutput consoleOutputInstance;
@@ -75 +81 @@
         static LogWriter& logWriterInstance = LogWriter::getInstance(); (void)logWriterInstance;
 
-        return instance;
-    }
-
-    /*static*/ OutputManager& OutputManager::getInstanceInternal()
-    {
-        static OutputManager instance;
         return instance;
     }

code/branches/output/src/libraries/util/output/OutputManager.h

@@ -48 +48 @@
         public:
             static OutputManager& getInstance();
-            static OutputManager& getInstanceInternal();
+            static OutputManager& getInstanceAndCreateListeners();
 
             void pushMessage(OutputLevel level, OutputContext context, const std::string& message);

code/branches/output/src/libraries/util/output/OutputStream.cc

@@ -44 +44 @@
     void OutputStream::sendMessage()
     {
-        OutputManager::getInstance().pushMessage(this->level_, this->context_, this->str());
+        OutputManager::getInstanceAndCreateListeners().pushMessage(this->level_, this->context_, this->str());
         this->str("");
     }
@@ -53 +53 @@
         this->context_ = context;
 
-        this->bAcceptsOutput_ = OutputManager::getInstance().acceptsOutput(level, context);
+        this->bAcceptsOutput_ = OutputManager::getInstanceAndCreateListeners().acceptsOutput(level, context);
     }
 }