Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CCAR: import_hook.py was too strict in ensure_list (ImportError raised)
[modules/kernel.git]
/
src
/
ResourcesManager
/
SALOME_ResourcesCatalog_Handler.hxx
diff --git
a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.hxx
b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.hxx
index a48dded3cc61b7b178959346417cdc62e42ff9af..b8880b33ba08eb1532ddeb54f3ba923b2c319c31 100755
(executable)
--- a/
src/ResourcesManager/SALOME_ResourcesCatalog_Handler.hxx
+++ b/
src/ResourcesManager/SALOME_ResourcesCatalog_Handler.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SALOME ResourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl)
// File : SALOME_ResourcesCatalog_Handler.hxx
// Author : Estelle Deville
// SALOME ResourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl)
// File : SALOME_ResourcesCatalog_Handler.hxx
// Author : Estelle Deville
@@
-42,14
+43,17
@@
class RESOURCESMANAGER_EXPORT SALOME_ResourcesCatalog_Handler
{
public :
{
public :
- SALOME_ResourcesCatalog_Handler(MapOfParserResourcesType& resources_list,
- MapOfParserResourcesType& resources_batch_list);
+ SALOME_ResourcesCatalog_Handler(MapOfParserResourcesType& resources_list);
const MapOfParserResourcesType& GetResourcesAfterParsing() const;
virtual ~SALOME_ResourcesCatalog_Handler();
void ProcessXmlDocument(xmlDocPtr theDoc);
const MapOfParserResourcesType& GetResourcesAfterParsing() const;
virtual ~SALOME_ResourcesCatalog_Handler();
void ProcessXmlDocument(xmlDocPtr theDoc);
+
+ bool ProcessMachine(xmlNodePtr machine_descr, ParserResourcesType & resource);
+ bool ProcessCluster(xmlNodePtr cluster_descr, ParserResourcesType & resource);
+ bool ProcessMember(xmlNodePtr member_descr, ParserResourcesClusterMembersType & resource);
void PrepareDocToXmlFile(xmlDocPtr theDoc);
void PrepareDocToXmlFile(xmlDocPtr theDoc);
@@
-58,14
+62,13
@@
class RESOURCESMANAGER_EXPORT SALOME_ResourcesCatalog_Handler
ParserResourcesType _resource;
MapOfParserResourcesType& _resources_list;
ParserResourcesType _resource;
MapOfParserResourcesType& _resources_list;
- MapOfParserResourcesType& _resources_batch_list;
const char *test_machine;
const char *test_machine;
- const char *test_
resources
;
-
+ const char *test_
cluster
;
+ const char *test_name;
const char *test_hostname;
const char *test_hostname;
- const char *test_alias;
const char *test_protocol;
const char *test_protocol;
+ const char *test_cluster_internal_protocol;
const char *test_mode;
const char *test_batch;
const char *test_mpi;
const char *test_mode;
const char *test_batch;
const char *test_mpi;
@@
-80,9
+83,12
@@
class RESOURCESMANAGER_EXPORT SALOME_ResourcesCatalog_Handler
const char *test_mem_in_mb;
const char *test_cpu_freq_mhz;
const char *test_nb_of_nodes;
const char *test_mem_in_mb;
const char *test_cpu_freq_mhz;
const char *test_nb_of_nodes;
+ const char *test_nb_of_proc;
const char *test_nb_of_proc_per_node;
const char *test_batch_queue;
const char *test_user_commands;
const char *test_nb_of_proc_per_node;
const char *test_batch_queue;
const char *test_user_commands;
+ const char *test_use;
+ const char *test_members;
};
};