Changeset 907 for library/bdm/bdmroot.h

Timestamp:

04/19/10 12:44:57 (14 years ago)

Author:

mido

Message:

LOG LEVEL improved and hopefully finished

Files:

• library/bdm/bdmroot.h (modified) (5 diffs)

library/bdm/bdmroot.h

@@ -37 +37 @@
 //! auxiliary function for debugging
 void UI_DBG (const Setting &S, const string &spc, ostream &out );
-        
-//! This class stores a details that will be logged to a logger
-template<class T> class log_level_template {
+
+//forward declaration
+class logger;
+
+//! base class for all log_levels
+//!
+//! the existence of this class is forced by the necessity of passing log_levels to user_info methods, however, the main functionality
+//! is located in \c log_level_template class
+class log_level_base
+{
 private:
         // UserInfo class have to be able to read all the internal 
@@ -45 +52 @@
         friend class UI;
 
+protected:
         //! boolean flags related indicating which details will be logged to a logger
         bitset<32> values;
+        
+public:
+
+        //! a general utility transforming a comma-separated sequence of strings into an instance of Array<strings>
+        static Array<string> string2Array( const string &input );
 
         //! string equivalents of the used enumerations which are filled with a help of #LOG_LEVEL macro within class T
-        const Array<string> &names() const
-        {
-                return T::log_level_names();
-        }
-
-public:
-        
-        //! a general utility transforming a comma-separated sequence of strings into an instance of Array<strings>
-        static Array<string> string2Array( const string &input )
-        {
-                string result = input;
-                string::size_type loc;
-                while( loc = result.find( ',' ), loc != string::npos )
-                        result[loc] = ' ';
-                return Array<string>("{ " + result + " }" );
-        }
-
-        //! is any field of log_level active?
-        bool any() const
-        {
-                return values.any();
-        }
-
-        //! read only operator for testing  individual fields of log_level
-        //!
-        //! it is necessary to acces it with a proper enumeration type, thus this approach is type-safe
-        bool operator [] (const enum T::log_level_enums &log_level ) const
-        {
-                return values[log_level];
-        }
-
-        //! operator for setting an individual field of log_level 
-        //!
-        //! it is necessary to acces it with a proper enumeration type, thus this approach is type-safe
-        bitset<32>::reference operator [] (const enum T::log_level_enums &log_level )
-        {
-                return values[log_level];
-        }
+        virtual const Array<string> &names() const = 0;
 };
 
-/*!
-  \def LOG_LEVEL(classname,...)
-  \brief Macro for defining a log_level attribute with a specific set of enumerations related to a specific class 
-
-  This macro has to be called within a class declaration. Its argument \a classname has to correspond to that wrapping class.
-  This macro defines a log_level instance which can be modified either directly or by the means of #UI class.
-
-  One of the main purposes of this macro is to allow variability in using enumerations. By relating them to their names through
-  an array of strings, we are no more dependant on their precise ordering. What is more, we can add or remove any without harming 
-  any applications which are using this library.
-
-  \todo Write a more detailed explanation including also examples
-
-  \ref ui
-*/
-#define LOG_LEVEL(classname,...) public: enum log_level_enums { __VA_ARGS__ }; log_level_template<classname> log_level; private: friend class log_level_template<classname>; static const Array<string> &log_level_names() { static const Array<string> log_level_names = log_level_template<classname>::string2Array( #__VA_ARGS__ ); return log_level_names; }
-
-//forward declaration
-class logger;
-
-//! information about connection to a logger
-class log_record {
-public:
-        //!remember which logger is registered
-        logger &L;
-        //! vector of log IDs - one element for each entry
-        ivec ids;
-
-        //!default constructor
-        log_record ( logger &L0 ) : L ( L0 ), ids ( 0 ) {}
-};
 
 //! Root class of BDM objects
@@ -127 +72 @@
         friend class UI;
 
-        //! This method is a dummy method closely related to to the #LOG_LEVEL macro, do not remove it
-        static const string &log_level_names() 
-        { 
-                static const string log_level_names; 
-                return log_level_names; 
-        }; 
-
 protected:
-        //! record of connections to the logger
-        log_record* logrec;
+        //!remember which logger is registered
+        logger * registered_logger;
 
         /*!     
@@ -217 +155 @@
 
 public:
-        //! This enumeration defines all possible options specifing the level of details logged by a logger about this specific class 
-        //! 
-        //! It has to be reimplemented in descendant classes using the #LOG_LEVEL macro
-        enum log_level_enums { };
-
+        
         //!default constructor
-        root() : logrec ( NULL ) {};
+        root() : registered_logger ( NULL ) {};
 
         //! make sure this is a virtual object
         virtual ~root() {
-                if ( logrec ) delete logrec;
         }
 
@@ -242 +175 @@
         //! The level of details (parameter \c level ) is individual for each class.
         virtual void log_register ( logger &L, const string &prefix ) {
-                logrec = new log_record ( L );
+                registered_logger = &L;
         }
 
         //! Write current information into the given logger
         virtual void log_write() const {
-        }
+        } 
 
         /*!