Adding a new batch type in resource manager: ll for LoadLeveler from IBM

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
index 20851ed2af1ed6e00c5a27289b732c3a463339a9..48451739015652c35ddbd812a0b92d18163a12cd 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
@@ -106,10 +106,10 @@ void SALOME_ResourcesCatalog_Handler::ProcessXmlDocument(xmlDocPtr theDoc)
 
   //default resources
   _resource.Clear();
-       _resource.HostName = Kernel_Utils::GetHostname();
-       _resource.Name = Kernel_Utils::GetHostname();
-       _resource.DataForSort._Name = Kernel_Utils::GetHostname();
-       _resources_list[Kernel_Utils::GetHostname()] = _resource;
+  _resource.HostName = Kernel_Utils::GetHostname();
+  _resource.Name = Kernel_Utils::GetHostname();
+  _resource.DataForSort._Name = Kernel_Utils::GetHostname();
+  _resources_list[Kernel_Utils::GetHostname()] = _resource;
 
   // Get the document root node
   xmlNodePtr aCurNode = xmlDocGetRootElement(theDoc);
@@ -126,15 +126,15 @@ void SALOME_ResourcesCatalog_Handler::ProcessXmlDocument(xmlDocPtr theDoc)
       bool Ok = ProcessMachine(aCurNode, _resource);
       if (Ok)
       {
-       // Adding a resource
-       if(_resource.HostName == "localhost")
-       {
-         _resource.HostName = Kernel_Utils::GetHostname();
-       }
-       std::map<std::string, ParserResourcesType>::const_iterator iter = _resources_list.find(_resource.Name);
-       if (iter != _resources_list.end())
-         RES_INFOS("Warning resource " << _resource.Name << " already added, keep last resource found !");
-       _resources_list[_resource.Name] = _resource;
+        // Adding a resource
+        if(_resource.HostName == "localhost")
+        {
+          _resource.HostName = Kernel_Utils::GetHostname();
+        }
+        std::map<std::string, ParserResourcesType>::const_iterator iter = _resources_list.find(_resource.Name);
+        if (iter != _resources_list.end())
+          RES_INFOS("Warning resource " << _resource.Name << " already added, keep last resource found !");
+        _resources_list[_resource.Name] = _resource;
       }
     }
     // Cas de la déclaration d'un cluster
@@ -143,10 +143,10 @@ void SALOME_ResourcesCatalog_Handler::ProcessXmlDocument(xmlDocPtr theDoc)
       _resource.Clear();
       if(ProcessCluster(aCurNode, _resource))
       {
-       std::map<std::string, ParserResourcesType>::const_iterator iter = _resources_list.find(_resource.Name);
-       if (iter != _resources_list.end())
-         RES_INFOS("Warning resource " << _resource.Name << " already added, keep last resource found !");
-       _resources_list[_resource.Name] = _resource;
+        std::map<std::string, ParserResourcesType>::const_iterator iter = _resources_list.find(_resource.Name);
+        if (iter != _resources_list.end())
+          RES_INFOS("Warning resource " << _resource.Name << " already added, keep last resource found !");
+        _resources_list[_resource.Name] = _resource;
       }
     }
     aCurNode = aCurNode->next;
@@ -531,6 +531,8 @@ SALOME_ResourcesCatalog_Handler::ProcessMachine(xmlNodePtr machine_descr, Parser
       resource.Batch = ssh_batch;
     else if  (aBatch == "ccc")
       resource.Batch = ccc;
+    else if  (aBatch == "ll")
+      resource.Batch = ll;
     else
       resource.Batch = none;
   }
@@ -729,6 +731,9 @@ void SALOME_ResourcesCatalog_Handler::PrepareDocToXmlFile(xmlDocPtr theDoc)
       case ssh_batch:
         xmlNewProp(node, BAD_CAST test_batch, BAD_CAST "ssh_batch");
         break;
+      case ll:
+        xmlNewProp(node, BAD_CAST test_batch, BAD_CAST "ll");
+        break;
       default:
         xmlNewProp(node, BAD_CAST test_batch, BAD_CAST "");
     }

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
index f84d26b2ca482186b988d78d088033dc8ac24b05..aa709826680afebecd952869d2d627cf605e2a69 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
@@ -207,6 +207,8 @@ ParserResourcesType::PrintBatchType() const
     return "sge";
   else if (Batch == ccc)
     return "ccc";
+  else if (Batch == ll)
+    return "ll";
   else 
     return "ssh";
 }

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
index d376e5545f3b45f2fd4ac34f8bf2ef1bff72aedb..08fb578cab1b770faede1902a5dff95f41ea4082 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
@@ -45,7 +45,7 @@ enum AccessProtocolType {rsh, ssh};
 
 enum AccessModeType {interactive, batch};
 
-enum BatchType {none, pbs, lsf, sge, ssh_batch, ccc};
+enum BatchType {none, pbs, lsf, sge, ssh_batch, ccc, ll};
 
 enum MpiImplType {nompi, lam, mpich1, mpich2, openmpi, slurm, prun};
 

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 454b9696a921855eaa197bb4c8ffb68626f4838b..281496eb3910ff5e948bce476b1985e0c14c8440 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -256,6 +256,8 @@ SALOME_ResourcesManager::GetResourceDefinition(const char * name)
     p_ptr->batch = "ccc";
   else if( resource.Batch == ssh_batch )
     p_ptr->batch = "ssh";
+  else if( resource.Batch == ll )
+    p_ptr->batch = "ll";
 
   return p_ptr;
 }
@@ -287,6 +289,8 @@ SALOME_ResourcesManager::AddResource(const Engines::ResourceDefinition& new_reso
     resource.Batch = ccc;
   else if  (aBatch == "ssh_batch")
     resource.Batch = ssh_batch;
+  else if  (aBatch == "ll")
+    resource.Batch = ll;
   else if (aBatch == "")
     resource.Batch = none;
   else {