- appli_path bug write fix

[modules/kernel.git] / src / ResourcesManager / SALOME_ResourcesCatalog_Parser.hxx

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
index 2d723b5800b01545316fdb0eaa5d29c712d889c9..908505483d1aafaddf7bc177f86c3861bda90582 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
@@ -32,6 +32,7 @@
 
 #include <string>
 #include <vector>
+#include <list>
 #include <map>
 #include <iostream>
 
@@ -39,7 +40,7 @@ enum AccessProtocolType {rsh, ssh};
 
 enum AccessModeType {interactive, batch};
 
-enum BatchType {none, pbs, lsf, sge};
+enum BatchType {none, pbs, lsf, sge, ssh_batch};
 
 enum MpiImplType {nompi, lam, mpich1, mpich2, openmpi, slurm, prun};
 
@@ -47,11 +48,12 @@ class RESOURCESMANAGER_EXPORT ResourceDataToSort
   {
 
   public:
-    std::string _hostName;
+    std::string _Name;
     unsigned int _nbOfNodes;
     unsigned int _nbOfProcPerNode;
     unsigned int _CPUFreqMHz;
     unsigned int _memInMB;
+    static unsigned int _nbOfProcWanted;
     static unsigned int _nbOfNodesWanted;
     static unsigned int _nbOfProcPerNodeWanted;
     static unsigned int _CPUFreqMHzWanted;
@@ -59,7 +61,7 @@ class RESOURCESMANAGER_EXPORT ResourceDataToSort
 
   public:
     ResourceDataToSort();
-    ResourceDataToSort(const std::string& hostname,
+    ResourceDataToSort(const std::string& name,
                        unsigned int nbOfNodes,
                        unsigned int nbOfProcPerNode,
                        unsigned int CPUFreqMHz,
@@ -71,26 +73,48 @@ class RESOURCESMANAGER_EXPORT ResourceDataToSort
     unsigned int GetNumberOfPoints() const;
   };
 
+struct RESOURCESMANAGER_EXPORT ParserResourcesClusterMembersType
+{
+  std::string HostName;
+  AccessProtocolType Protocol;
+  AccessProtocolType ClusterInternalProtocol;
+  std::string UserName;
+  std::string AppliPath;
+  ResourceDataToSort DataForSort;
+};
+
 struct RESOURCESMANAGER_EXPORT ParserResourcesType
-  {
-    ResourceDataToSort DataForSort;
-    std::string HostName;
-    std::string Alias;
-    AccessProtocolType Protocol;
-    AccessModeType Mode;
-    BatchType Batch;
-    MpiImplType mpi;
-    std::string UserName;
-    std::string AppliPath;
-    std::vector<std::string> ModulesList;
-    std::string OS;
-    std::string batchQueue;
-    std::string userCommands;
+{
+  ResourceDataToSort DataForSort;
+  std::string Name;
+  std::string HostName;
+  AccessProtocolType Protocol;
+  AccessProtocolType ClusterInternalProtocol;
+  AccessModeType Mode;
+  BatchType Batch;
+  MpiImplType mpi;
+  std::string UserName;
+  std::string AppliPath;
+  std::vector<std::string> ComponentsList;
+  std::vector<std::string> ModulesList;
+  std::string OS;
+  std::string batchQueue;
+  std::string userCommands;
+  std::string use;
+  std::list<ParserResourcesClusterMembersType> ClusterMembersList;
+  unsigned int nbOfProc;
 
-    void Print() const;
-    void Clear();
-  };
+  void Print();
+  void Clear();
+
+  std::string PrintAccessProtocolType() const;
+  std::string PrintAccessModeType() const;
+  std::string PrintBatchType() const;
+  std::string PrintMpiImplType() const;
+  std::string PrintClusterInternalProtocol() const;
+};
 
 typedef std::map<std::string, ParserResourcesType> MapOfParserResourcesType;
+typedef std::map<std::string, ParserResourcesType>::iterator MapOfParserResourcesType_it;
 
 #endif //SALOME_RESOURCES_CATALOG_PARSER