Changeset 8833 for code/branches/output/src/libraries/util/output/OutputManager.h

Timestamp:

Aug 11, 2011, 11:20:39 PM (13 years ago)

Author:

landauf

Message:

A context is now defined by a struct instead of only a mask.

Introduced sub-contexts. Sub-contexts of the same main-context share the same mask, but have a different ID.
Main-contexts are filtered using a bitmask which happens for every line of output and is very fast.
Sub-contexts are filtered using a set which is slow but happens only if a specific sub-context is enabled in the config file which is usually not the case.

The concept of filtering normal output + additional contexts was moved from BaseWriter directly to OutputListener and OutputManager which makes the whole system faster.
BaseWriter now calls registerContext() for each configured output context, which basically allows the usage of more than 64 contexts as long as these contexts are not used before loading the config file. Though by design it's not recommended.

File:

• code/branches/output/src/libraries/util/output/OutputManager.h (modified) (4 diffs)

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

@@ -33 +33 @@
 
 #include <vector>
-#include <boost/bimap.hpp>
+#include <map>
 
 #include "OutputDefinitions.h"
@@ -45 +45 @@
             static OutputManager& getInstanceAndCreateListeners();
 
-            void pushMessage(OutputLevel level, OutputContext context, const std::string& message);
+            void pushMessage(OutputLevel level, const OutputContextContainer& context, const std::string& message);
 
             void registerListener(OutputListener* listener);
@@ -52 +52 @@
             void updateMasks();
             void updateCombinedLevelMask();
-            void updateCombinedContextMask();
+            void updateCombinedAdditionalContextsLevelMask();
+            void updateCombinedAdditionalContextsMask();
 
-            inline OutputLevel getCombinedLevelMask() const
-                { return this->combinedLevelMask_; }
-            inline OutputContext getCombinedContextMask() const
-                { return this->combinedContextMask_; }
+            inline bool acceptsOutput(OutputLevel level, const OutputContextContainer& context) const
+            {
+                return (this->combinedLevelMask_ & level) ||
+                       ((this->combinedAdditionalContextsLevelMask_ & level) && (this->combinedAdditionalContextsMask_ & context.mask));
+            }
 
-            inline bool acceptsOutput(OutputLevel level, OutputContext context) const
-                { return ((this->combinedLevelMask_ & level) && (this->combinedContextMask_ & context)); }
-
-            OutputContext registerContext(const std::string& name);
+            const OutputContextContainer& registerContext(const std::string& name, const std::string& subname = "");
 
             const std::string& getLevelName(OutputLevel level) const;
-            const std::string& getContextName(OutputContext context) const;
-            OutputContext getContextValue(const std::string& name) const;
-
-            std::string getComposedContextName(OutputContext context) const;
-            std::string getDefaultPrefix(OutputLevel level, OutputContext context) const;
+            std::string getDefaultPrefix(OutputLevel level, const OutputContextContainer& context) const;
 
         private:
@@ -78 +73 @@
             std::vector<OutputListener*> listeners_;
 
-            OutputLevel   combinedLevelMask_;
-            OutputContext combinedContextMask_;
+            OutputLevel       combinedLevelMask_;
+            OutputLevel       combinedAdditionalContextsLevelMask_;
+            OutputContextMask combinedAdditionalContextsMask_;
 
-            boost::bimap<OutputContext, std::string> contexts_;
+            std::map<std::string, OutputContextMask> contextMasks_;
+            std::map<std::string, OutputContextContainer> contextContainers_;
+            OutputContextSubID subcontextCounter_;
     };
 }