Bug Fix.

[u/mrichter/AliRoot.git] / HLT / BASE / AliHLTConfigurationHandler.cxx

diff --git a/HLT/BASE/AliHLTConfigurationHandler.cxx b/HLT/BASE/AliHLTConfigurationHandler.cxx
index c690544629624f05f497679fc05c0b825e97d099..def410c9a3eb4b686b2bd78468aca28e0174e8e3 100644 (file)
--- a/HLT/BASE/AliHLTConfigurationHandler.cxx
+++ b/HLT/BASE/AliHLTConfigurationHandler.cxx
@@ -37,6 +37,8 @@ using namespace std;
 #include <string>
 #include "AliHLTConfigurationHandler.h"
 #include "AliHLTConfiguration.h"
+#include "TMap.h"
+#include "TObjString.h"
 
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTConfigurationHandler)
@@ -67,6 +69,7 @@ AliHLTConfigurationHandler::~AliHLTConfigurationHandler()
 
 AliHLTConfigurationHandler* AliHLTConfigurationHandler::fgpInstance=NULL;
 int AliHLTConfigurationHandler::fgNofInstances=0;
+TMap* AliHLTConfigurationHandler::fgpSubstitutions=NULL;
 
 AliHLTConfigurationHandler* AliHLTConfigurationHandler::CreateHandler()
 {
@@ -81,12 +84,14 @@ int AliHLTConfigurationHandler::Destroy()
   // see header file for class documentation
   int nofInstances=0;
   if (fgpInstance==this) {
-    nofInstances=fgNofInstances--;
+    nofInstances=--fgNofInstances;
   }
   if (fgNofInstances==0) {
-    delete fgpInstance;
     fgpInstance = NULL;
+    if (fgpSubstitutions) delete fgpSubstitutions;
+    fgpSubstitutions=NULL;
   }
+  if (nofInstances==0) delete this;
   return nofInstances;
 }
 
@@ -209,3 +214,44 @@ AliHLTConfiguration* AliHLTConfigurationHandler::FindConfiguration(const char* i
   return pConf;
 }
 
+int AliHLTConfigurationHandler::AddSubstitution(const char* componentId, const AliHLTConfiguration& subst)
+{
+  /// add component substitution for components of specified id
+  if (!componentId) return -EINVAL;
+  if (!fgpSubstitutions) fgpSubstitutions=new TMap;
+  if (!fgpSubstitutions) return -ENOMEM;
+  fgpSubstitutions->SetOwnerKeyValue(kTRUE);
+
+  fgpSubstitutions->Add(new TObjString(componentId), new AliHLTConfiguration(subst));
+
+  return 0;  
+}
+
+int AliHLTConfigurationHandler::AddSubstitution(const AliHLTConfiguration& conf , const AliHLTConfiguration& subst)
+{
+  /// add component substitution for components of specified id
+  if (!fgpSubstitutions) fgpSubstitutions=new TMap;
+  if (!fgpSubstitutions) return -ENOMEM;
+  fgpSubstitutions->SetOwnerKeyValue(kTRUE);
+
+  fgpSubstitutions->Add(new AliHLTConfiguration(conf), new AliHLTConfiguration(subst));
+
+  return 0;  
+}
+
+const AliHLTConfiguration* AliHLTConfigurationHandler::FindSubstitution(const AliHLTConfiguration& conf)
+{
+  /// find component substitution for a configuration
+  if (!fgpSubstitutions) return NULL;
+  TObject* value=NULL;
+
+  // check for specific configuration
+  value=fgpSubstitutions->GetValue(conf.GetName());
+  if (value) return dynamic_cast<AliHLTConfiguration*>(value);
+
+  // check for component Id
+  value=fgpSubstitutions->GetValue(conf.GetComponentID());
+  if (value) return dynamic_cast<AliHLTConfiguration*>(value);
+
+  return NULL;
+}