Changeset 8833 for code/branches/output/src/libraries/util/output/BaseWriter.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/BaseWriter.h (modified) (3 diffs)

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

@@ -45 +45 @@
             virtual ~BaseWriter();
 
+            void setLevelMax(OutputLevel max);
+            void setAdditionalContextsLevelMax(OutputLevel max);
+
             const std::string& getName() const
                 { return this->name_; }
 
-            void setLevelMax(OutputLevel max);
-
             int configurableMaxLevel_;
             inline std::string getConfigurableMaxLevelName() const
-                { return "outputLevel" + this->name_; }
+                { return this->name_ + "Level"; }
 
-            int configurableContextsMaxLevel_;
-            inline std::string getConfigurableContextsMaxLevelName() const
-                { return "outputContextsLevel" + this->name_; }
+            int configurableAdditionalContextsMaxLevel_;
+            inline std::string getConfigurableAdditionalContextsMaxLevelName() const
+                { return this->name_ + "AdditionalContextsLevel"; }
 
-            std::vector<std::string> configurableContexts_;
-            inline std::string getConfigurableContextsName() const
-                { return "outputContexts" + this->name_; }
+            std::vector<std::string> configurableAdditionalContexts_;
+            inline std::string getConfigurableAdditionalContextsName() const
+                { return this->name_ + "AdditionalContexts"; }
 
-            void changedConfigurableLevels();
-            void changedConfigurableContexts();
+            void changedConfigurableLevel();
+            void changedConfigurableAdditionalContextsLevel();
+            void changedConfigurableAdditionalContexts();
 
             static inline std::string getConfigurableSectionName()
@@ -69 +71 @@
 
         protected:
-            virtual void output(OutputLevel level, OutputContext context, const std::vector<std::string>& lines);
+            virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines);
 
         private:
@@ -77 +79 @@
             void setLevelMask(OutputLevel mask);
 
-            bool isAdditionalContext(OutputContext context) const;
+            void setAdditionalContextsLevelRange(OutputLevel min, OutputLevel max);
+            void setAdditionalContextsLevelMask(OutputLevel mask);
 
             std::string name_;
-            std::set<std::string> configurableContextsSet_;
+
+            OutputContextMask subcontextsCheckMask_;
+            std::set<OutputContextSubID> subcontexts_;
     };
 }