logging class extended and macros for easy log messages introduced, code changed...

[u/mrichter/AliRoot.git] / HLT / BASE / AliHLTConfiguration.h

diff --git a/HLT/BASE/AliHLTConfiguration.h b/HLT/BASE/AliHLTConfiguration.h
index 02c9527cca9c449314ada2c32aa474b17e739572..3add3f60e4b9425b355b2e527c37532a2c9d89c5 100644 (file)
--- a/HLT/BASE/AliHLTConfiguration.h
+++ b/HLT/BASE/AliHLTConfiguration.h
@@ -15,7 +15,7 @@
 #include "AliHLTDataTypes.h"
 #include "AliHLTLogging.h"
 
-
+class AliHLTConfigurationHandler;
 /*****************************************************************************************************
  *
  * AliHLTConfiguration
@@ -39,6 +39,13 @@ class AliHLTConfiguration : public TObject, public AliHLTLogging {
   AliHLTConfiguration(const char* id, const char* component, const char* sources, const char* arguments);
   virtual ~AliHLTConfiguration();
 
+  /****************************************************************************************************
+   * global initialization
+   */
+  static int GlobalInit(AliHLTConfigurationHandler* pHandler);
+
+  static int GlobalDeinit();
+
   /****************************************************************************************************
    * properties
    */
@@ -91,7 +98,6 @@ class AliHLTConfiguration : public TObject, public AliHLTLogging {
 
  protected:
   
-  //int Logging( AliHLTComponent_LogSeverity severity, const char* origin, const char* keyword, const char* message, ... );
 
  private:
   /* extract the source configurations from the sources string
@@ -118,6 +124,8 @@ class AliHLTConfiguration : public TObject, public AliHLTLogging {
   int fArgc;                        // number of arguments
   char** fArgv;                     // argument array
 
+  static AliHLTConfigurationHandler* fConfigurationHandler;
+
   ClassDef(AliHLTConfiguration, 0);
 };
 
@@ -247,20 +255,20 @@ class AliHLTConfigurationHandler : public AliHLTLogging {
    */
 
   // register a configuration to the global list of configurations
-  static int RegisterConfiguration(AliHLTConfiguration* pConf);
+  int RegisterConfiguration(AliHLTConfiguration* pConf);
 
   // create a configuration and register it
-  static int CreateConfiguration(const char* id, const char* component, const char* sources, const char* arguments);
+  int CreateConfiguration(const char* id, const char* component, const char* sources, const char* arguments);
 
   // remove a configuration from the global list
-  static int RemoveConfiguration(AliHLTConfiguration* pConf);
-  static int RemoveConfiguration(const char* id);
+  int RemoveConfiguration(AliHLTConfiguration* pConf);
+  int RemoveConfiguration(const char* id);
 
   // find a configuration from the global list
-  static AliHLTConfiguration* FindConfiguration(const char* id);
+  AliHLTConfiguration* FindConfiguration(const char* id);
 
   // print the registered configurations to the logging function
-  static void PrintConfigurations();
+  void PrintConfigurations();
 
 
  private: