Changeset 8774

Timestamp:

Jul 24, 2011, 11:50:20 PM (13 years ago)

Author:

landauf

Message:

added LogWriter and MemoryWriter

Location:

code/branches/output/src/libraries/util

Files:

• CMakeLists.txt (modified) (1 diff)
• output/LogWriter.cc (added)
• output/LogWriter.h (added)
• output/MemoryWriter.cc (added)
• output/MemoryWriter.h (added)
• output/OutputDefinitions.h (modified) (1 diff)
• output/OutputListener.h (modified) (2 diffs)
• output/OutputManager.cc (modified) (5 diffs)
• output/OutputManager.h (modified) (3 diffs)

code/branches/output/src/libraries/util/CMakeLists.txt

@@ -43 +43 @@
   output/OutputManager.cc
   output/OutputListener.cc
+  output/LogWriter.cc
+  output/MemoryWriter.cc
 )
 

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

@@ -69 +69 @@
         static const OutputContext test1     = registerContext("test1");
         static const OutputContext test2     = registerContext("test2");
+        static const OutputContext output    = registerContext("output");
     }
 }

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

@@ -42 +42 @@
     class _UtilExport OutputListener
     {
-        friend class OutputManager;
-
         public:
             OutputListener();
@@ -63 +61 @@
                 { return ((this->levelMask_ & level) && (this->contextMask_ & context)); }
 
+            inline void unfilteredOutput(OutputLevel level, OutputContext context, const std::vector<std::string>& lines)
+                { if (this->acceptsOutput(level, context)) this->output(level, context, lines); }
+
+        protected:
             virtual void output(OutputLevel level, OutputContext context, const std::vector<std::string>& lines) = 0;
 

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

@@ -31 +31 @@
 #include "util/Debug.h"
 #include "OutputListener.h"
+#include "MemoryWriter.h"
+#include "LogWriter.h"
 
 namespace orxonox
@@ -44 +46 @@
             }
 
+        protected:
             virtual void output(OutputLevel level, OutputContext context, const std::vector<std::string>& lines)
             {
-                std::string prefix = OutputManager::getInstance().getLevelName(level) + ": ";
-                if (context != context::undefined)
-                {
-                    std::string context_name = OutputManager::getInstance().getContextName(context);
-                    if (context_name == "")
-                        context_name = OutputManager::getInstance().getComposedContextName(context);
-                    prefix += "[" + context_name + "] ";
-                }
+                const std::string& prefix = OutputManager::getInstance().getDefaultPrefix(level, context);
                 std::string blanks(prefix.length(), ' ');
 
@@ -74 +70 @@
     {
         static OutputManager& instance = OutputManager::getInstanceInternal();
+
         static ConsoleOutput consoleOutputInstance;
+        static MemoryWriter& memoryWriterInstance = MemoryWriter::getInstance(); (void)memoryWriterInstance;
+        static LogWriter& logWriterInstance = LogWriter::getInstance(); (void)logWriterInstance;
+
         return instance;
     }
@@ -94 +94 @@
 
         for (size_t i = 0; i < this->listeners_.size(); ++i)
-            if (this->listeners_[i]->acceptsOutput(level, context))
-                this->listeners_[i]->output(level, context, lines);
+            this->listeners_[i]->unfilteredOutput(level, context, lines);
     }
 
@@ -211 +210 @@
         return name;
     }
+
+    std::string OutputManager::getDefaultPrefix(OutputLevel level, OutputContext context) const
+    {
+        std::string prefix = this->getLevelName(level) + ": ";
+        if (context != context::undefined)
+        {
+            std::string context_name = this->getContextName(context);
+            if (context_name == "")
+                context_name = this->getComposedContextName(context);
+            prefix += "[" + context_name + "] ";
+        }
+        return prefix;
+    }
 }
 }

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

@@ -46 +46 @@
     class _UtilExport OutputManager
     {
-        friend class OutputListener;
-
         public:
             static OutputManager& getInstance();
+            static OutputManager& getInstanceInternal();
 
             void pushMessage(OutputLevel level, OutputContext context, const std::string& message);
@@ -73 +72 @@
             const std::string& getContextName(OutputContext context) const;
             std::string getComposedContextName(OutputContext context) const;
+            std::string getDefaultPrefix(OutputLevel level, OutputContext context) const;
 
         private:
@@ -78 +78 @@
             OutputManager(const OutputManager&);
             ~OutputManager();
-
-            static OutputManager& getInstanceInternal();
 
             std::vector<OutputListener*> listeners_;