Changeset 8850 for code/branches

Timestamp:

Aug 21, 2011, 6:27:30 PM (13 years ago)

Author:

landauf

Message:

moved filtering of sub-contexts from BaseWriter to a new interface SubcontextOutputListener

Location:

code/branches/output/src/libraries/util

Files:

• CMakeLists.txt (modified) (1 diff)
• output/BaseWriter.cc (modified) (5 diffs)
• output/BaseWriter.h (modified) (2 diffs)
• output/OutputListener.cc (modified) (1 diff)
• output/OutputListener.h (modified) (1 diff)
• output/SubcontextOutputListener.cc (added)
• output/SubcontextOutputListener.h (added)

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

@@ -46 +46 @@
   output/LogWriter.cc
   output/MemoryWriter.cc
+  output/SubcontextOutputListener.cc
 )
 

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

@@ -33 +33 @@
 namespace orxonox
 {
-    BaseWriter::BaseWriter(const std::string& name, bool bRegister) : OutputListener(bRegister)
+    BaseWriter::BaseWriter(const std::string& name, bool bRegister) : SubcontextOutputListener(bRegister)
     {
         this->name_ = name;
@@ -40 +40 @@
         this->configurableAdditionalContextsMaxLevel_ = level::verbose;
         this->configurableAdditionalContexts_.push_back("example");
-
-        this->subcontextsCheckMask_ = context::none;
-        this->subcontextsNoCheckMask_ = context::none;
 
         this->changedConfigurableLevel();
@@ -55 +52 @@
     void BaseWriter::output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines)
     {
-        if (((this->subcontextsCheckMask_ & context.mask) == 0) ||
-            (this->subcontextsNoCheckMask_ & context.mask) ||
-            (this->subcontexts_.find(context.sub_id) != this->subcontexts_.end()))
-        {
-            const std::string& prefix = OutputManager::getInstance().getDefaultPrefix(level, context);
-            std::string blanks(prefix.length(), ' ');
+        const std::string& prefix = OutputManager::getInstance().getDefaultPrefix(level, context);
+        std::string blanks(prefix.length(), ' ');
 
-            for (size_t i = 0; i < lines.size(); ++i)
-                this->printLine((i == 0 ? prefix : blanks) + lines[i], level);
-        }
+        for (size_t i = 0; i < lines.size(); ++i)
+            this->printLine((i == 0 ? prefix : blanks) + lines[i], level);
     }
 
@@ -91 +83 @@
     void BaseWriter::changedConfigurableAdditionalContexts()
     {
-        OutputContextMask context_mask = context::none;
-        this->subcontextsCheckMask_ = context::none;
-        this->subcontextsNoCheckMask_ = context::none;
-
-        this->subcontexts_.clear();
+        OutputContextMask main_contexts = context::none;
+        std::set<const OutputContextContainer*> sub_contexts;
 
         for (size_t i = 0; i < this->configurableAdditionalContexts_.size(); ++i)
@@ -111 +100 @@
             }
 
-            const OutputContextContainer& container = OutputManager::getInstance().registerContext(name, subname);
+            const OutputContextContainer& context = OutputManager::getInstance().registerContext(name, subname);
 
-            context_mask |= container.mask;
-
-            if (container.sub_id != context::no_subcontext)
-            {
-                this->subcontexts_.insert(container.sub_id);
-                this->subcontextsCheckMask_ |= container.mask;
-            }
+            if (context.sub_id == context::no_subcontext)
+                main_contexts |= context.mask;
             else
-            {
-                this->subcontextsNoCheckMask_ |= container.mask;
-            }
+                sub_contexts.insert(&context);
         }
 
-        this->setAdditionalContextsMask(context_mask);
+        this->setAdditionalContextsMask(main_contexts);
+        this->setAdditionalSubcontexts(sub_contexts);
     }
 }

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

@@ -31 +31 @@
 
 #include "util/UtilPrereqs.h"
-
-#include <set>
-#include <vector>
-
-#include "OutputListener.h"
+#include "SubcontextOutputListener.h"
 
 namespace orxonox
 {
-    class _UtilExport BaseWriter : public OutputListener
+    class _UtilExport BaseWriter : public SubcontextOutputListener
     {
         public:
@@ -83 +79 @@
 
             std::string name_;
-
-            OutputContextMask subcontextsCheckMask_;
-            OutputContextMask subcontextsNoCheckMask_;
-            std::set<OutputContextSubID> subcontexts_;
     };
 }

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

@@ -130 +130 @@
         OutputManager::getInstance().updateCombinedAdditionalContextsMask();
     }
+
+    /**
+        @brief Returns true if this listener accepts output of the given level and context, based on the levels and contexts masks.
+    */
+    bool OutputListener::acceptsOutput(OutputLevel level, const OutputContextContainer& context) const
+    {
+        // check if the output level is accepted by the level mask (independent of the context)
+        if (this->levelMask_ & level)
+            return true;
+
+        // check if the output context is accepted by the additional context mask and if the level matches as well
+        if ((this->additionalContextsMask_ & context.mask) && (this->additionalContextsLevelMask_ & level))
+            return true;
+
+        // otherwise we don't accept the output
+        return false;
+    }
 }

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

@@ -75 +75 @@
                 { return this->additionalContextsLevelMask_; }
 
-            /// @brief Returns true if this listener accepts output of the given level and context, based on the levels and contexts masks.
-            inline bool acceptsOutput(OutputLevel level, const OutputContextContainer& context) const
-            {
-                return (this->levelMask_ & level) ||
-                       ((this->additionalContextsLevelMask_ & level) && (this->additionalContextsMask_ & context.mask)); }
+            virtual bool acceptsOutput(OutputLevel level, const OutputContextContainer& context) const;
 
             /// @brief Called by OutputManager for each line of output, checks if this listener actually accepts this output before it calls the output() function.