From f3653368e0c7ed59312f9d47dbc7c1d7eea31403 Mon Sep 17 00:00:00 2001 From: barate Date: Wed, 16 Jan 2013 17:26:31 +0000 Subject: [PATCH] Rename files: - Remove prefix "Batch_" since headers are installed in their own directory "include/libbatch" - Rename "eXXX" batch managers to "XXX" --- CMakeLists.txt | 2 +- Batch_config.h.in => config.h.in | 0 misc/check_libbatch.m4 | 2 +- ...hManager_eCCC.cxx => BatchManager_CCC.cxx} | 50 +++++++------- ...hManager_eCCC.hxx => BatchManager_CCC.hxx} | 18 ++--- src/CCC/CMakeLists.txt | 6 +- ...ager_eCCC.cxx => FactBatchManager_CCC.cxx} | 16 ++--- ...ager_eCCC.hxx => FactBatchManager_CCC.hxx} | 18 ++--- ...Batch_JobInfo_eCCC.cxx => JobInfo_CCC.cxx} | 24 +++---- ...Batch_JobInfo_eCCC.hxx => JobInfo_CCC.hxx} | 16 ++--- ...on.cxx => APIInternalFailureException.cxx} | 2 +- ...on.hxx => APIInternalFailureException.hxx} | 6 +- ...atch_BatchManager.cxx => BatchManager.cxx} | 16 ++--- ...atch_BatchManager.hxx => BatchManager.hxx} | 14 ++-- ...gerCatalog.cxx => BatchManagerCatalog.cxx} | 4 +- ...gerCatalog.hxx => BatchManagerCatalog.hxx} | 2 +- src/Core/{Batch_BoolType.cxx => BoolType.cxx} | 2 +- src/Core/{Batch_BoolType.hxx => BoolType.hxx} | 4 +- src/Core/CMakeLists.txt | 66 +++++++++---------- ...Protocol.cxx => CommunicationProtocol.cxx} | 16 ++--- ...Protocol.hxx => CommunicationProtocol.hxx} | 4 +- ...olRSH.cxx => CommunicationProtocolRSH.cxx} | 8 +-- ...olRSH.hxx => CommunicationProtocolRSH.hxx} | 6 +- ...ocolSH.cxx => CommunicationProtocolSH.cxx} | 6 +- ...ocolSH.hxx => CommunicationProtocolSH.hxx} | 6 +- ...olSSH.cxx => CommunicationProtocolSSH.cxx} | 6 +- ...olSSH.hxx => CommunicationProtocolSSH.hxx} | 6 +- .../{Batch_Constants.cxx => Constants.cxx} | 4 +- .../{Batch_Constants.hxx => Constants.hxx} | 4 +- src/Core/{Batch_Couple.cxx => Couple.cxx} | 2 +- src/Core/{Batch_Couple.hxx => Couple.hxx} | 2 +- .../{Batch_CoupleType.cxx => CoupleType.cxx} | 2 +- .../{Batch_CoupleType.hxx => CoupleType.hxx} | 6 +- src/Core/{Batch_Date.cxx => Date.cxx} | 2 +- src/Core/{Batch_Date.hxx => Date.hxx} | 2 +- src/Core/{Batch_Defines.hxx => Defines.hxx} | 4 +- ...ch_Environnement.cxx => Environnement.cxx} | 2 +- ...ch_Environnement.hxx => Environnement.hxx} | 2 +- ...tBatchManager.cxx => FactBatchManager.cxx} | 4 +- ...tBatchManager.hxx => FactBatchManager.hxx} | 4 +- ...ericException.cxx => GenericException.cxx} | 2 +- ...ericException.hxx => GenericException.hxx} | 2 +- ...{Batch_GenericType.cxx => GenericType.cxx} | 2 +- ...{Batch_GenericType.hxx => GenericType.hxx} | 2 +- ...ption.cxx => InvalidArgumentException.cxx} | 2 +- ...ption.hxx => InvalidArgumentException.hxx} | 4 +- ...yException.cxx => InvalidKeyException.cxx} | 2 +- ...yException.hxx => InvalidKeyException.hxx} | 4 +- src/Core/{Batch_Job.cxx => Job.cxx} | 4 +- src/Core/{Batch_Job.hxx => Job.hxx} | 6 +- src/Core/{Batch_JobId.cxx => JobId.cxx} | 4 +- src/Core/{Batch_JobId.hxx => JobId.hxx} | 6 +- src/Core/{Batch_JobInfo.cxx => JobInfo.cxx} | 4 +- src/Core/{Batch_JobInfo.hxx => JobInfo.hxx} | 6 +- ...lException.cxx => ListIsFullException.cxx} | 2 +- ...lException.hxx => ListIsFullException.hxx} | 4 +- src/Core/{Batch_LongType.cxx => LongType.cxx} | 2 +- src/Core/{Batch_LongType.hxx => LongType.hxx} | 4 +- src/Core/{Batch_MpiImpl.cxx => MpiImpl.cxx} | 2 +- src/Core/{Batch_MpiImpl.hxx => MpiImpl.hxx} | 2 +- ...ion.cxx => NotYetImplementedException.cxx} | 2 +- ...ion.hxx => NotYetImplementedException.hxx} | 4 +- ...ameterTypeMap.cxx => ParameterTypeMap.cxx} | 8 +-- ...ameterTypeMap.hxx => ParameterTypeMap.hxx} | 6 +- .../{Batch_Parametre.cxx => Parametre.cxx} | 8 +-- .../{Batch_Parametre.hxx => Parametre.hxx} | 4 +- ...TimeException.cxx => RunTimeException.cxx} | 2 +- ...TimeException.hxx => RunTimeException.hxx} | 4 +- .../{Batch_StringType.cxx => StringType.cxx} | 2 +- .../{Batch_StringType.hxx => StringType.hxx} | 4 +- src/Core/Test/Test_BatchManager.cxx | 10 +-- ...xception.cxx => TypeMismatchException.cxx} | 2 +- ...xception.hxx => TypeMismatchException.hxx} | 4 +- src/Core/{Batch_Utils.cxx => Utils.cxx} | 8 +-- src/Core/{Batch_Utils.hxx => Utils.hxx} | 2 +- .../{Batch_Versatile.cxx => Versatile.cxx} | 14 ++-- .../{Batch_Versatile.hxx => Versatile.hxx} | 18 ++--- ...hManager_eLSF.cxx => BatchManager_LSF.cxx} | 52 +++++++-------- ...hManager_eLSF.hxx => BatchManager_LSF.hxx} | 18 ++--- src/LSF/CMakeLists.txt | 6 +- ...ager_eLSF.cxx => FactBatchManager_LSF.cxx} | 16 ++--- ...ager_eLSF.hxx => FactBatchManager_LSF.hxx} | 18 ++--- ...Batch_JobInfo_eLSF.cxx => JobInfo_LSF.cxx} | 18 ++--- ...Batch_JobInfo_eLSF.hxx => JobInfo_LSF.hxx} | 14 ++-- ...tchManager_eLL.cxx => BatchManager_LL.cxx} | 50 +++++++------- ...tchManager_eLL.hxx => BatchManager_LL.hxx} | 18 ++--- src/LoadLeveler/CMakeLists.txt | 6 +- ...anager_eLL.cxx => FactBatchManager_LL.cxx} | 20 +++--- ...anager_eLL.hxx => FactBatchManager_LL.hxx} | 18 ++--- .../{Batch_JobInfo_eLL.cxx => JobInfo_LL.cxx} | 12 ++-- .../{Batch_JobInfo_eLL.hxx => JobInfo_LL.hxx} | 10 +-- src/LoadLeveler/Test/CMakeLists.txt | 8 +-- .../Test/{Test_eLL.cxx => Test_LL.cxx} | 18 ++--- ...nager_Local.cxx => BatchManager_Local.cxx} | 8 +-- ...nager_Local.hxx => BatchManager_Local.hxx} | 16 ++--- src/Local/CMakeLists.txt | 10 +-- ...r_Local.cxx => FactBatchManager_Local.cxx} | 6 +- ...r_Local.hxx => FactBatchManager_Local.hxx} | 4 +- src/Local/{Batch_IOMutex.cxx => IOMutex.cxx} | 2 +- src/Local/{Batch_IOMutex.hxx => IOMutex.hxx} | 0 ...ch_JobInfo_Local.cxx => JobInfo_Local.cxx} | 6 +- ...ch_JobInfo_Local.hxx => JobInfo_Local.hxx} | 2 +- .../{Batch_Job_Local.cxx => Job_Local.cxx} | 4 +- .../{Batch_Job_Local.hxx => Job_Local.hxx} | 6 +- src/Local/Test/Test_Local_RSH.cxx | 10 +-- src/Local/Test/Test_Local_SH.cxx | 10 +-- src/Local/Test/Test_Local_SSH.cxx | 10 +-- ...hManager_ePBS.cxx => BatchManager_PBS.cxx} | 48 +++++++------- ...hManager_ePBS.hxx => BatchManager_PBS.hxx} | 18 ++--- src/PBS/CMakeLists.txt | 6 +- ...ager_ePBS.cxx => FactBatchManager_PBS.cxx} | 16 ++--- ...ager_ePBS.hxx => FactBatchManager_PBS.hxx} | 20 +++--- ...Batch_JobInfo_ePBS.cxx => JobInfo_PBS.cxx} | 16 ++--- ...Batch_JobInfo_ePBS.hxx => JobInfo_PBS.hxx} | 16 ++--- src/PBS/Test/CMakeLists.txt | 8 +-- src/PBS/Test/{Test_ePBS.cxx => Test_PBS.cxx} | 16 ++--- src/Python/libBatch_Swig.i | 36 +++++----- src/Python/libBatch_Swig_typemap.i | 10 +-- ...hManager_eSGE.cxx => BatchManager_SGE.cxx} | 50 +++++++------- ...hManager_eSGE.hxx => BatchManager_SGE.hxx} | 18 ++--- src/SGE/CMakeLists.txt | 6 +- ...ager_eSGE.cxx => FactBatchManager_SGE.cxx} | 16 ++--- ...ager_eSGE.hxx => FactBatchManager_SGE.hxx} | 18 ++--- ...Batch_JobInfo_eSGE.cxx => JobInfo_SGE.cxx} | 28 ++++---- ...Batch_JobInfo_eSGE.hxx => JobInfo_SGE.hxx} | 18 ++--- ...ager_eSlurm.cxx => BatchManager_Slurm.cxx} | 48 +++++++------- ...ager_eSlurm.hxx => BatchManager_Slurm.hxx} | 18 ++--- src/Slurm/CMakeLists.txt | 6 +- ..._eSlurm.cxx => FactBatchManager_Slurm.cxx} | 18 ++--- ..._eSlurm.hxx => FactBatchManager_Slurm.hxx} | 14 ++-- ...h_JobInfo_eSlurm.cxx => JobInfo_Slurm.cxx} | 12 ++-- ...h_JobInfo_eSlurm.hxx => JobInfo_Slurm.hxx} | 10 +-- ...er_eVishnu.cxx => BatchManager_Vishnu.cxx} | 54 +++++++-------- ...er_eVishnu.hxx => BatchManager_Vishnu.hxx} | 18 ++--- src/Vishnu/CMakeLists.txt | 6 +- ...Vishnu.cxx => FactBatchManager_Vishnu.cxx} | 20 +++--- ...Vishnu.hxx => FactBatchManager_Vishnu.hxx} | 16 ++--- ...JobInfo_eVishnu.cxx => JobInfo_Vishnu.cxx} | 12 ++-- ...JobInfo_eVishnu.hxx => JobInfo_Vishnu.hxx} | 10 +-- 139 files changed, 778 insertions(+), 778 deletions(-) rename Batch_config.h.in => config.h.in (100%) rename src/CCC/{Batch_BatchManager_eCCC.cxx => BatchManager_CCC.cxx} (86%) rename src/CCC/{Batch_BatchManager_eCCC.hxx => BatchManager_CCC.hxx} (89%) rename src/CCC/{Batch_FactBatchManager_eCCC.cxx => FactBatchManager_CCC.cxx} (77%) rename src/CCC/{Batch_FactBatchManager_eCCC.hxx => FactBatchManager_CCC.hxx} (81%) rename src/CCC/{Batch_JobInfo_eCCC.cxx => JobInfo_CCC.cxx} (85%) rename src/CCC/{Batch_JobInfo_eCCC.hxx => JobInfo_CCC.hxx} (84%) rename src/Core/{Batch_APIInternalFailureException.cxx => APIInternalFailureException.cxx} (96%) rename src/Core/{Batch_APIInternalFailureException.hxx => APIInternalFailureException.hxx} (93%) rename src/Core/{Batch_BatchManager.cxx => BatchManager.cxx} (97%) rename src/Core/{Batch_BatchManager.hxx => BatchManager.hxx} (94%) rename src/Core/{Batch_BatchManagerCatalog.cxx => BatchManagerCatalog.cxx} (97%) rename src/Core/{Batch_BatchManagerCatalog.hxx => BatchManagerCatalog.hxx} (98%) rename src/Core/{Batch_BoolType.cxx => BoolType.cxx} (98%) rename src/Core/{Batch_BoolType.hxx => BoolType.hxx} (96%) rename src/Core/{Batch_CommunicationProtocol.cxx => CommunicationProtocol.cxx} (94%) rename src/Core/{Batch_CommunicationProtocol.hxx => CommunicationProtocol.hxx} (98%) rename src/Core/{Batch_CommunicationProtocolRSH.cxx => CommunicationProtocolRSH.cxx} (97%) rename src/Core/{Batch_CommunicationProtocolRSH.hxx => CommunicationProtocolRSH.hxx} (95%) rename src/Core/{Batch_CommunicationProtocolSH.cxx => CommunicationProtocolSH.cxx} (96%) rename src/Core/{Batch_CommunicationProtocolSH.hxx => CommunicationProtocolSH.hxx} (95%) rename src/Core/{Batch_CommunicationProtocolSSH.cxx => CommunicationProtocolSSH.cxx} (96%) rename src/Core/{Batch_CommunicationProtocolSSH.hxx => CommunicationProtocolSSH.hxx} (94%) rename src/Core/{Batch_Constants.cxx => Constants.cxx} (97%) rename src/Core/{Batch_Constants.hxx => Constants.hxx} (97%) rename src/Core/{Batch_Couple.cxx => Couple.cxx} (98%) rename src/Core/{Batch_Couple.hxx => Couple.hxx} (98%) rename src/Core/{Batch_CoupleType.cxx => CoupleType.cxx} (98%) rename src/Core/{Batch_CoupleType.hxx => CoupleType.hxx} (95%) rename src/Core/{Batch_Date.cxx => Date.cxx} (99%) rename src/Core/{Batch_Date.hxx => Date.hxx} (98%) rename src/Core/{Batch_Defines.hxx => Defines.hxx} (96%) rename src/Core/{Batch_Environnement.cxx => Environnement.cxx} (97%) rename src/Core/{Batch_Environnement.hxx => Environnement.hxx} (97%) rename src/Core/{Batch_FactBatchManager.cxx => FactBatchManager.cxx} (95%) rename src/Core/{Batch_FactBatchManager.hxx => FactBatchManager.hxx} (96%) rename src/Core/{Batch_GenericException.cxx => GenericException.cxx} (97%) rename src/Core/{Batch_GenericException.hxx => GenericException.hxx} (98%) rename src/Core/{Batch_GenericType.cxx => GenericType.cxx} (98%) rename src/Core/{Batch_GenericType.hxx => GenericType.hxx} (98%) rename src/Core/{Batch_InvalidArgumentException.cxx => InvalidArgumentException.cxx} (96%) rename src/Core/{Batch_InvalidArgumentException.hxx => InvalidArgumentException.hxx} (95%) rename src/Core/{Batch_InvalidKeyException.cxx => InvalidKeyException.cxx} (96%) rename src/Core/{Batch_InvalidKeyException.hxx => InvalidKeyException.hxx} (95%) rename src/Core/{Batch_Job.cxx => Job.cxx} (98%) rename src/Core/{Batch_Job.hxx => Job.hxx} (95%) rename src/Core/{Batch_JobId.cxx => JobId.cxx} (98%) rename src/Core/{Batch_JobId.hxx => JobId.hxx} (97%) rename src/Core/{Batch_JobInfo.cxx => JobInfo.cxx} (97%) rename src/Core/{Batch_JobInfo.hxx => JobInfo.hxx} (96%) rename src/Core/{Batch_ListIsFullException.cxx => ListIsFullException.cxx} (96%) rename src/Core/{Batch_ListIsFullException.hxx => ListIsFullException.hxx} (95%) rename src/Core/{Batch_LongType.cxx => LongType.cxx} (98%) rename src/Core/{Batch_LongType.hxx => LongType.hxx} (96%) rename src/Core/{Batch_MpiImpl.cxx => MpiImpl.cxx} (99%) rename src/Core/{Batch_MpiImpl.hxx => MpiImpl.hxx} (99%) rename src/Core/{Batch_NotYetImplementedException.cxx => NotYetImplementedException.cxx} (96%) rename src/Core/{Batch_NotYetImplementedException.hxx => NotYetImplementedException.hxx} (95%) rename src/Core/{Batch_ParameterTypeMap.cxx => ParameterTypeMap.cxx} (95%) rename src/Core/{Batch_ParameterTypeMap.hxx => ParameterTypeMap.hxx} (95%) rename src/Core/{Batch_Parametre.cxx => Parametre.cxx} (95%) rename src/Core/{Batch_Parametre.hxx => Parametre.hxx} (96%) rename src/Core/{Batch_RunTimeException.cxx => RunTimeException.cxx} (96%) rename src/Core/{Batch_RunTimeException.hxx => RunTimeException.hxx} (95%) rename src/Core/{Batch_StringType.cxx => StringType.cxx} (98%) rename src/Core/{Batch_StringType.hxx => StringType.hxx} (96%) rename src/Core/{Batch_TypeMismatchException.cxx => TypeMismatchException.cxx} (96%) rename src/Core/{Batch_TypeMismatchException.hxx => TypeMismatchException.hxx} (95%) rename src/Core/{Batch_Utils.cxx => Utils.cxx} (96%) rename src/Core/{Batch_Utils.hxx => Utils.hxx} (99%) rename src/Core/{Batch_Versatile.cxx => Versatile.cxx} (96%) rename src/Core/{Batch_Versatile.hxx => Versatile.hxx} (92%) rename src/LSF/{Batch_BatchManager_eLSF.cxx => BatchManager_LSF.cxx} (85%) rename src/LSF/{Batch_BatchManager_eLSF.hxx => BatchManager_LSF.hxx} (89%) rename src/LSF/{Batch_FactBatchManager_eLSF.cxx => FactBatchManager_LSF.cxx} (77%) rename src/LSF/{Batch_FactBatchManager_eLSF.hxx => FactBatchManager_LSF.hxx} (80%) rename src/LSF/{Batch_JobInfo_eLSF.cxx => JobInfo_LSF.cxx} (89%) rename src/LSF/{Batch_JobInfo_eLSF.hxx => JobInfo_LSF.hxx} (85%) rename src/LoadLeveler/{Batch_BatchManager_eLL.cxx => BatchManager_LL.cxx} (84%) rename src/LoadLeveler/{Batch_BatchManager_eLL.hxx => BatchManager_LL.hxx} (84%) rename src/LoadLeveler/{Batch_FactBatchManager_eLL.cxx => FactBatchManager_LL.cxx} (73%) rename src/LoadLeveler/{Batch_FactBatchManager_eLL.hxx => FactBatchManager_LL.hxx} (82%) rename src/LoadLeveler/{Batch_JobInfo_eLL.cxx => JobInfo_LL.cxx} (93%) rename src/LoadLeveler/{Batch_JobInfo_eLL.hxx => JobInfo_LL.hxx} (86%) rename src/LoadLeveler/Test/{Test_eLL.cxx => Test_LL.cxx} (93%) rename src/Local/{Batch_BatchManager_Local.cxx => BatchManager_Local.cxx} (99%) rename src/Local/{Batch_BatchManager_Local.hxx => BatchManager_Local.hxx} (95%) rename src/Local/{Batch_FactBatchManager_Local.cxx => FactBatchManager_Local.cxx} (94%) rename src/Local/{Batch_FactBatchManager_Local.hxx => FactBatchManager_Local.hxx} (95%) rename src/Local/{Batch_IOMutex.cxx => IOMutex.cxx} (97%) rename src/Local/{Batch_IOMutex.hxx => IOMutex.hxx} (100%) rename src/Local/{Batch_JobInfo_Local.cxx => JobInfo_Local.cxx} (93%) rename src/Local/{Batch_JobInfo_Local.hxx => JobInfo_Local.hxx} (98%) rename src/Local/{Batch_Job_Local.cxx => Job_Local.cxx} (97%) rename src/Local/{Batch_Job_Local.hxx => Job_Local.hxx} (95%) rename src/PBS/{Batch_BatchManager_ePBS.cxx => BatchManager_PBS.cxx} (85%) rename src/PBS/{Batch_BatchManager_ePBS.hxx => BatchManager_PBS.hxx} (89%) rename src/PBS/{Batch_FactBatchManager_ePBS.cxx => FactBatchManager_PBS.cxx} (76%) rename src/PBS/{Batch_FactBatchManager_ePBS.hxx => FactBatchManager_PBS.hxx} (79%) rename src/PBS/{Batch_JobInfo_ePBS.cxx => JobInfo_PBS.cxx} (89%) rename src/PBS/{Batch_JobInfo_ePBS.hxx => JobInfo_PBS.hxx} (84%) rename src/PBS/Test/{Test_ePBS.cxx => Test_PBS.cxx} (94%) rename src/SGE/{Batch_BatchManager_eSGE.cxx => BatchManager_SGE.cxx} (83%) rename src/SGE/{Batch_BatchManager_eSGE.hxx => BatchManager_SGE.hxx} (89%) rename src/SGE/{Batch_FactBatchManager_eSGE.cxx => FactBatchManager_SGE.cxx} (77%) rename src/SGE/{Batch_FactBatchManager_eSGE.hxx => FactBatchManager_SGE.hxx} (81%) rename src/SGE/{Batch_JobInfo_eSGE.cxx => JobInfo_SGE.cxx} (84%) rename src/SGE/{Batch_JobInfo_eSGE.hxx => JobInfo_SGE.hxx} (82%) rename src/Slurm/{Batch_BatchManager_eSlurm.cxx => BatchManager_Slurm.cxx} (83%) rename src/Slurm/{Batch_BatchManager_eSlurm.hxx => BatchManager_Slurm.hxx} (85%) rename src/Slurm/{Batch_FactBatchManager_eSlurm.cxx => FactBatchManager_Slurm.cxx} (72%) rename src/Slurm/{Batch_FactBatchManager_eSlurm.hxx => FactBatchManager_Slurm.hxx} (83%) rename src/Slurm/{Batch_JobInfo_eSlurm.cxx => JobInfo_Slurm.cxx} (90%) rename src/Slurm/{Batch_JobInfo_eSlurm.hxx => JobInfo_Slurm.hxx} (85%) rename src/Vishnu/{Batch_BatchManager_eVishnu.cxx => BatchManager_Vishnu.cxx} (86%) rename src/Vishnu/{Batch_BatchManager_eVishnu.hxx => BatchManager_Vishnu.hxx} (86%) rename src/Vishnu/{Batch_FactBatchManager_eVishnu.cxx => FactBatchManager_Vishnu.cxx} (69%) rename src/Vishnu/{Batch_FactBatchManager_eVishnu.hxx => FactBatchManager_Vishnu.hxx} (82%) rename src/Vishnu/{Batch_JobInfo_eVishnu.cxx => JobInfo_Vishnu.cxx} (91%) rename src/Vishnu/{Batch_JobInfo_eVishnu.hxx => JobInfo_Vishnu.hxx} (84%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a590c5..f671fce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ SET(CPACK_SOURCE_IGNORE_FILES /\\\\.;/CVS/;~) SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) -configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Batch_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Batch_config.h) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) INCLUDE(Summary) diff --git a/Batch_config.h.in b/config.h.in similarity index 100% rename from Batch_config.h.in rename to config.h.in diff --git a/misc/check_libbatch.m4 b/misc/check_libbatch.m4 index 4e67887..bd2dd2b 100644 --- a/misc/check_libbatch.m4 +++ b/misc/check_libbatch.m4 @@ -72,7 +72,7 @@ fi CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES" -AC_CHECK_HEADER(libbatch/Batch_BatchManager.hxx, +AC_CHECK_HEADER(libbatch/BatchManager.hxx, libbatch_ok="yes", libbatch_ok="no") CPPFLAGS="$CPPFLAGS_old" diff --git a/src/CCC/Batch_BatchManager_eCCC.cxx b/src/CCC/BatchManager_CCC.cxx similarity index 86% rename from src/CCC/Batch_BatchManager_eCCC.cxx rename to src/CCC/BatchManager_CCC.cxx index 0d8f509..1403704 100644 --- a/src/CCC/Batch_BatchManager_eCCC.cxx +++ b/src/CCC/BatchManager_CCC.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * BatchManager_eCCC.cxx : emulation of CCC client for CCRT machines + * BatchManager_CCC.cxx : emulation of CCC client for CCRT machines * * Auteur : Bernard SECHER - CEA DEN * Mail : mailto:bernard.secher@cea.fr @@ -47,18 +47,18 @@ #include #endif -#include -#include -#include +#include +#include +#include -#include "Batch_BatchManager_eCCC.hxx" -#include "Batch_JobInfo_eCCC.hxx" +#include "BatchManager_CCC.hxx" +#include "JobInfo_CCC.hxx" using namespace std; namespace Batch { - BatchManager_eCCC::BatchManager_eCCC(const FactBatchManager * parent, const char * host, + BatchManager_CCC::BatchManager_CCC(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) : BatchManager(parent, host, username, protocolType, mpiImpl) @@ -67,13 +67,13 @@ namespace Batch { } // Destructeur - BatchManager_eCCC::~BatchManager_eCCC() + BatchManager_CCC::~BatchManager_CCC() { // Nothing to do } // Methode pour le controle des jobs : soumet un job au gestionnaire - const JobId BatchManager_eCCC::submitJob(const Job & job) + const JobId BatchManager_CCC::submitJob(const Job & job) { Parametre params = job.getParametre(); const std::string workDir = params[WORKDIR]; @@ -119,13 +119,13 @@ namespace Batch { // Ce manager permet de faire de la reprise const Batch::JobId - BatchManager_eCCC::addJob(const Batch::Job & job, const std::string reference) + BatchManager_CCC::addJob(const Batch::Job & job, const std::string reference) { return JobId(this, reference); } // Methode pour le controle des jobs : retire un job du gestionnaire - void BatchManager_eCCC::deleteJob(const JobId & jobid) + void BatchManager_CCC::deleteJob(const JobId & jobid) { int status; int ref; @@ -144,38 +144,38 @@ namespace Batch { } // Methode pour le controle des jobs : suspend un job en file d'attente - void BatchManager_eCCC::holdJob(const JobId & jobid) + void BatchManager_CCC::holdJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eCCC::holdJob"); + throw NotYetImplementedException("BatchManager_CCC::holdJob"); } // Methode pour le controle des jobs : relache un job suspendu - void BatchManager_eCCC::releaseJob(const JobId & jobid) + void BatchManager_CCC::releaseJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eCCC::releaseJob"); + throw NotYetImplementedException("BatchManager_CCC::releaseJob"); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_eCCC::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) + void BatchManager_CCC::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) { - throw NotYetImplementedException("BatchManager_eCCC::alterJob"); + throw NotYetImplementedException("BatchManager_CCC::alterJob"); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_eCCC::alterJob(const JobId & jobid, const Parametre & param) + void BatchManager_CCC::alterJob(const JobId & jobid, const Parametre & param) { alterJob(jobid, param, Environnement()); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_eCCC::alterJob(const JobId & jobid, const Environnement & env) + void BatchManager_CCC::alterJob(const JobId & jobid, const Environnement & env) { alterJob(jobid, Parametre(), env); } // Methode pour le controle des jobs : renvoie l'etat du job - JobInfo BatchManager_eCCC::queryJob(const JobId & jobid) + JobInfo BatchManager_CCC::queryJob(const JobId & jobid) { int id; istringstream iss(jobid.getReference()); @@ -191,19 +191,19 @@ namespace Batch { if (status) throw RunTimeException("Error of connection on remote host"); - JobInfo_eCCC ji = JobInfo_eCCC(id, output); + JobInfo_CCC ji = JobInfo_CCC(id, output); return ji; } // Methode pour le controle des jobs : teste si un job est present en machine - bool BatchManager_eCCC::isRunning(const JobId & jobid) + bool BatchManager_CCC::isRunning(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eCCC::isRunning"); + throw NotYetImplementedException("BatchManager_CCC::isRunning"); } - void BatchManager_eCCC::buildBatchScript(const Job & job) + void BatchManager_CCC::buildBatchScript(const Job & job) { #ifndef WIN32 //TODO: need for porting on Windows Parametre params = job.getParametre(); @@ -307,7 +307,7 @@ namespace Batch { } - std::string BatchManager_eCCC::getHomeDir(std::string tmpdir) + std::string BatchManager_CCC::getHomeDir(std::string tmpdir) { std::string home; diff --git a/src/CCC/Batch_BatchManager_eCCC.hxx b/src/CCC/BatchManager_CCC.hxx similarity index 89% rename from src/CCC/Batch_BatchManager_eCCC.hxx rename to src/CCC/BatchManager_CCC.hxx index ac8f734..b3dcf91 100644 --- a/src/CCC/Batch_BatchManager_eCCC.hxx +++ b/src/CCC/BatchManager_CCC.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * BatchManager_eCCC.hxx : emulation of CCC client for CCRT machines + * BatchManager_CCC.hxx : emulation of CCC client for CCRT machines * * Auteur : Bernard SECHER - CEA DEN * Mail : mailto:bernard.secher@cea.fr @@ -32,22 +32,22 @@ #ifndef _BATCHMANAGER_ECCC_H_ #define _BATCHMANAGER_ECCC_H_ -#include "Batch_Defines.hxx" -#include "Batch_JobId.hxx" -#include "Batch_JobInfo.hxx" -#include "Batch_FactBatchManager.hxx" -#include "Batch_BatchManager.hxx" +#include "Defines.hxx" +#include "JobId.hxx" +#include "JobInfo.hxx" +#include "FactBatchManager.hxx" +#include "BatchManager.hxx" namespace Batch { - class BATCH_EXPORT BatchManager_eCCC : public BatchManager + class BATCH_EXPORT BatchManager_CCC : public BatchManager { public: // Constructeur et destructeur - BatchManager_eCCC(const FactBatchManager * parent, const char * host="localhost", + BatchManager_CCC(const FactBatchManager * parent, const char * host="localhost", const char * username="", CommunicationProtocolType protocolType = SSH, const char * mpiImpl="nompi"); // connexion a la machine host - virtual ~BatchManager_eCCC(); + virtual ~BatchManager_CCC(); // Recupere le nom du serveur par defaut // static string BatchManager_LSF::getDefaultServer(); diff --git a/src/CCC/CMakeLists.txt b/src/CCC/CMakeLists.txt index 272eadb..55c1e27 100644 --- a/src/CCC/CMakeLists.txt +++ b/src/CCC/CMakeLists.txt @@ -20,9 +20,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(CLASS_LIST CCC/Batch_BatchManager_eCCC - CCC/Batch_FactBatchManager_eCCC - CCC/Batch_JobInfo_eCCC +SET(CLASS_LIST CCC/BatchManager_CCC + CCC/FactBatchManager_CCC + CCC/JobInfo_CCC ) APPEND_CLASSES_TO_SRC_FILES(${CLASS_LIST}) diff --git a/src/CCC/Batch_FactBatchManager_eCCC.cxx b/src/CCC/FactBatchManager_CCC.cxx similarity index 77% rename from src/CCC/Batch_FactBatchManager_eCCC.cxx rename to src/CCC/FactBatchManager_CCC.cxx index 74a4689..a065daa 100644 --- a/src/CCC/Batch_FactBatchManager_eCCC.cxx +++ b/src/CCC/FactBatchManager_CCC.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * FactBatchManager_eCCC.cxx : + * FactBatchManager_CCC.cxx : * * Auteur : Bernard SECHER - CEA DEN * Date : Avril 2010 @@ -28,32 +28,32 @@ * */ -#include "Batch_BatchManager_eCCC.hxx" -#include "Batch_FactBatchManager_eCCC.hxx" +#include "BatchManager_CCC.hxx" +#include "FactBatchManager_CCC.hxx" namespace Batch { - static FactBatchManager_eCCC sFBM_eCCC; + static FactBatchManager_CCC sFBM_CCC; // Constructeur - FactBatchManager_eCCC::FactBatchManager_eCCC() : FactBatchManager("CCC") + FactBatchManager_CCC::FactBatchManager_CCC() : FactBatchManager("CCC") { // Nothing to do } // Destructeur - FactBatchManager_eCCC::~FactBatchManager_eCCC() + FactBatchManager_CCC::~FactBatchManager_CCC() { // Nothing to do } - BatchManager * FactBatchManager_eCCC::operator() (const char * hostname, + BatchManager * FactBatchManager_CCC::operator() (const char * hostname, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) const { // MESSAGE("Building new BatchManager_CCC on host '" << hostname << "'"); - return new BatchManager_eCCC(this, hostname, username, protocolType, mpiImpl); + return new BatchManager_CCC(this, hostname, username, protocolType, mpiImpl); } } diff --git a/src/CCC/Batch_FactBatchManager_eCCC.hxx b/src/CCC/FactBatchManager_CCC.hxx similarity index 81% rename from src/CCC/Batch_FactBatchManager_eCCC.hxx rename to src/CCC/FactBatchManager_CCC.hxx index fe83053..dafabae 100644 --- a/src/CCC/Batch_FactBatchManager_eCCC.hxx +++ b/src/CCC/FactBatchManager_CCC.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * FactBatchManager_eCCC.hxx : + * FactBatchManager_CCC.hxx : * * Auteur : Bernard SECHER : CEA DEN * Date : Avril 2010 @@ -28,21 +28,21 @@ * */ -#ifndef _FACTBATCHMANAGER_eCCC_H_ -#define _FACTBATCHMANAGER_eCCC_H_ +#ifndef _FACTBATCHMANAGER_CCC_H_ +#define _FACTBATCHMANAGER_CCC_H_ -#include "Batch_Defines.hxx" -#include "Batch_BatchManager.hxx" -#include "Batch_FactBatchManager.hxx" +#include "Defines.hxx" +#include "BatchManager.hxx" +#include "FactBatchManager.hxx" namespace Batch { - class BATCH_EXPORT FactBatchManager_eCCC : public FactBatchManager + class BATCH_EXPORT FactBatchManager_CCC : public FactBatchManager { public: // Constructeur et destructeur - FactBatchManager_eCCC(); - virtual ~FactBatchManager_eCCC(); + FactBatchManager_CCC(); + virtual ~FactBatchManager_CCC(); virtual BatchManager * operator() (const char * hostname, const char * username, diff --git a/src/CCC/Batch_JobInfo_eCCC.cxx b/src/CCC/JobInfo_CCC.cxx similarity index 85% rename from src/CCC/Batch_JobInfo_eCCC.cxx rename to src/CCC/JobInfo_CCC.cxx index edc646b..947d366 100644 --- a/src/CCC/Batch_JobInfo_eCCC.cxx +++ b/src/CCC/JobInfo_CCC.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * JobInfo_eCCC.cxx : emulation of CCC client for CCRT machines + * JobInfo_CCC.cxx : emulation of CCC client for CCRT machines * * Auteur : Bernard SECHER - CEA DEN * Mail : mailto:bernard.secher@cea.fr @@ -33,10 +33,10 @@ #include #include -#include "Batch_Constants.hxx" -#include "Batch_Parametre.hxx" -#include "Batch_Environnement.hxx" -#include "Batch_JobInfo_eCCC.hxx" +#include "Constants.hxx" +#include "Parametre.hxx" +#include "Environnement.hxx" +#include "JobInfo_CCC.hxx" using namespace std; @@ -45,9 +45,9 @@ namespace Batch { // Constructeurs - JobInfo_eCCC::JobInfo_eCCC(int id, string output) : JobInfo() + JobInfo_CCC::JobInfo_CCC(int id, string output) : JobInfo() { - // On remplit les membres _param et _env + // On remplit les membres _param et _nv ostringstream oss; oss << id; _param[ID] = oss.str(); @@ -90,20 +90,20 @@ namespace Batch { } // Teste si un job est present en machine - bool JobInfo_eCCC::isRunning() const + bool JobInfo_CCC::isRunning() const { return _running; } // Destructeur - JobInfo_eCCC::~JobInfo_eCCC() + JobInfo_CCC::~JobInfo_CCC() { // Nothing to do } // Convertit une date HH:MM:SS en secondes - long JobInfo_eCCC::HMStoLong(const string & s) + long JobInfo_CCC::HMStoLong(const string & s) { long hour, min, sec; @@ -112,10 +112,10 @@ namespace Batch { } // Methode pour l'interfacage avec Python (SWIG) : affichage en Python - string JobInfo_eCCC::__str__() const + string JobInfo_CCC::__str__() const { ostringstream sst; - sst << " namespace Batch { - class JobInfo_eCCC : public JobInfo + class JobInfo_CCC : public JobInfo { public: // Constructeurs et destructeur - JobInfo_eCCC() : _running(false) {}; - JobInfo_eCCC(int id,std::string output); - virtual ~JobInfo_eCCC(); + JobInfo_CCC() : _running(false) {}; + JobInfo_CCC(int id,std::string output); + virtual ~JobInfo_CCC(); // Constructeur par recopie - JobInfo_eCCC(const JobInfo_eCCC & jinfo) : JobInfo(jinfo) {}; + JobInfo_CCC(const JobInfo_CCC & jinfo) : JobInfo(jinfo) {}; // Teste si un job est present en machine virtual bool isRunning() const; diff --git a/src/Core/Batch_APIInternalFailureException.cxx b/src/Core/APIInternalFailureException.cxx similarity index 96% rename from src/Core/Batch_APIInternalFailureException.cxx rename to src/Core/APIInternalFailureException.cxx index 515b554..5170a7c 100644 --- a/src/Core/Batch_APIInternalFailureException.cxx +++ b/src/Core/APIInternalFailureException.cxx @@ -29,7 +29,7 @@ * */ -#include "Batch_APIInternalFailureException.hxx" +#include "APIInternalFailureException.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_APIInternalFailureException.hxx b/src/Core/APIInternalFailureException.hxx similarity index 93% rename from src/Core/Batch_APIInternalFailureException.hxx rename to src/Core/APIInternalFailureException.hxx index c1a7dd6..2e1a6d8 100644 --- a/src/Core/Batch_APIInternalFailureException.hxx +++ b/src/Core/APIInternalFailureException.hxx @@ -32,10 +32,10 @@ #ifndef _APIINTERNALFAILUREEXCEPTION_H_ #define _APIINTERNALFAILUREEXCEPTION_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" -#include "Batch_GenericException.hxx" -#include "Batch_GenericException.hxx" +#include "GenericException.hxx" +#include "GenericException.hxx" namespace Batch { diff --git a/src/Core/Batch_BatchManager.cxx b/src/Core/BatchManager.cxx similarity index 97% rename from src/Core/Batch_BatchManager.cxx rename to src/Core/BatchManager.cxx index 1af2bec..337fd91 100644 --- a/src/Core/Batch_BatchManager.cxx +++ b/src/Core/BatchManager.cxx @@ -38,14 +38,14 @@ # include #endif -#include "Batch_Constants.hxx" -#include "Batch_Job.hxx" -#include "Batch_JobId.hxx" -#include "Batch_JobInfo.hxx" -#include "Batch_InvalidArgumentException.hxx" -#include "Batch_FactBatchManager.hxx" -#include "Batch_BatchManager.hxx" -#include "Batch_Utils.hxx" +#include "Constants.hxx" +#include "Job.hxx" +#include "JobId.hxx" +#include "JobInfo.hxx" +#include "InvalidArgumentException.hxx" +#include "FactBatchManager.hxx" +#include "BatchManager.hxx" +#include "Utils.hxx" #ifdef WIN32 #define sleep(seconds) Sleep((seconds)*1000) diff --git a/src/Core/Batch_BatchManager.hxx b/src/Core/BatchManager.hxx similarity index 94% rename from src/Core/Batch_BatchManager.hxx rename to src/Core/BatchManager.hxx index 12086f7..e12332c 100644 --- a/src/Core/Batch_BatchManager.hxx +++ b/src/Core/BatchManager.hxx @@ -31,16 +31,16 @@ #ifndef _BATCHMANAGER_H_ #define _BATCHMANAGER_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include #include -#include "Batch_Job.hxx" -#include "Batch_JobId.hxx" -#include "Batch_JobInfo.hxx" -#include "Batch_InvalidArgumentException.hxx" -#include "Batch_CommunicationProtocol.hxx" -#include "Batch_MpiImpl.hxx" +#include "Job.hxx" +#include "JobId.hxx" +#include "JobInfo.hxx" +#include "InvalidArgumentException.hxx" +#include "CommunicationProtocol.hxx" +#include "MpiImpl.hxx" namespace Batch { diff --git a/src/Core/Batch_BatchManagerCatalog.cxx b/src/Core/BatchManagerCatalog.cxx similarity index 97% rename from src/Core/Batch_BatchManagerCatalog.cxx rename to src/Core/BatchManagerCatalog.cxx index 8597688..44d2844 100644 --- a/src/Core/Batch_BatchManagerCatalog.cxx +++ b/src/Core/BatchManagerCatalog.cxx @@ -32,8 +32,8 @@ #include #include #include -#include "Batch_BatchManagerCatalog.hxx" -#include "Batch_FactBatchManager.hxx" +#include "BatchManagerCatalog.hxx" +#include "FactBatchManager.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_BatchManagerCatalog.hxx b/src/Core/BatchManagerCatalog.hxx similarity index 98% rename from src/Core/Batch_BatchManagerCatalog.hxx rename to src/Core/BatchManagerCatalog.hxx index dad4388..a26a64e 100644 --- a/src/Core/Batch_BatchManagerCatalog.hxx +++ b/src/Core/BatchManagerCatalog.hxx @@ -32,7 +32,7 @@ #ifndef _CATALOG_H_ #define _CATALOG_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include #include diff --git a/src/Core/Batch_BoolType.cxx b/src/Core/BoolType.cxx similarity index 98% rename from src/Core/Batch_BoolType.cxx rename to src/Core/BoolType.cxx index a5dec46..66b4f07 100644 --- a/src/Core/Batch_BoolType.cxx +++ b/src/Core/BoolType.cxx @@ -30,7 +30,7 @@ #include #include -#include "Batch_BoolType.hxx" +#include "BoolType.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_BoolType.hxx b/src/Core/BoolType.hxx similarity index 96% rename from src/Core/Batch_BoolType.hxx rename to src/Core/BoolType.hxx index 7695320..e7a27c3 100644 --- a/src/Core/Batch_BoolType.hxx +++ b/src/Core/BoolType.hxx @@ -31,10 +31,10 @@ #ifndef _BOOLTYPE_H_ #define _BOOLTYPE_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include -#include "Batch_GenericType.hxx" +#include "GenericType.hxx" namespace Batch { diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt index e4cb649..46e8703 100644 --- a/src/Core/CMakeLists.txt +++ b/src/Core/CMakeLists.txt @@ -20,51 +20,51 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(CLASS_LIST Core/Batch_APIInternalFailureException - Core/Batch_BatchManager - Core/Batch_BatchManagerCatalog - Core/Batch_BoolType - Core/Batch_CommunicationProtocol - Core/Batch_Constants - Core/Batch_Couple - Core/Batch_CoupleType - Core/Batch_Date - Core/Batch_Environnement - Core/Batch_FactBatchManager - Core/Batch_GenericException - Core/Batch_GenericType - Core/Batch_InvalidArgumentException - Core/Batch_InvalidKeyException - Core/Batch_Job - Core/Batch_JobId - Core/Batch_JobInfo - Core/Batch_ListIsFullException - Core/Batch_LongType - Core/Batch_MpiImpl - Core/Batch_NotYetImplementedException - Core/Batch_ParameterTypeMap - Core/Batch_Parametre - Core/Batch_RunTimeException - Core/Batch_StringType - Core/Batch_TypeMismatchException - Core/Batch_Versatile - Core/Batch_Utils +SET(CLASS_LIST Core/APIInternalFailureException + Core/BatchManager + Core/BatchManagerCatalog + Core/BoolType + Core/CommunicationProtocol + Core/Constants + Core/Couple + Core/CoupleType + Core/Date + Core/Environnement + Core/FactBatchManager + Core/GenericException + Core/GenericType + Core/InvalidArgumentException + Core/InvalidKeyException + Core/Job + Core/JobId + Core/JobInfo + Core/ListIsFullException + Core/LongType + Core/MpiImpl + Core/NotYetImplementedException + Core/ParameterTypeMap + Core/Parametre + Core/RunTimeException + Core/StringType + Core/TypeMismatchException + Core/Versatile + Core/Utils ) APPEND_CLASSES_TO_SRC_FILES(${CLASS_LIST}) APPEND_CLASSES_TO_HDR_FILES(${CLASS_LIST}) -APPEND_CLASSES_TO_HDR_FILES(Core/Batch_Defines) +APPEND_CLASSES_TO_HDR_FILES(Core/Defines) IF (HAS_SH) - APPEND_CLASSES_TO_SRC_FILES(Core/Batch_CommunicationProtocolSH) + APPEND_CLASSES_TO_SRC_FILES(Core/CommunicationProtocolSH) ENDIF (HAS_SH) IF (HAS_RSH) - APPEND_CLASSES_TO_SRC_FILES(Core/Batch_CommunicationProtocolRSH) + APPEND_CLASSES_TO_SRC_FILES(Core/CommunicationProtocolRSH) ENDIF (HAS_RSH) IF (HAS_SSH) - APPEND_CLASSES_TO_SRC_FILES(Core/Batch_CommunicationProtocolSSH) + APPEND_CLASSES_TO_SRC_FILES(Core/CommunicationProtocolSSH) ENDIF (HAS_SSH) diff --git a/src/Core/Batch_CommunicationProtocol.cxx b/src/Core/CommunicationProtocol.cxx similarity index 94% rename from src/Core/Batch_CommunicationProtocol.cxx rename to src/Core/CommunicationProtocol.cxx index 8a3ef6a..416b1ee 100644 --- a/src/Core/Batch_CommunicationProtocol.cxx +++ b/src/Core/CommunicationProtocol.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_CommunicationProtocol.cxx : + * CommunicationProtocol.cxx : * * Created on: 14 sept. 2009 * Author : Renaud BARATE - EDF R&D @@ -30,20 +30,20 @@ #include #include -#include +#include -#include "Batch_CommunicationProtocol.hxx" +#include "CommunicationProtocol.hxx" #ifdef HAS_RSH - #include "Batch_CommunicationProtocolRSH.hxx" + #include "CommunicationProtocolRSH.hxx" #endif #ifdef HAS_SH - #include "Batch_CommunicationProtocolSH.hxx" + #include "CommunicationProtocolSH.hxx" #endif #ifdef HAS_SSH - #include "Batch_CommunicationProtocolSSH.hxx" + #include "CommunicationProtocolSSH.hxx" #endif -#include "Batch_APIInternalFailureException.hxx" -#include "Batch_RunTimeException.hxx" +#include "APIInternalFailureException.hxx" +#include "RunTimeException.hxx" using namespace std; diff --git a/src/Core/Batch_CommunicationProtocol.hxx b/src/Core/CommunicationProtocol.hxx similarity index 98% rename from src/Core/Batch_CommunicationProtocol.hxx rename to src/Core/CommunicationProtocol.hxx index a300ff1..afd508e 100644 --- a/src/Core/Batch_CommunicationProtocol.hxx +++ b/src/Core/CommunicationProtocol.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_CommunicationProtocol.hxx : + * CommunicationProtocol.hxx : * * Created on: 14 sept. 2009 * Author : Renaud BARATE - EDF R&D @@ -32,7 +32,7 @@ #include #include -#include "Batch_Defines.hxx" +#include "Defines.hxx" namespace Batch { diff --git a/src/Core/Batch_CommunicationProtocolRSH.cxx b/src/Core/CommunicationProtocolRSH.cxx similarity index 97% rename from src/Core/Batch_CommunicationProtocolRSH.cxx rename to src/Core/CommunicationProtocolRSH.cxx index 99f28ba..bb7a308 100644 --- a/src/Core/Batch_CommunicationProtocolRSH.cxx +++ b/src/Core/CommunicationProtocolRSH.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_CommunicationProtocolRSH.cxx : + * CommunicationProtocolRSH.cxx : * * Created on: 14 sept. 2009 * Author : Renaud BARATE - EDF R&D @@ -30,12 +30,12 @@ #include #include -#include +#include #endif -#include +#include -#include "Batch_CommunicationProtocolRSH.hxx" +#include "CommunicationProtocolRSH.hxx" using namespace std; diff --git a/src/Core/Batch_CommunicationProtocolRSH.hxx b/src/Core/CommunicationProtocolRSH.hxx similarity index 95% rename from src/Core/Batch_CommunicationProtocolRSH.hxx rename to src/Core/CommunicationProtocolRSH.hxx index e2a475d..6a32d08 100644 --- a/src/Core/Batch_CommunicationProtocolRSH.hxx +++ b/src/Core/CommunicationProtocolRSH.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_CommunicationProtocolRSH.hxx : + * CommunicationProtocolRSH.hxx : * * Created on: 14 sept. 2009 * Author : Renaud BARATE - EDF R&D @@ -32,8 +32,8 @@ #include #include -#include "Batch_Defines.hxx" -#include "Batch_CommunicationProtocol.hxx" +#include "Defines.hxx" +#include "CommunicationProtocol.hxx" namespace Batch { diff --git a/src/Core/Batch_CommunicationProtocolSH.cxx b/src/Core/CommunicationProtocolSH.cxx similarity index 96% rename from src/Core/Batch_CommunicationProtocolSH.cxx rename to src/Core/CommunicationProtocolSH.cxx index 3ef7180..546e97c 100644 --- a/src/Core/Batch_CommunicationProtocolSH.cxx +++ b/src/Core/CommunicationProtocolSH.cxx @@ -20,15 +20,15 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_CommunicationProtocolSH.cxx : + * CommunicationProtocolSH.cxx : * * Created on: 16 sept. 2009 * Author : Renaud BARATE - EDF R&D */ -#include +#include -#include "Batch_CommunicationProtocolSH.hxx" +#include "CommunicationProtocolSH.hxx" using namespace std; diff --git a/src/Core/Batch_CommunicationProtocolSH.hxx b/src/Core/CommunicationProtocolSH.hxx similarity index 95% rename from src/Core/Batch_CommunicationProtocolSH.hxx rename to src/Core/CommunicationProtocolSH.hxx index 46e0d8c..778d5f9 100644 --- a/src/Core/Batch_CommunicationProtocolSH.hxx +++ b/src/Core/CommunicationProtocolSH.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_CommunicationProtocolSH.hxx : + * CommunicationProtocolSH.hxx : * * Created on: 16 sept. 2009 * Author : Renaud BARATE - EDF R&D @@ -32,8 +32,8 @@ #include #include -#include "Batch_Defines.hxx" -#include "Batch_CommunicationProtocol.hxx" +#include "Defines.hxx" +#include "CommunicationProtocol.hxx" namespace Batch { diff --git a/src/Core/Batch_CommunicationProtocolSSH.cxx b/src/Core/CommunicationProtocolSSH.cxx similarity index 96% rename from src/Core/Batch_CommunicationProtocolSSH.cxx rename to src/Core/CommunicationProtocolSSH.cxx index deac559..3a40db1 100644 --- a/src/Core/Batch_CommunicationProtocolSSH.cxx +++ b/src/Core/CommunicationProtocolSSH.cxx @@ -20,15 +20,15 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_CommunicationProtocolSSH.cxx : + * CommunicationProtocolSSH.cxx : * * Created on: 14 sept. 2009 * Author : Renaud BARATE - EDF R&D */ -#include +#include -#include "Batch_CommunicationProtocolSSH.hxx" +#include "CommunicationProtocolSSH.hxx" using namespace std; diff --git a/src/Core/Batch_CommunicationProtocolSSH.hxx b/src/Core/CommunicationProtocolSSH.hxx similarity index 94% rename from src/Core/Batch_CommunicationProtocolSSH.hxx rename to src/Core/CommunicationProtocolSSH.hxx index 24743ff..54145ce 100644 --- a/src/Core/Batch_CommunicationProtocolSSH.hxx +++ b/src/Core/CommunicationProtocolSSH.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_CommunicationProtocolSSH.hxx : + * CommunicationProtocolSSH.hxx : * * Created on: 14 sept. 2009 * Author : Renaud BARATE - EDF R&D @@ -32,8 +32,8 @@ #include #include -#include "Batch_Defines.hxx" -#include "Batch_CommunicationProtocol.hxx" +#include "Defines.hxx" +#include "CommunicationProtocol.hxx" namespace Batch { diff --git a/src/Core/Batch_Constants.cxx b/src/Core/Constants.cxx similarity index 97% rename from src/Core/Batch_Constants.cxx rename to src/Core/Constants.cxx index a39e390..2968e6f 100644 --- a/src/Core/Batch_Constants.cxx +++ b/src/Core/Constants.cxx @@ -20,14 +20,14 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_Constants.cxx : + * Constants.cxx : * * Auteur : Renaud BARATE - EDF R&D * Date : January 2010 * */ -#include "Batch_Constants.hxx" +#include "Constants.hxx" namespace Batch { diff --git a/src/Core/Batch_Constants.hxx b/src/Core/Constants.hxx similarity index 97% rename from src/Core/Batch_Constants.hxx rename to src/Core/Constants.hxx index 76b64f1..5d16505 100644 --- a/src/Core/Batch_Constants.hxx +++ b/src/Core/Constants.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_Constants.hxx : + * Constants.hxx : * * Auteur : Renaud BARATE - EDF R&D * Date : January 2010 @@ -32,7 +32,7 @@ #include -#include "Batch_Defines.hxx" +#include "Defines.hxx" // These macros simplify the creation of new string constants for keys and // values in parameters map. diff --git a/src/Core/Batch_Couple.cxx b/src/Core/Couple.cxx similarity index 98% rename from src/Core/Batch_Couple.cxx rename to src/Core/Couple.cxx index d1e49f3..4782efb 100644 --- a/src/Core/Batch_Couple.cxx +++ b/src/Core/Couple.cxx @@ -29,7 +29,7 @@ * */ -#include "Batch_Couple.hxx" +#include "Couple.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_Couple.hxx b/src/Core/Couple.hxx similarity index 98% rename from src/Core/Batch_Couple.hxx rename to src/Core/Couple.hxx index ec7238f..fe41fbc 100644 --- a/src/Core/Batch_Couple.hxx +++ b/src/Core/Couple.hxx @@ -32,7 +32,7 @@ #ifndef _COUPLE_H_ #define _COUPLE_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include diff --git a/src/Core/Batch_CoupleType.cxx b/src/Core/CoupleType.cxx similarity index 98% rename from src/Core/Batch_CoupleType.cxx rename to src/Core/CoupleType.cxx index 20f1852..0b7144b 100644 --- a/src/Core/Batch_CoupleType.cxx +++ b/src/Core/CoupleType.cxx @@ -30,7 +30,7 @@ */ #include -#include "Batch_CoupleType.hxx" +#include "CoupleType.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_CoupleType.hxx b/src/Core/CoupleType.hxx similarity index 95% rename from src/Core/Batch_CoupleType.hxx rename to src/Core/CoupleType.hxx index 9b66562..b6fcf7a 100644 --- a/src/Core/Batch_CoupleType.hxx +++ b/src/Core/CoupleType.hxx @@ -32,11 +32,11 @@ #ifndef _COUPLETYPE_H_ #define _COUPLETYPE_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include -#include "Batch_GenericType.hxx" -#include "Batch_Couple.hxx" +#include "GenericType.hxx" +#include "Couple.hxx" namespace Batch { diff --git a/src/Core/Batch_Date.cxx b/src/Core/Date.cxx similarity index 99% rename from src/Core/Batch_Date.cxx rename to src/Core/Date.cxx index a81bc87..7e73d49 100644 --- a/src/Core/Batch_Date.cxx +++ b/src/Core/Date.cxx @@ -31,7 +31,7 @@ #include #include -#include "Batch_Date.hxx" +#include "Date.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_Date.hxx b/src/Core/Date.hxx similarity index 98% rename from src/Core/Batch_Date.hxx rename to src/Core/Date.hxx index 0a38a91..cfd3b76 100644 --- a/src/Core/Batch_Date.hxx +++ b/src/Core/Date.hxx @@ -32,7 +32,7 @@ #ifndef _DATE_H_ #define _DATE_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include diff --git a/src/Core/Batch_Defines.hxx b/src/Core/Defines.hxx similarity index 96% rename from src/Core/Batch_Defines.hxx rename to src/Core/Defines.hxx index d53cfdb..1a22c8d 100644 --- a/src/Core/Batch_Defines.hxx +++ b/src/Core/Defines.hxx @@ -19,7 +19,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : Batch_Defines.hxx +// File : Defines.hxx // Author : Alexander A. BORODIN // Module : SALOME // @@ -27,7 +27,7 @@ #define _BATCH_Defines_HXX_ #ifdef WIN32 -# if defined Batch_EXPORTS +# if defined EXPORTS # define BATCH_EXPORT __declspec( dllexport ) # else # define BATCH_EXPORT __declspec( dllimport ) diff --git a/src/Core/Batch_Environnement.cxx b/src/Core/Environnement.cxx similarity index 97% rename from src/Core/Batch_Environnement.cxx rename to src/Core/Environnement.cxx index 0f4dcdc..db85263 100644 --- a/src/Core/Batch_Environnement.cxx +++ b/src/Core/Environnement.cxx @@ -29,7 +29,7 @@ * */ -#include "Batch_Environnement.hxx" +#include "Environnement.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_Environnement.hxx b/src/Core/Environnement.hxx similarity index 97% rename from src/Core/Batch_Environnement.hxx rename to src/Core/Environnement.hxx index e99fc7f..75eb7a7 100644 --- a/src/Core/Batch_Environnement.hxx +++ b/src/Core/Environnement.hxx @@ -32,7 +32,7 @@ #ifndef _ENVIRONNEMENT_H_ #define _ENVIRONNEMENT_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include diff --git a/src/Core/Batch_FactBatchManager.cxx b/src/Core/FactBatchManager.cxx similarity index 95% rename from src/Core/Batch_FactBatchManager.cxx rename to src/Core/FactBatchManager.cxx index df74a91..f926830 100644 --- a/src/Core/Batch_FactBatchManager.cxx +++ b/src/Core/FactBatchManager.cxx @@ -31,8 +31,8 @@ #include #include #include -#include "Batch_BatchManagerCatalog.hxx" -#include "Batch_FactBatchManager.hxx" +#include "BatchManagerCatalog.hxx" +#include "FactBatchManager.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_FactBatchManager.hxx b/src/Core/FactBatchManager.hxx similarity index 96% rename from src/Core/Batch_FactBatchManager.hxx rename to src/Core/FactBatchManager.hxx index 84ad191..dd36f7f 100644 --- a/src/Core/Batch_FactBatchManager.hxx +++ b/src/Core/FactBatchManager.hxx @@ -33,8 +33,8 @@ #include -#include "Batch_Defines.hxx" -#include "Batch_CommunicationProtocol.hxx" +#include "Defines.hxx" +#include "CommunicationProtocol.hxx" namespace Batch { diff --git a/src/Core/Batch_GenericException.cxx b/src/Core/GenericException.cxx similarity index 97% rename from src/Core/Batch_GenericException.cxx rename to src/Core/GenericException.cxx index 67b29c1..5636488 100644 --- a/src/Core/Batch_GenericException.cxx +++ b/src/Core/GenericException.cxx @@ -30,7 +30,7 @@ */ #include -#include "Batch_GenericException.hxx" +#include "GenericException.hxx" using namespace std; diff --git a/src/Core/Batch_GenericException.hxx b/src/Core/GenericException.hxx similarity index 98% rename from src/Core/Batch_GenericException.hxx rename to src/Core/GenericException.hxx index 435911b..cbeaa93 100644 --- a/src/Core/Batch_GenericException.hxx +++ b/src/Core/GenericException.hxx @@ -32,7 +32,7 @@ #ifndef _GENERICEXCEPTION_H_ #define _GENERICEXCEPTION_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include diff --git a/src/Core/Batch_GenericType.cxx b/src/Core/GenericType.cxx similarity index 98% rename from src/Core/Batch_GenericType.cxx rename to src/Core/GenericType.cxx index 810d837..b8aa499 100644 --- a/src/Core/Batch_GenericType.cxx +++ b/src/Core/GenericType.cxx @@ -32,7 +32,7 @@ #include #include #include -#include "Batch_GenericType.hxx" +#include "GenericType.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_GenericType.hxx b/src/Core/GenericType.hxx similarity index 98% rename from src/Core/Batch_GenericType.hxx rename to src/Core/GenericType.hxx index a2520d6..2b3ede3 100644 --- a/src/Core/Batch_GenericType.hxx +++ b/src/Core/GenericType.hxx @@ -31,7 +31,7 @@ #ifndef _GENERICTYPE_H_ #define _GENERICTYPE_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include diff --git a/src/Core/Batch_InvalidArgumentException.cxx b/src/Core/InvalidArgumentException.cxx similarity index 96% rename from src/Core/Batch_InvalidArgumentException.cxx rename to src/Core/InvalidArgumentException.cxx index a027307..9e7534d 100644 --- a/src/Core/Batch_InvalidArgumentException.cxx +++ b/src/Core/InvalidArgumentException.cxx @@ -29,7 +29,7 @@ * */ -#include "Batch_InvalidArgumentException.hxx" +#include "InvalidArgumentException.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_InvalidArgumentException.hxx b/src/Core/InvalidArgumentException.hxx similarity index 95% rename from src/Core/Batch_InvalidArgumentException.hxx rename to src/Core/InvalidArgumentException.hxx index fbd55b6..fd7d77c 100644 --- a/src/Core/Batch_InvalidArgumentException.hxx +++ b/src/Core/InvalidArgumentException.hxx @@ -33,9 +33,9 @@ #define _INVALIDARGUMENTEXCEPTION_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" -#include "Batch_GenericException.hxx" +#include "GenericException.hxx" namespace Batch { diff --git a/src/Core/Batch_InvalidKeyException.cxx b/src/Core/InvalidKeyException.cxx similarity index 96% rename from src/Core/Batch_InvalidKeyException.cxx rename to src/Core/InvalidKeyException.cxx index 3f0b173..7e6f49a 100644 --- a/src/Core/Batch_InvalidKeyException.cxx +++ b/src/Core/InvalidKeyException.cxx @@ -29,7 +29,7 @@ * */ -#include "Batch_InvalidKeyException.hxx" +#include "InvalidKeyException.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_InvalidKeyException.hxx b/src/Core/InvalidKeyException.hxx similarity index 95% rename from src/Core/Batch_InvalidKeyException.hxx rename to src/Core/InvalidKeyException.hxx index ff9dddc..d70466a 100644 --- a/src/Core/Batch_InvalidKeyException.hxx +++ b/src/Core/InvalidKeyException.hxx @@ -32,10 +32,10 @@ #ifndef _INVALIDKEYEXCEPTION_H_ #define _INVALIDKEYEXCEPTION_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" -#include "Batch_GenericException.hxx" +#include "GenericException.hxx" namespace Batch { diff --git a/src/Core/Batch_Job.cxx b/src/Core/Job.cxx similarity index 98% rename from src/Core/Batch_Job.cxx rename to src/Core/Job.cxx index 9c93a3b..f87a905 100644 --- a/src/Core/Batch_Job.cxx +++ b/src/Core/Job.cxx @@ -28,8 +28,8 @@ * */ -#include "Batch_Job.hxx" -#include "Batch_Parametre.hxx" +#include "Job.hxx" +#include "Parametre.hxx" #include //#include "MEDMEM_STRING.hxx" using namespace std; diff --git a/src/Core/Batch_Job.hxx b/src/Core/Job.hxx similarity index 95% rename from src/Core/Batch_Job.hxx rename to src/Core/Job.hxx index e3045c7..5433fdd 100644 --- a/src/Core/Batch_Job.hxx +++ b/src/Core/Job.hxx @@ -31,11 +31,11 @@ #ifndef _JOB_H_ #define _JOB_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" -#include "Batch_Parametre.hxx" -#include "Batch_Environnement.hxx" +#include "Parametre.hxx" +#include "Environnement.hxx" namespace Batch { diff --git a/src/Core/Batch_JobId.cxx b/src/Core/JobId.cxx similarity index 98% rename from src/Core/Batch_JobId.cxx rename to src/Core/JobId.cxx index 048ef27..c7a740c 100644 --- a/src/Core/Batch_JobId.cxx +++ b/src/Core/JobId.cxx @@ -28,8 +28,8 @@ * */ -#include "Batch_JobId.hxx" -#include "Batch_BatchManager.hxx" +#include "JobId.hxx" +#include "BatchManager.hxx" #include #include //#include "MEDMEM_STRING.hxx" diff --git a/src/Core/Batch_JobId.hxx b/src/Core/JobId.hxx similarity index 97% rename from src/Core/Batch_JobId.hxx rename to src/Core/JobId.hxx index 831c5cf..ebbcc75 100644 --- a/src/Core/Batch_JobId.hxx +++ b/src/Core/JobId.hxx @@ -32,10 +32,10 @@ #define _JOBID_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" -#include "Batch_JobInfo.hxx" -#include "Batch_BatchManager.hxx" +#include "JobInfo.hxx" +#include "BatchManager.hxx" namespace Batch { diff --git a/src/Core/Batch_JobInfo.cxx b/src/Core/JobInfo.cxx similarity index 97% rename from src/Core/Batch_JobInfo.cxx rename to src/Core/JobInfo.cxx index 6f50309..8353ecd 100644 --- a/src/Core/Batch_JobInfo.cxx +++ b/src/Core/JobInfo.cxx @@ -33,8 +33,8 @@ #include #include -#include "Batch_Constants.hxx" -#include "Batch_JobInfo.hxx" +#include "Constants.hxx" +#include "JobInfo.hxx" using namespace std; diff --git a/src/Core/Batch_JobInfo.hxx b/src/Core/JobInfo.hxx similarity index 96% rename from src/Core/Batch_JobInfo.hxx rename to src/Core/JobInfo.hxx index 7e09a18..817c60e 100644 --- a/src/Core/Batch_JobInfo.hxx +++ b/src/Core/JobInfo.hxx @@ -32,12 +32,12 @@ #ifndef _JOBINFO_H_ #define _JOBINFO_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include #include -#include "Batch_Parametre.hxx" -#include "Batch_Environnement.hxx" +#include "Parametre.hxx" +#include "Environnement.hxx" namespace Batch { diff --git a/src/Core/Batch_ListIsFullException.cxx b/src/Core/ListIsFullException.cxx similarity index 96% rename from src/Core/Batch_ListIsFullException.cxx rename to src/Core/ListIsFullException.cxx index 3a46ebc..2b0cd56 100644 --- a/src/Core/Batch_ListIsFullException.cxx +++ b/src/Core/ListIsFullException.cxx @@ -28,7 +28,7 @@ * */ -#include "Batch_ListIsFullException.hxx" +#include "ListIsFullException.hxx" using namespace std; diff --git a/src/Core/Batch_ListIsFullException.hxx b/src/Core/ListIsFullException.hxx similarity index 95% rename from src/Core/Batch_ListIsFullException.hxx rename to src/Core/ListIsFullException.hxx index 4020927..e1df097 100644 --- a/src/Core/Batch_ListIsFullException.hxx +++ b/src/Core/ListIsFullException.hxx @@ -31,9 +31,9 @@ #ifndef _LISTISFULLEXCEPTION_H_ #define _LISTISFULLEXCEPTION_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" -#include "Batch_GenericException.hxx" +#include "GenericException.hxx" namespace Batch { diff --git a/src/Core/Batch_LongType.cxx b/src/Core/LongType.cxx similarity index 98% rename from src/Core/Batch_LongType.cxx rename to src/Core/LongType.cxx index 48a9b86..f600081 100644 --- a/src/Core/Batch_LongType.cxx +++ b/src/Core/LongType.cxx @@ -32,7 +32,7 @@ #include #include //#include "MEDMEM_STRING.hxx" -#include "Batch_LongType.hxx" +#include "LongType.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_LongType.hxx b/src/Core/LongType.hxx similarity index 96% rename from src/Core/Batch_LongType.hxx rename to src/Core/LongType.hxx index 8e9f3ba..dfdeccb 100644 --- a/src/Core/Batch_LongType.hxx +++ b/src/Core/LongType.hxx @@ -31,10 +31,10 @@ #ifndef _LONGTYPE_H_ #define _LONGTYPE_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include -#include "Batch_GenericType.hxx" +#include "GenericType.hxx" namespace Batch { diff --git a/src/Core/Batch_MpiImpl.cxx b/src/Core/MpiImpl.cxx similarity index 99% rename from src/Core/Batch_MpiImpl.cxx rename to src/Core/MpiImpl.cxx index dcd68b0..a319861 100644 --- a/src/Core/Batch_MpiImpl.cxx +++ b/src/Core/MpiImpl.cxx @@ -23,7 +23,7 @@ #include #include #include -#include "Batch_MpiImpl.hxx" +#include "MpiImpl.hxx" using namespace std; diff --git a/src/Core/Batch_MpiImpl.hxx b/src/Core/MpiImpl.hxx similarity index 99% rename from src/Core/Batch_MpiImpl.hxx rename to src/Core/MpiImpl.hxx index 9bc323f..a1345d8 100644 --- a/src/Core/Batch_MpiImpl.hxx +++ b/src/Core/MpiImpl.hxx @@ -23,7 +23,7 @@ #ifndef _BL_MPIIMPL_H_ #define _BL_MPIIMPL_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include class BATCH_EXPORT MpiImplException diff --git a/src/Core/Batch_NotYetImplementedException.cxx b/src/Core/NotYetImplementedException.cxx similarity index 96% rename from src/Core/Batch_NotYetImplementedException.cxx rename to src/Core/NotYetImplementedException.cxx index 40df58b..a4e38c9 100644 --- a/src/Core/Batch_NotYetImplementedException.cxx +++ b/src/Core/NotYetImplementedException.cxx @@ -29,7 +29,7 @@ * */ -#include "Batch_NotYetImplementedException.hxx" +#include "NotYetImplementedException.hxx" namespace Batch { diff --git a/src/Core/Batch_NotYetImplementedException.hxx b/src/Core/NotYetImplementedException.hxx similarity index 95% rename from src/Core/Batch_NotYetImplementedException.hxx rename to src/Core/NotYetImplementedException.hxx index 8e5ee7e..42001da 100644 --- a/src/Core/Batch_NotYetImplementedException.hxx +++ b/src/Core/NotYetImplementedException.hxx @@ -32,8 +32,8 @@ #ifndef _NOTYETIMPLEMENTEDEXCEPTION_H_ #define _NOTYETIMPLEMENTEDEXCEPTION_H_ -#include "Batch_Defines.hxx" -#include "Batch_GenericException.hxx" +#include "Defines.hxx" +#include "GenericException.hxx" #include diff --git a/src/Core/Batch_ParameterTypeMap.cxx b/src/Core/ParameterTypeMap.cxx similarity index 95% rename from src/Core/Batch_ParameterTypeMap.cxx rename to src/Core/ParameterTypeMap.cxx index 266ccad..60080da 100644 --- a/src/Core/Batch_ParameterTypeMap.cxx +++ b/src/Core/ParameterTypeMap.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_ParameterTypeMap.cxx : + * ParameterTypeMap.cxx : * * Auteur : Renaud Barate - EDF R&D * Date : Mars 2011 @@ -30,9 +30,9 @@ #include #include -#include "Batch_Constants.hxx" -#include "Batch_InvalidKeyException.hxx" -#include "Batch_ParameterTypeMap.hxx" +#include "Constants.hxx" +#include "InvalidKeyException.hxx" +#include "ParameterTypeMap.hxx" using namespace std; diff --git a/src/Core/Batch_ParameterTypeMap.hxx b/src/Core/ParameterTypeMap.hxx similarity index 95% rename from src/Core/Batch_ParameterTypeMap.hxx rename to src/Core/ParameterTypeMap.hxx index b565552..5854741 100644 --- a/src/Core/Batch_ParameterTypeMap.hxx +++ b/src/Core/ParameterTypeMap.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_ParameterTypeMap.hxx : + * ParameterTypeMap.hxx : * * Auteur : Renaud Barate - EDF R&D * Date : Mars 2011 @@ -30,8 +30,8 @@ #ifndef _PARAMETERTYPEMAP_H_ #define _PARAMETERTYPEMAP_H_ -#include "Batch_Defines.hxx" -#include "Batch_Versatile.hxx" +#include "Defines.hxx" +#include "Versatile.hxx" #include #include diff --git a/src/Core/Batch_Parametre.cxx b/src/Core/Parametre.cxx similarity index 95% rename from src/Core/Batch_Parametre.cxx rename to src/Core/Parametre.cxx index 70ffadd..5336981 100644 --- a/src/Core/Batch_Parametre.cxx +++ b/src/Core/Parametre.cxx @@ -28,10 +28,10 @@ * */ -#include "Batch_Versatile.hxx" -#include "Batch_InvalidKeyException.hxx" -#include "Batch_ParameterTypeMap.hxx" -#include "Batch_Parametre.hxx" +#include "Versatile.hxx" +#include "InvalidKeyException.hxx" +#include "ParameterTypeMap.hxx" +#include "Parametre.hxx" using namespace std; diff --git a/src/Core/Batch_Parametre.hxx b/src/Core/Parametre.hxx similarity index 96% rename from src/Core/Batch_Parametre.hxx rename to src/Core/Parametre.hxx index 7312c0f..574d366 100644 --- a/src/Core/Batch_Parametre.hxx +++ b/src/Core/Parametre.hxx @@ -34,8 +34,8 @@ #include #include -#include "Batch_Defines.hxx" -#include "Batch_Versatile.hxx" +#include "Defines.hxx" +#include "Versatile.hxx" namespace Batch { diff --git a/src/Core/Batch_RunTimeException.cxx b/src/Core/RunTimeException.cxx similarity index 96% rename from src/Core/Batch_RunTimeException.cxx rename to src/Core/RunTimeException.cxx index a983e24..22100e4 100644 --- a/src/Core/Batch_RunTimeException.cxx +++ b/src/Core/RunTimeException.cxx @@ -29,7 +29,7 @@ * */ -#include "Batch_RunTimeException.hxx" +#include "RunTimeException.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_RunTimeException.hxx b/src/Core/RunTimeException.hxx similarity index 95% rename from src/Core/Batch_RunTimeException.hxx rename to src/Core/RunTimeException.hxx index 87878bf..c792517 100644 --- a/src/Core/Batch_RunTimeException.hxx +++ b/src/Core/RunTimeException.hxx @@ -32,10 +32,10 @@ #ifndef _RUNTIMEEXCEPTION_H_ #define _RUNTIMEEXCEPTION_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" -#include "Batch_GenericException.hxx" +#include "GenericException.hxx" namespace Batch { diff --git a/src/Core/Batch_StringType.cxx b/src/Core/StringType.cxx similarity index 98% rename from src/Core/Batch_StringType.cxx rename to src/Core/StringType.cxx index d7d418f..e762037 100644 --- a/src/Core/Batch_StringType.cxx +++ b/src/Core/StringType.cxx @@ -30,7 +30,7 @@ #include #include -#include "Batch_StringType.hxx" +#include "StringType.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_StringType.hxx b/src/Core/StringType.hxx similarity index 96% rename from src/Core/Batch_StringType.hxx rename to src/Core/StringType.hxx index ab7246c..4e75778 100644 --- a/src/Core/Batch_StringType.hxx +++ b/src/Core/StringType.hxx @@ -31,10 +31,10 @@ #ifndef _STRINGTYPE_H_ #define _STRINGTYPE_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include -#include "Batch_GenericType.hxx" +#include "GenericType.hxx" namespace Batch { diff --git a/src/Core/Test/Test_BatchManager.cxx b/src/Core/Test/Test_BatchManager.cxx index 2bac0b3..feb0933 100644 --- a/src/Core/Test/Test_BatchManager.cxx +++ b/src/Core/Test/Test_BatchManager.cxx @@ -31,11 +31,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "SimpleParser.hxx" diff --git a/src/Core/Batch_TypeMismatchException.cxx b/src/Core/TypeMismatchException.cxx similarity index 96% rename from src/Core/Batch_TypeMismatchException.cxx rename to src/Core/TypeMismatchException.cxx index 48884ae..904fbc5 100644 --- a/src/Core/Batch_TypeMismatchException.cxx +++ b/src/Core/TypeMismatchException.cxx @@ -28,7 +28,7 @@ * */ -#include "Batch_TypeMismatchException.hxx" +#include "TypeMismatchException.hxx" using namespace std; namespace Batch { diff --git a/src/Core/Batch_TypeMismatchException.hxx b/src/Core/TypeMismatchException.hxx similarity index 95% rename from src/Core/Batch_TypeMismatchException.hxx rename to src/Core/TypeMismatchException.hxx index cd24cc5..de84fdb 100644 --- a/src/Core/Batch_TypeMismatchException.hxx +++ b/src/Core/TypeMismatchException.hxx @@ -31,10 +31,10 @@ #ifndef _TYPEMISMATCHEXCEPTION_H_ #define _TYPEMISMATCHEXCEPTION_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" -#include "Batch_GenericException.hxx" +#include "GenericException.hxx" namespace Batch { diff --git a/src/Core/Batch_Utils.cxx b/src/Core/Utils.cxx similarity index 96% rename from src/Core/Batch_Utils.cxx rename to src/Core/Utils.cxx index 5d173bc..a75a90e 100644 --- a/src/Core/Batch_Utils.cxx +++ b/src/Core/Utils.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_Utils.cxx + * Utils.cxx * * Created on: 30 jan. 2012 * Author : Renaud BARATE - EDF R&D @@ -32,9 +32,9 @@ #include #include -#include -#include "Batch_Utils.hxx" -#include "Batch_RunTimeException.hxx" +#include +#include "Utils.hxx" +#include "RunTimeException.hxx" #ifdef MSVC #define popen _popen diff --git a/src/Core/Batch_Utils.hxx b/src/Core/Utils.hxx similarity index 99% rename from src/Core/Batch_Utils.hxx rename to src/Core/Utils.hxx index e0cdb23..0c6f515 100644 --- a/src/Core/Batch_Utils.hxx +++ b/src/Core/Utils.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_Utils.hxx + * Utils.hxx * * Created on: 30 jan. 2012 * Author : Renaud BARATE - EDF R&D diff --git a/src/Core/Batch_Versatile.cxx b/src/Core/Versatile.cxx similarity index 96% rename from src/Core/Batch_Versatile.cxx rename to src/Core/Versatile.cxx index ecdde87..06bfbad 100644 --- a/src/Core/Batch_Versatile.cxx +++ b/src/Core/Versatile.cxx @@ -32,13 +32,13 @@ #include #include -#include "Batch_GenericType.hxx" -#include "Batch_BoolType.hxx" -#include "Batch_LongType.hxx" -#include "Batch_StringType.hxx" -#include "Batch_Versatile.hxx" -#include "Batch_TypeMismatchException.hxx" -#include "Batch_ListIsFullException.hxx" +#include "GenericType.hxx" +#include "BoolType.hxx" +#include "LongType.hxx" +#include "StringType.hxx" +#include "Versatile.hxx" +#include "TypeMismatchException.hxx" +#include "ListIsFullException.hxx" using namespace std; diff --git a/src/Core/Batch_Versatile.hxx b/src/Core/Versatile.hxx similarity index 92% rename from src/Core/Batch_Versatile.hxx rename to src/Core/Versatile.hxx index 4c44b09..b1e7462 100644 --- a/src/Core/Batch_Versatile.hxx +++ b/src/Core/Versatile.hxx @@ -30,19 +30,19 @@ #ifndef _VERSATILE_H_ #define _VERSATILE_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" #include #include #include -#include "Batch_GenericType.hxx" -#include "Batch_BoolType.hxx" -#include "Batch_LongType.hxx" -#include "Batch_StringType.hxx" -#include "Batch_CoupleType.hxx" -#include "Batch_TypeMismatchException.hxx" -#include "Batch_ListIsFullException.hxx" -#include "Batch_RunTimeException.hxx" +#include "GenericType.hxx" +#include "BoolType.hxx" +#include "LongType.hxx" +#include "StringType.hxx" +#include "CoupleType.hxx" +#include "TypeMismatchException.hxx" +#include "ListIsFullException.hxx" +#include "RunTimeException.hxx" namespace Batch { diff --git a/src/LSF/Batch_BatchManager_eLSF.cxx b/src/LSF/BatchManager_LSF.cxx similarity index 85% rename from src/LSF/Batch_BatchManager_eLSF.cxx rename to src/LSF/BatchManager_LSF.cxx index 9650a92..2103ee8 100644 --- a/src/LSF/Batch_BatchManager_eLSF.cxx +++ b/src/LSF/BatchManager_LSF.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * BatchManager_eLSF.cxx : emulation of LSF client + * BatchManager_LSF.cxx : emulation of LSF client * * Auteur : Bernard SECHER - CEA DEN * Mail : mailto:bernard.secher@cea.fr @@ -33,17 +33,17 @@ #include #include -#include -#include -#include -#include "Batch_BatchManager_eLSF.hxx" -#include "Batch_JobInfo_eLSF.hxx" +#include +#include +#include +#include "BatchManager_LSF.hxx" +#include "JobInfo_LSF.hxx" using namespace std; namespace Batch { - BatchManager_eLSF::BatchManager_eLSF(const FactBatchManager * parent, const char * host, + BatchManager_LSF::BatchManager_LSF(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) : BatchManager(parent, host, username, protocolType, mpiImpl) @@ -52,13 +52,13 @@ namespace Batch { } // Destructeur - BatchManager_eLSF::~BatchManager_eLSF() + BatchManager_LSF::~BatchManager_LSF() { // Nothing to do } // Methode pour le controle des jobs : soumet un job au gestionnaire - const JobId BatchManager_eLSF::submitJob(const Job & job) + const JobId BatchManager_LSF::submitJob(const Job & job) { Parametre params = job.getParametre(); const std::string workDir = params[WORKDIR]; @@ -94,13 +94,13 @@ namespace Batch { // Ce manager permet de faire de la reprise const Batch::JobId - BatchManager_eLSF::addJob(const Batch::Job & job, const std::string reference) + BatchManager_LSF::addJob(const Batch::Job & job, const std::string reference) { return JobId(this, reference); } // Methode pour le controle des jobs : retire un job du gestionnaire - void BatchManager_eLSF::deleteJob(const JobId & jobid) + void BatchManager_LSF::deleteJob(const JobId & jobid) { int status; int ref; @@ -119,38 +119,38 @@ namespace Batch { } // Methode pour le controle des jobs : suspend un job en file d'attente - void BatchManager_eLSF::holdJob(const JobId & jobid) + void BatchManager_LSF::holdJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eLSF::holdJob"); + throw NotYetImplementedException("BatchManager_LSF::holdJob"); } // Methode pour le controle des jobs : relache un job suspendu - void BatchManager_eLSF::releaseJob(const JobId & jobid) + void BatchManager_LSF::releaseJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eLSF::releaseJob"); + throw NotYetImplementedException("BatchManager_LSF::releaseJob"); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_eLSF::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) + void BatchManager_LSF::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) { - throw NotYetImplementedException("BatchManager_eLSF::alterJob"); + throw NotYetImplementedException("BatchManager_LSF::alterJob"); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_eLSF::alterJob(const JobId & jobid, const Parametre & param) + void BatchManager_LSF::alterJob(const JobId & jobid, const Parametre & param) { alterJob(jobid, param, Environnement()); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_eLSF::alterJob(const JobId & jobid, const Environnement & env) + void BatchManager_LSF::alterJob(const JobId & jobid, const Environnement & env) { alterJob(jobid, Parametre(), env); } // Methode pour le controle des jobs : renvoie l'etat du job - JobInfo BatchManager_eLSF::queryJob(const JobId & jobid) + JobInfo BatchManager_LSF::queryJob(const JobId & jobid) { int id; istringstream iss(jobid.getReference()); @@ -165,19 +165,19 @@ namespace Batch { int status = Utils::getCommandOutput(command, output); if (status) throw RunTimeException("Error of connection on remote host"); - JobInfo_eLSF ji = JobInfo_eLSF(id, output); + JobInfo_LSF ji = JobInfo_LSF(id, output); return ji; } // Methode pour le controle des jobs : teste si un job est present en machine - bool BatchManager_eLSF::isRunning(const JobId & jobid) + bool BatchManager_LSF::isRunning(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eLSF::isRunning"); + throw NotYetImplementedException("BatchManager_LSF::isRunning"); } - std::string BatchManager_eLSF::buildSubmissionScript(const Job & job) + std::string BatchManager_LSF::buildSubmissionScript(const Job & job) { Parametre params = job.getParametre(); @@ -291,7 +291,7 @@ namespace Batch { return remoteFileName; } - std::string BatchManager_eLSF::getWallTime(const long edt) + std::string BatchManager_LSF::getWallTime(const long edt) { long h, m; h = edt / 60; @@ -304,7 +304,7 @@ namespace Batch { return oss.str(); } - std::string BatchManager_eLSF::getHomeDir(std::string tmpdir) + std::string BatchManager_LSF::getHomeDir(std::string tmpdir) { std::string home; int idx = tmpdir.find("Batch/"); diff --git a/src/LSF/Batch_BatchManager_eLSF.hxx b/src/LSF/BatchManager_LSF.hxx similarity index 89% rename from src/LSF/Batch_BatchManager_eLSF.hxx rename to src/LSF/BatchManager_LSF.hxx index cc4d48f..201e3b3 100644 --- a/src/LSF/Batch_BatchManager_eLSF.hxx +++ b/src/LSF/BatchManager_LSF.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * BatchManager_eLSF.hxx : emulation of LSF client + * BatchManager_LSF.hxx : emulation of LSF client * * Auteur : Bernard SECHER - CEA DEN * Mail : mailto:bernard.secher@cea.fr @@ -32,22 +32,22 @@ #ifndef _BATCHMANAGER_ELSF_H_ #define _BATCHMANAGER_ELSF_H_ -#include "Batch_Defines.hxx" -#include "Batch_JobId.hxx" -#include "Batch_JobInfo.hxx" -#include "Batch_FactBatchManager.hxx" -#include "Batch_BatchManager.hxx" +#include "Defines.hxx" +#include "JobId.hxx" +#include "JobInfo.hxx" +#include "FactBatchManager.hxx" +#include "BatchManager.hxx" namespace Batch { - class BATCH_EXPORT BatchManager_eLSF : public BatchManager + class BATCH_EXPORT BatchManager_LSF : public BatchManager { public: // Constructeur et destructeur - BatchManager_eLSF(const FactBatchManager * parent, const char * host="localhost", + BatchManager_LSF(const FactBatchManager * parent, const char * host="localhost", const char * username="", CommunicationProtocolType protocolType = SSH, const char * mpiImpl="nompi"); // connexion a la machine host - virtual ~BatchManager_eLSF(); + virtual ~BatchManager_LSF(); // Recupere le nom du serveur par defaut // static string BatchManager_LSF::getDefaultServer(); diff --git a/src/LSF/CMakeLists.txt b/src/LSF/CMakeLists.txt index 7a1d7f5..7268633 100644 --- a/src/LSF/CMakeLists.txt +++ b/src/LSF/CMakeLists.txt @@ -20,9 +20,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(CLASS_LIST LSF/Batch_BatchManager_eLSF - LSF/Batch_FactBatchManager_eLSF - LSF/Batch_JobInfo_eLSF +SET(CLASS_LIST LSF/BatchManager_LSF + LSF/FactBatchManager_LSF + LSF/JobInfo_LSF ) APPEND_CLASSES_TO_SRC_FILES(${CLASS_LIST}) diff --git a/src/LSF/Batch_FactBatchManager_eLSF.cxx b/src/LSF/FactBatchManager_LSF.cxx similarity index 77% rename from src/LSF/Batch_FactBatchManager_eLSF.cxx rename to src/LSF/FactBatchManager_LSF.cxx index d069be8..cb6990c 100644 --- a/src/LSF/Batch_FactBatchManager_eLSF.cxx +++ b/src/LSF/FactBatchManager_LSF.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * FactBatchManager_eLSF.cxx : + * FactBatchManager_LSF.cxx : * * Auteur : Bernard SECHER - CEA DEN * Date : Avril 2008 @@ -28,32 +28,32 @@ * */ -#include "Batch_BatchManager_eLSF.hxx" -#include "Batch_FactBatchManager_eLSF.hxx" +#include "BatchManager_LSF.hxx" +#include "FactBatchManager_LSF.hxx" namespace Batch { - static FactBatchManager_eLSF sFBM_eLSF; + static FactBatchManager_LSF sFBM_LSF; // Constructeur - FactBatchManager_eLSF::FactBatchManager_eLSF() : FactBatchManager("LSF") + FactBatchManager_LSF::FactBatchManager_LSF() : FactBatchManager("LSF") { // Nothing to do } // Destructeur - FactBatchManager_eLSF::~FactBatchManager_eLSF() + FactBatchManager_LSF::~FactBatchManager_LSF() { // Nothing to do } - BatchManager * FactBatchManager_eLSF::operator() (const char * hostname, + BatchManager * FactBatchManager_LSF::operator() (const char * hostname, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) const { // MESSAGE("Building new BatchManager_LSF on host '" << hostname << "'"); - return new BatchManager_eLSF(this, hostname, username, protocolType, mpiImpl); + return new BatchManager_LSF(this, hostname, username, protocolType, mpiImpl); } } diff --git a/src/LSF/Batch_FactBatchManager_eLSF.hxx b/src/LSF/FactBatchManager_LSF.hxx similarity index 80% rename from src/LSF/Batch_FactBatchManager_eLSF.hxx rename to src/LSF/FactBatchManager_LSF.hxx index 3068869..fc191cb 100644 --- a/src/LSF/Batch_FactBatchManager_eLSF.hxx +++ b/src/LSF/FactBatchManager_LSF.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * FactBatchManager_eLSF.hxx : + * FactBatchManager_LSF.hxx : * * Auteur : Bernard SECHER : CEA DEN * Date : Avril 2008 @@ -28,21 +28,21 @@ * */ -#ifndef _FACTBATCHMANAGER_eLSF_H_ -#define _FACTBATCHMANAGER_eLSF_H_ +#ifndef _FACTBATCHMANAGER_LSF_H_ +#define _FACTBATCHMANAGER_LSF_H_ -#include "Batch_Defines.hxx" -#include "Batch_BatchManager.hxx" -#include "Batch_FactBatchManager.hxx" +#include "Defines.hxx" +#include "BatchManager.hxx" +#include "FactBatchManager.hxx" namespace Batch { - class BATCH_EXPORT FactBatchManager_eLSF : public FactBatchManager + class BATCH_EXPORT FactBatchManager_LSF : public FactBatchManager { public: - FactBatchManager_eLSF(); - virtual ~FactBatchManager_eLSF(); + FactBatchManager_LSF(); + virtual ~FactBatchManager_LSF(); virtual BatchManager * operator() (const char * hostname, const char * username, diff --git a/src/LSF/Batch_JobInfo_eLSF.cxx b/src/LSF/JobInfo_LSF.cxx similarity index 89% rename from src/LSF/Batch_JobInfo_eLSF.cxx rename to src/LSF/JobInfo_LSF.cxx index 3f7ddec..c9e6bb1 100644 --- a/src/LSF/Batch_JobInfo_eLSF.cxx +++ b/src/LSF/JobInfo_LSF.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * JobInfo_eLSF.cxx : emulation of LSF client + * JobInfo_LSF.cxx : emulation of LSF client * * Auteur : Bernard SECHER - CEA DEN * Mail : mailto:bernard.secher@cea.fr @@ -32,15 +32,15 @@ #include #include -#include -#include "Batch_JobInfo_eLSF.hxx" +#include +#include "JobInfo_LSF.hxx" using namespace std; namespace Batch { // Constructeurs - JobInfo_eLSF::JobInfo_eLSF(int id, const std::string & queryOutput) : JobInfo() + JobInfo_LSF::JobInfo_LSF(int id, const std::string & queryOutput) : JobInfo() { // Fill ID parameter ostringstream oss; @@ -91,20 +91,20 @@ namespace Batch { } // Teste si un job est present en machine - bool JobInfo_eLSF::isRunning() const + bool JobInfo_LSF::isRunning() const { return _running; } // Destructeur - JobInfo_eLSF::~JobInfo_eLSF() + JobInfo_LSF::~JobInfo_LSF() { // Nothing to do } // Convertit une date HH:MM:SS en secondes - long JobInfo_eLSF::HMStoLong(const string & s) + long JobInfo_LSF::HMStoLong(const string & s) { long hour, min, sec; @@ -113,10 +113,10 @@ namespace Batch { } // Methode pour l'interfacage avec Python (SWIG) : affichage en Python - string JobInfo_eLSF::__str__() const + string JobInfo_LSF::__str__() const { ostringstream sst; - sst << " namespace Batch { - class JobInfo_eLSF : public JobInfo + class JobInfo_LSF : public JobInfo { public: // Constructeurs et destructeur - JobInfo_eLSF() : _running(false) {}; - JobInfo_eLSF(int id, const std::string & queryOutput); - virtual ~JobInfo_eLSF(); + JobInfo_LSF() : _running(false) {}; + JobInfo_LSF(int id, const std::string & queryOutput); + virtual ~JobInfo_LSF(); // Constructeur par recopie - JobInfo_eLSF(const JobInfo_eLSF & jinfo) : JobInfo(jinfo) {}; + JobInfo_LSF(const JobInfo_LSF & jinfo) : JobInfo(jinfo) {}; // Teste si un job est present en machine virtual bool isRunning() const; diff --git a/src/LoadLeveler/Batch_BatchManager_eLL.cxx b/src/LoadLeveler/BatchManager_LL.cxx similarity index 84% rename from src/LoadLeveler/Batch_BatchManager_eLL.cxx rename to src/LoadLeveler/BatchManager_LL.cxx index fc729bf..1de7738 100644 --- a/src/LoadLeveler/Batch_BatchManager_eLL.cxx +++ b/src/LoadLeveler/BatchManager_LL.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_BatchManager_eLL.cxx : + * BatchManager_LL.cxx : * * Created on: 25 nov. 2010 * Author : Renaud BARATE - EDF R&D @@ -31,19 +31,19 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "Batch_FactBatchManager_eLL.hxx" -#include "Batch_BatchManager_eLL.hxx" -#include "Batch_JobInfo_eLL.hxx" +#include "FactBatchManager_LL.hxx" +#include "BatchManager_LL.hxx" +#include "JobInfo_LL.hxx" using namespace std; namespace Batch { - BatchManager_eLL::BatchManager_eLL(const FactBatchManager * parent, const char * host, + BatchManager_LL::BatchManager_LL(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) : BatchManager(parent, host, username, protocolType, mpiImpl) @@ -51,13 +51,13 @@ namespace Batch { // Nothing to do } - BatchManager_eLL::~BatchManager_eLL() + BatchManager_LL::~BatchManager_LL() { // Nothing to do } // Method to submit a job to the batch manager - const JobId BatchManager_eLL::submitJob(const Job & job) + const JobId BatchManager_LL::submitJob(const Job & job) { Parametre params = job.getParametre(); const string workDir = params[WORKDIR]; @@ -103,7 +103,7 @@ namespace Batch { * Create LoadLeveler command file and copy it on the server. * Return the name of the remote file. */ - string BatchManager_eLL::buildCommandFile(const Job & job) + string BatchManager_LL::buildCommandFile(const Job & job) { Parametre params = job.getParametre(); @@ -212,7 +212,7 @@ namespace Batch { return remoteFileName; } - void BatchManager_eLL::deleteJob(const JobId & jobid) + void BatchManager_LL::deleteJob(const JobId & jobid) { // define command to delete job string subCommand = "llcancel " + jobid.getReference(); @@ -226,32 +226,32 @@ namespace Batch { cerr << "job " << jobid.getReference() << " killed" << endl; } - void BatchManager_eLL::holdJob(const JobId & jobid) + void BatchManager_LL::holdJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eLL::holdJob"); + throw NotYetImplementedException("BatchManager_LL::holdJob"); } - void BatchManager_eLL::releaseJob(const JobId & jobid) + void BatchManager_LL::releaseJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eLL::releaseJob"); + throw NotYetImplementedException("BatchManager_LL::releaseJob"); } - void BatchManager_eLL::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) + void BatchManager_LL::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) { - throw NotYetImplementedException("BatchManager_eLL::alterJob"); + throw NotYetImplementedException("BatchManager_LL::alterJob"); } - void BatchManager_eLL::alterJob(const JobId & jobid, const Parametre & param) + void BatchManager_LL::alterJob(const JobId & jobid, const Parametre & param) { - throw NotYetImplementedException("BatchManager_eLL::alterJob"); + throw NotYetImplementedException("BatchManager_LL::alterJob"); } - void BatchManager_eLL::alterJob(const JobId & jobid, const Environnement & env) + void BatchManager_LL::alterJob(const JobId & jobid, const Environnement & env) { - throw NotYetImplementedException("BatchManager_eLL::alterJob"); + throw NotYetImplementedException("BatchManager_LL::alterJob"); } - JobInfo BatchManager_eLL::queryJob(const JobId & jobid) + JobInfo BatchManager_LL::queryJob(const JobId & jobid) { // define command to query batch string subCommand = "llq -f %st " + jobid.getReference(); @@ -262,11 +262,11 @@ namespace Batch { if (status != 0) throw RunTimeException("Can't query job " + jobid.getReference()); - JobInfo_eLL jobinfo = JobInfo_eLL(jobid.getReference(), output); + JobInfo_LL jobinfo = JobInfo_LL(jobid.getReference(), output); return jobinfo; } - const JobId BatchManager_eLL::addJob(const Job & job, const string reference) + const JobId BatchManager_LL::addJob(const Job & job, const string reference) { return JobId(this, reference); } diff --git a/src/LoadLeveler/Batch_BatchManager_eLL.hxx b/src/LoadLeveler/BatchManager_LL.hxx similarity index 84% rename from src/LoadLeveler/Batch_BatchManager_eLL.hxx rename to src/LoadLeveler/BatchManager_LL.hxx index 9b6ae95..fe805de 100644 --- a/src/LoadLeveler/Batch_BatchManager_eLL.hxx +++ b/src/LoadLeveler/BatchManager_LL.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_BatchManager_eLL.hxx : + * BatchManager_LL.hxx : * * Created on: 25 nov. 2010 * Author : Renaud BARATE - EDF R&D @@ -31,21 +31,21 @@ #include -#include "Batch_Defines.hxx" -#include "Batch_JobId.hxx" -#include "Batch_JobInfo.hxx" -#include "Batch_FactBatchManager.hxx" -#include "Batch_BatchManager.hxx" +#include "Defines.hxx" +#include "JobId.hxx" +#include "JobInfo.hxx" +#include "FactBatchManager.hxx" +#include "BatchManager.hxx" namespace Batch { - class BATCH_EXPORT BatchManager_eLL : public BatchManager + class BATCH_EXPORT BatchManager_LL : public BatchManager { public: - BatchManager_eLL(const FactBatchManager * parent, const char * host = "localhost", + BatchManager_LL(const FactBatchManager * parent, const char * host = "localhost", const char * username = "", CommunicationProtocolType protocolType = SSH, const char * mpiImpl = "nompi"); - virtual ~BatchManager_eLL(); + virtual ~BatchManager_LL(); // Methods to control jobs virtual const JobId submitJob(const Job & job); diff --git a/src/LoadLeveler/CMakeLists.txt b/src/LoadLeveler/CMakeLists.txt index aa8445f..c3e336a 100644 --- a/src/LoadLeveler/CMakeLists.txt +++ b/src/LoadLeveler/CMakeLists.txt @@ -20,9 +20,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(CLASS_LIST LoadLeveler/Batch_BatchManager_eLL - LoadLeveler/Batch_FactBatchManager_eLL - LoadLeveler/Batch_JobInfo_eLL +SET(CLASS_LIST LoadLeveler/BatchManager_LL + LoadLeveler/FactBatchManager_LL + LoadLeveler/JobInfo_LL ) APPEND_CLASSES_TO_SRC_FILES(${CLASS_LIST}) diff --git a/src/LoadLeveler/Batch_FactBatchManager_eLL.cxx b/src/LoadLeveler/FactBatchManager_LL.cxx similarity index 73% rename from src/LoadLeveler/Batch_FactBatchManager_eLL.cxx rename to src/LoadLeveler/FactBatchManager_LL.cxx index 7ca8532..501118d 100644 --- a/src/LoadLeveler/Batch_FactBatchManager_eLL.cxx +++ b/src/LoadLeveler/FactBatchManager_LL.cxx @@ -20,40 +20,40 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_FactBatchManager_eLL.cxx : + * FactBatchManager_LL.cxx : * * Created on: 25 nov. 2010 * Author : Renaud BARATE - EDF R&D */ -#include "Batch_ParameterTypeMap.hxx" -#include "Batch_BatchManager_eLL.hxx" -#include "Batch_FactBatchManager_eLL.hxx" +#include "ParameterTypeMap.hxx" +#include "BatchManager_LL.hxx" +#include "FactBatchManager_LL.hxx" namespace Batch { def_Constant(LL_JOBTYPE); - static FactBatchManager_eLL sFBM_eLL; + static FactBatchManager_LL sFBM_LL; - FactBatchManager_eLL::FactBatchManager_eLL() : FactBatchManager("LL") + FactBatchManager_LL::FactBatchManager_LL() : FactBatchManager("LL") { // Add specific parameters ParameterTypeMap::getInstance().addParameter(LL_JOBTYPE, STRING, 1); } - FactBatchManager_eLL::~FactBatchManager_eLL() + FactBatchManager_LL::~FactBatchManager_LL() { // Nothing to do } - BatchManager * FactBatchManager_eLL::operator() (const char * hostname, + BatchManager * FactBatchManager_LL::operator() (const char * hostname, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) const { - // MESSAGE("Building new BatchManager_eLL on host '" << hostname << "'"); - return new BatchManager_eLL(this, hostname, username, protocolType, mpiImpl); + // MESSAGE("Building new BatchManager_LL on host '" << hostname << "'"); + return new BatchManager_LL(this, hostname, username, protocolType, mpiImpl); } } diff --git a/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx b/src/LoadLeveler/FactBatchManager_LL.hxx similarity index 82% rename from src/LoadLeveler/Batch_FactBatchManager_eLL.hxx rename to src/LoadLeveler/FactBatchManager_LL.hxx index c0448f7..de5e242 100644 --- a/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx +++ b/src/LoadLeveler/FactBatchManager_LL.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_FactBatchManager_eLL.hxx : + * FactBatchManager_LL.hxx : * * Created on: 25 nov. 2010 * Author : Renaud BARATE - EDF R&D @@ -29,24 +29,24 @@ #ifndef _FACTBATCHMANAGER_ELL_H_ #define _FACTBATCHMANAGER_ELL_H_ -#include -#include +#include +#include -#include "Batch_BatchManager.hxx" -#include "Batch_FactBatchManager.hxx" +#include "BatchManager.hxx" +#include "FactBatchManager.hxx" namespace Batch { decl_extern_Constant(LL_JOBTYPE); - class BatchManager_eLL; + class BatchManager_LL; - class BATCH_EXPORT FactBatchManager_eLL : public FactBatchManager + class BATCH_EXPORT FactBatchManager_LL : public FactBatchManager { public: // Constructeur et destructeur - FactBatchManager_eLL(); - virtual ~FactBatchManager_eLL(); + FactBatchManager_LL(); + virtual ~FactBatchManager_LL(); virtual BatchManager * operator() (const char * hostname, const char * username, diff --git a/src/LoadLeveler/Batch_JobInfo_eLL.cxx b/src/LoadLeveler/JobInfo_LL.cxx similarity index 93% rename from src/LoadLeveler/Batch_JobInfo_eLL.cxx rename to src/LoadLeveler/JobInfo_LL.cxx index 59ab7d2..188f6b8 100644 --- a/src/LoadLeveler/Batch_JobInfo_eLL.cxx +++ b/src/LoadLeveler/JobInfo_LL.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_JobInfo_eLL.cxx : + * JobInfo_LL.cxx : * * Created on: 30 nov. 2010 * Author : Renaud BARATE - EDF R&D @@ -29,16 +29,16 @@ #include #include -#include -#include +#include +#include -#include "Batch_JobInfo_eLL.hxx" +#include "JobInfo_LL.hxx" using namespace std; namespace Batch { - JobInfo_eLL::JobInfo_eLL(const std::string & id, const std::string & output) + JobInfo_LL::JobInfo_LL(const std::string & id, const std::string & output) : JobInfo() { _param[ID] = id; @@ -112,7 +112,7 @@ namespace Batch { } } - JobInfo_eLL::~JobInfo_eLL() + JobInfo_LL::~JobInfo_LL() { // Nothing to do } diff --git a/src/LoadLeveler/Batch_JobInfo_eLL.hxx b/src/LoadLeveler/JobInfo_LL.hxx similarity index 86% rename from src/LoadLeveler/Batch_JobInfo_eLL.hxx rename to src/LoadLeveler/JobInfo_LL.hxx index ab89129..770bc5c 100644 --- a/src/LoadLeveler/Batch_JobInfo_eLL.hxx +++ b/src/LoadLeveler/JobInfo_LL.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_JobInfo_eLL.hxx : + * JobInfo_LL.hxx : * * Created on: 30 nov. 2010 * Author : Renaud BARATE - EDF R&D @@ -31,15 +31,15 @@ #include -#include +#include namespace Batch { - class JobInfo_eLL : public JobInfo + class JobInfo_LL : public JobInfo { public: - JobInfo_eLL(const std::string & id, const std::string & output); - virtual ~JobInfo_eLL(); + JobInfo_LL(const std::string & id, const std::string & output); + virtual ~JobInfo_LL(); }; diff --git a/src/LoadLeveler/Test/CMakeLists.txt b/src/LoadLeveler/Test/CMakeLists.txt index f3d24a3..fc37b3e 100644 --- a/src/LoadLeveler/Test/CMakeLists.txt +++ b/src/LoadLeveler/Test/CMakeLists.txt @@ -32,13 +32,13 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) include_directories(${CMAKE_CURRENT_BINARY_DIR}) # Build the test programs and add the tests -add_executable(Test_eLL Test_eLL.cxx) -target_link_libraries(Test_eLL batch SimpleParser) +add_executable(Test_LL Test_LL.cxx) +target_link_libraries(Test_LL batch SimpleParser) IF (HAS_SSH) - ADD_TEST(eLL_SSH Test_eLL SSH) + ADD_TEST(LL_SSH Test_LL SSH) ENDIF (HAS_SSH) #IF (HAS_RSH) -# ADD_TEST(eLL_RSH Test_eLL RSH) +# ADD_TEST(LL_RSH Test_LL RSH) #ENDIF (HAS_RSH) diff --git a/src/LoadLeveler/Test/Test_eLL.cxx b/src/LoadLeveler/Test/Test_LL.cxx similarity index 93% rename from src/LoadLeveler/Test/Test_eLL.cxx rename to src/LoadLeveler/Test/Test_LL.cxx index 8f897cc..2bad912 100644 --- a/src/LoadLeveler/Test/Test_eLL.cxx +++ b/src/LoadLeveler/Test/Test_LL.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Test_ePBS.cxx : + * Test_PBS.cxx : * * Author : Renaud BARATE - EDF R&D * Date : April 2009 @@ -31,12 +31,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include @@ -45,7 +45,7 @@ using namespace Batch; void print_usage() { - cout << "usage: Test_eLL PROTOCOL" << endl; + cout << "usage: Test_LL PROTOCOL" << endl; cout << " PROTOCOL \"SSH\" or \"RSH\"" << endl; } @@ -91,7 +91,7 @@ int main(int argc, char** argv) // ... and its parameters ... Parametre p; p[EXECUTABLE] = "./test-script.sh"; - p[NAME] = string("Test_eLL_") + argv[1]; + p[NAME] = string("Test_LL_") + argv[1]; p[WORKDIR] = homedir + "/tmp/Batch"; p[INFILE] = Couple("seta.sh", "tmp/Batch/seta.sh"); p[INFILE] += Couple("setb.sh", "tmp/Batch/setb.sh"); diff --git a/src/Local/Batch_BatchManager_Local.cxx b/src/Local/BatchManager_Local.cxx similarity index 99% rename from src/Local/Batch_BatchManager_Local.cxx rename to src/Local/BatchManager_Local.cxx index 8ca72e4..6be23d5 100644 --- a/src/Local/Batch_BatchManager_Local.cxx +++ b/src/Local/BatchManager_Local.cxx @@ -51,10 +51,10 @@ #include #include -#include "Batch_Constants.hxx" -#include "Batch_IOMutex.hxx" -#include "Batch_BatchManager_Local.hxx" -#include "Batch_RunTimeException.hxx" +#include "Constants.hxx" +#include "IOMutex.hxx" +#include "BatchManager_Local.hxx" +#include "RunTimeException.hxx" using namespace std; diff --git a/src/Local/Batch_BatchManager_Local.hxx b/src/Local/BatchManager_Local.hxx similarity index 95% rename from src/Local/Batch_BatchManager_Local.hxx rename to src/Local/BatchManager_Local.hxx index 2fbd229..fc1c3eb 100644 --- a/src/Local/Batch_BatchManager_Local.hxx +++ b/src/Local/BatchManager_Local.hxx @@ -36,8 +36,8 @@ #ifndef _BATCHMANAGER_LOCAL_H_ #define _BATCHMANAGER_LOCAL_H_ -#include "Batch_Defines.hxx" -#include "Batch_CommunicationProtocol.hxx" +#include "Defines.hxx" +#include "CommunicationProtocol.hxx" #ifdef WIN32 #include @@ -47,12 +47,12 @@ #include #include #include -#include "Batch_Job.hxx" -#include "Batch_JobId.hxx" -#include "Batch_JobInfo.hxx" -#include "Batch_JobInfo_Local.hxx" -#include "Batch_Job_Local.hxx" -#include "Batch_BatchManager.hxx" +#include "Job.hxx" +#include "JobId.hxx" +#include "JobInfo.hxx" +#include "JobInfo_Local.hxx" +#include "Job_Local.hxx" +#include "BatchManager.hxx" namespace Batch { diff --git a/src/Local/CMakeLists.txt b/src/Local/CMakeLists.txt index 93f746c..c2d091a 100644 --- a/src/Local/CMakeLists.txt +++ b/src/Local/CMakeLists.txt @@ -20,11 +20,11 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(CLASS_LIST Local/Batch_BatchManager_Local - Local/Batch_FactBatchManager_Local - Local/Batch_IOMutex - Local/Batch_Job_Local - Local/Batch_JobInfo_Local +SET(CLASS_LIST Local/BatchManager_Local + Local/FactBatchManager_Local + Local/IOMutex + Local/Job_Local + Local/JobInfo_Local ) APPEND_CLASSES_TO_SRC_FILES(${CLASS_LIST}) diff --git a/src/Local/Batch_FactBatchManager_Local.cxx b/src/Local/FactBatchManager_Local.cxx similarity index 94% rename from src/Local/Batch_FactBatchManager_Local.cxx rename to src/Local/FactBatchManager_Local.cxx index 3c89fb8..935c2a9 100644 --- a/src/Local/Batch_FactBatchManager_Local.cxx +++ b/src/Local/FactBatchManager_Local.cxx @@ -32,10 +32,10 @@ * */ -#include +#include -#include "Batch_BatchManager_Local.hxx" -#include "Batch_FactBatchManager_Local.hxx" +#include "BatchManager_Local.hxx" +#include "FactBatchManager_Local.hxx" namespace Batch { diff --git a/src/Local/Batch_FactBatchManager_Local.hxx b/src/Local/FactBatchManager_Local.hxx similarity index 95% rename from src/Local/Batch_FactBatchManager_Local.hxx rename to src/Local/FactBatchManager_Local.hxx index d1da8e6..09fffff 100644 --- a/src/Local/Batch_FactBatchManager_Local.hxx +++ b/src/Local/FactBatchManager_Local.hxx @@ -35,8 +35,8 @@ #ifndef _FACTBATCHMANAGER_LOCAL_H_ #define _FACTBATCHMANAGER_LOCAL_H_ -#include "Batch_FactBatchManager.hxx" -#include "Batch_CommunicationProtocol.hxx" +#include "FactBatchManager.hxx" +#include "CommunicationProtocol.hxx" namespace Batch { diff --git a/src/Local/Batch_IOMutex.cxx b/src/Local/IOMutex.cxx similarity index 97% rename from src/Local/Batch_IOMutex.cxx rename to src/Local/IOMutex.cxx index 37d9770..7991942 100644 --- a/src/Local/Batch_IOMutex.cxx +++ b/src/Local/IOMutex.cxx @@ -29,7 +29,7 @@ * */ -#include "Batch_IOMutex.hxx" +#include "IOMutex.hxx" namespace Batch { diff --git a/src/Local/Batch_IOMutex.hxx b/src/Local/IOMutex.hxx similarity index 100% rename from src/Local/Batch_IOMutex.hxx rename to src/Local/IOMutex.hxx diff --git a/src/Local/Batch_JobInfo_Local.cxx b/src/Local/JobInfo_Local.cxx similarity index 93% rename from src/Local/Batch_JobInfo_Local.cxx rename to src/Local/JobInfo_Local.cxx index 3a742bb..988d6cd 100644 --- a/src/Local/Batch_JobInfo_Local.cxx +++ b/src/Local/JobInfo_Local.cxx @@ -30,9 +30,9 @@ */ #include -#include "Batch_Parametre.hxx" -#include "Batch_Environnement.hxx" -#include "Batch_JobInfo_Local.hxx" +#include "Parametre.hxx" +#include "Environnement.hxx" +#include "JobInfo_Local.hxx" namespace Batch { diff --git a/src/Local/Batch_JobInfo_Local.hxx b/src/Local/JobInfo_Local.hxx similarity index 98% rename from src/Local/Batch_JobInfo_Local.hxx rename to src/Local/JobInfo_Local.hxx index f5f1160..4534b8f 100644 --- a/src/Local/Batch_JobInfo_Local.hxx +++ b/src/Local/JobInfo_Local.hxx @@ -33,7 +33,7 @@ #define _JOBINFO_LOCAL_H_ #include -#include "Batch_JobInfo.hxx" +#include "JobInfo.hxx" namespace Batch { diff --git a/src/Local/Batch_Job_Local.cxx b/src/Local/Job_Local.cxx similarity index 97% rename from src/Local/Batch_Job_Local.cxx rename to src/Local/Job_Local.cxx index 28355bc..f7109a7 100644 --- a/src/Local/Batch_Job_Local.cxx +++ b/src/Local/Job_Local.cxx @@ -35,8 +35,8 @@ #include #endif -#include "Batch_Constants.hxx" -#include "Batch_Job_Local.hxx" +#include "Constants.hxx" +#include "Job_Local.hxx" using namespace std; diff --git a/src/Local/Batch_Job_Local.hxx b/src/Local/Job_Local.hxx similarity index 95% rename from src/Local/Batch_Job_Local.hxx rename to src/Local/Job_Local.hxx index a07f115..d2c2e25 100644 --- a/src/Local/Batch_Job_Local.hxx +++ b/src/Local/Job_Local.hxx @@ -32,9 +32,9 @@ #ifndef _JOB_LOCAL_H_ #define _JOB_LOCAL_H_ -#include "Batch_Parametre.hxx" -#include "Batch_Environnement.hxx" -#include "Batch_Job.hxx" +#include "Parametre.hxx" +#include "Environnement.hxx" +#include "Job.hxx" namespace Batch { diff --git a/src/Local/Test/Test_Local_RSH.cxx b/src/Local/Test/Test_Local_RSH.cxx index 2bf22bd..246638e 100644 --- a/src/Local/Test/Test_Local_RSH.cxx +++ b/src/Local/Test/Test_Local_RSH.cxx @@ -30,11 +30,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/Local/Test/Test_Local_SH.cxx b/src/Local/Test/Test_Local_SH.cxx index 3734249..943b34d 100644 --- a/src/Local/Test/Test_Local_SH.cxx +++ b/src/Local/Test/Test_Local_SH.cxx @@ -30,11 +30,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/src/Local/Test/Test_Local_SSH.cxx b/src/Local/Test/Test_Local_SSH.cxx index 673a894..c99b3f9 100644 --- a/src/Local/Test/Test_Local_SSH.cxx +++ b/src/Local/Test/Test_Local_SSH.cxx @@ -31,11 +31,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/PBS/Batch_BatchManager_ePBS.cxx b/src/PBS/BatchManager_PBS.cxx similarity index 85% rename from src/PBS/Batch_BatchManager_ePBS.cxx rename to src/PBS/BatchManager_PBS.cxx index 1d3e063..024ebc1 100644 --- a/src/PBS/Batch_BatchManager_ePBS.cxx +++ b/src/PBS/BatchManager_PBS.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * BatchManager_ePBS.cxx : emulation of PBS client + * BatchManager_PBS.cxx : emulation of PBS client * * Auteur : Bernard SECHER - CEA DEN, André RIBES - EDF R&D * Mail : mailto:bernard.secher@cea.fr @@ -33,18 +33,18 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "Batch_BatchManager_ePBS.hxx" -#include "Batch_JobInfo_ePBS.hxx" +#include "BatchManager_PBS.hxx" +#include "JobInfo_PBS.hxx" using namespace std; namespace Batch { - BatchManager_ePBS::BatchManager_ePBS(const FactBatchManager * parent, const char * host, + BatchManager_PBS::BatchManager_PBS(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) : BatchManager(parent, host, username, protocolType, mpiImpl) @@ -53,13 +53,13 @@ namespace Batch { } // Destructeur - BatchManager_ePBS::~BatchManager_ePBS() + BatchManager_PBS::~BatchManager_PBS() { // Nothing to do } // Methode pour le controle des jobs : soumet un job au gestionnaire - const JobId BatchManager_ePBS::submitJob(const Job & job) + const JobId BatchManager_PBS::submitJob(const Job & job) { Parametre params = job.getParametre(); const std::string workDir = params[WORKDIR]; @@ -91,13 +91,13 @@ namespace Batch { // Ce manager permet de faire de la reprise const Batch::JobId - BatchManager_ePBS::addJob(const Batch::Job & job, const std::string reference) + BatchManager_PBS::addJob(const Batch::Job & job, const std::string reference) { return JobId(this, reference); } // Methode pour le controle des jobs : retire un job du gestionnaire - void BatchManager_ePBS::deleteJob(const JobId & jobid) + void BatchManager_PBS::deleteJob(const JobId & jobid) { int status; int ref; @@ -116,38 +116,38 @@ namespace Batch { } // Methode pour le controle des jobs : suspend un job en file d'attente - void BatchManager_ePBS::holdJob(const JobId & jobid) + void BatchManager_PBS::holdJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_ePBS::holdJob"); + throw NotYetImplementedException("BatchManager_PBS::holdJob"); } // Methode pour le controle des jobs : relache un job suspendu - void BatchManager_ePBS::releaseJob(const JobId & jobid) + void BatchManager_PBS::releaseJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_ePBS::releaseJob"); + throw NotYetImplementedException("BatchManager_PBS::releaseJob"); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_ePBS::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) + void BatchManager_PBS::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) { - throw NotYetImplementedException("BatchManager_ePBS::alterJob"); + throw NotYetImplementedException("BatchManager_PBS::alterJob"); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_ePBS::alterJob(const JobId & jobid, const Parametre & param) + void BatchManager_PBS::alterJob(const JobId & jobid, const Parametre & param) { alterJob(jobid, param, Environnement()); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_ePBS::alterJob(const JobId & jobid, const Environnement & env) + void BatchManager_PBS::alterJob(const JobId & jobid, const Environnement & env) { alterJob(jobid, Parametre(), env); } // Methode pour le controle des jobs : renvoie l'etat du job - JobInfo BatchManager_ePBS::queryJob(const JobId & jobid) + JobInfo BatchManager_PBS::queryJob(const JobId & jobid) { int id; istringstream iss(jobid.getReference()); @@ -163,17 +163,17 @@ namespace Batch { if(status && status != 153 && status != 256*153) throw RunTimeException("Error of connection on remote host"); - JobInfo_ePBS ji = JobInfo_ePBS(id, output); + JobInfo_PBS ji = JobInfo_PBS(id, output); return ji; } // Methode pour le controle des jobs : teste si un job est present en machine - bool BatchManager_ePBS::isRunning(const JobId & jobid) + bool BatchManager_PBS::isRunning(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_ePBS::isRunning"); + throw NotYetImplementedException("BatchManager_PBS::isRunning"); } - std::string BatchManager_ePBS::buildSubmissionScript(const Job & job) + std::string BatchManager_PBS::buildSubmissionScript(const Job & job) { Parametre params = job.getParametre(); Environnement env = job.getEnvironnement(); diff --git a/src/PBS/Batch_BatchManager_ePBS.hxx b/src/PBS/BatchManager_PBS.hxx similarity index 89% rename from src/PBS/Batch_BatchManager_ePBS.hxx rename to src/PBS/BatchManager_PBS.hxx index aba5df0..ebd5105 100644 --- a/src/PBS/Batch_BatchManager_ePBS.hxx +++ b/src/PBS/BatchManager_PBS.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * BatchManager_ePBS.hxx : emulation of PBS client + * BatchManager_PBS.hxx : emulation of PBS client * * Auteur : Bernard SECHER - CEA DEN * Mail : mailto:bernard.secher@cea.fr @@ -32,22 +32,22 @@ #ifndef _BATCHMANAGER_EPBS_H_ #define _BATCHMANAGER_EPBS_H_ -#include "Batch_Defines.hxx" -#include "Batch_JobId.hxx" -#include "Batch_JobInfo.hxx" -#include "Batch_FactBatchManager.hxx" -#include "Batch_BatchManager.hxx" +#include "Defines.hxx" +#include "JobId.hxx" +#include "JobInfo.hxx" +#include "FactBatchManager.hxx" +#include "BatchManager.hxx" namespace Batch { - class BATCH_EXPORT BatchManager_ePBS : public BatchManager + class BATCH_EXPORT BatchManager_PBS : public BatchManager { public: // Constructeur et destructeur - BatchManager_ePBS(const FactBatchManager * parent, const char * host="localhost", + BatchManager_PBS(const FactBatchManager * parent, const char * host="localhost", const char * username="", CommunicationProtocolType protocolType = SSH, const char * mpiImpl="nompi"); - virtual ~BatchManager_ePBS(); + virtual ~BatchManager_PBS(); // Recupere le nom du serveur par defaut // static string BatchManager_LSF::getDefaultServer(); diff --git a/src/PBS/CMakeLists.txt b/src/PBS/CMakeLists.txt index 745cc56..e8d991a 100644 --- a/src/PBS/CMakeLists.txt +++ b/src/PBS/CMakeLists.txt @@ -20,9 +20,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(CLASS_LIST PBS/Batch_BatchManager_ePBS - PBS/Batch_FactBatchManager_ePBS - PBS/Batch_JobInfo_ePBS +SET(CLASS_LIST PBS/BatchManager_PBS + PBS/FactBatchManager_PBS + PBS/JobInfo_PBS ) APPEND_CLASSES_TO_SRC_FILES(${CLASS_LIST}) diff --git a/src/PBS/Batch_FactBatchManager_ePBS.cxx b/src/PBS/FactBatchManager_PBS.cxx similarity index 76% rename from src/PBS/Batch_FactBatchManager_ePBS.cxx rename to src/PBS/FactBatchManager_PBS.cxx index df41a54..73eb776 100644 --- a/src/PBS/Batch_FactBatchManager_ePBS.cxx +++ b/src/PBS/FactBatchManager_PBS.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * FactBatchManager_ePBS.cxx : + * FactBatchManager_PBS.cxx : * * Auteur : Bernard SECHER - CEA DEN * Date : Avril 2008 @@ -28,31 +28,31 @@ * */ -#include "Batch_BatchManager_ePBS.hxx" -#include "Batch_FactBatchManager_ePBS.hxx" +#include "BatchManager_PBS.hxx" +#include "FactBatchManager_PBS.hxx" namespace Batch { - static FactBatchManager_ePBS sFBM_ePBS; + static FactBatchManager_PBS sFBM_PBS; // Constructeur - FactBatchManager_ePBS::FactBatchManager_ePBS() : FactBatchManager("PBS") + FactBatchManager_PBS::FactBatchManager_PBS() : FactBatchManager("PBS") { // Nothing to do } // Destructeur - FactBatchManager_ePBS::~FactBatchManager_ePBS() + FactBatchManager_PBS::~FactBatchManager_PBS() { // Nothing to do } - BatchManager * FactBatchManager_ePBS::operator() (const char * hostname, + BatchManager * FactBatchManager_PBS::operator() (const char * hostname, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) const { - return new BatchManager_ePBS(this, hostname, username, protocolType, mpiImpl); + return new BatchManager_PBS(this, hostname, username, protocolType, mpiImpl); } } diff --git a/src/PBS/Batch_FactBatchManager_ePBS.hxx b/src/PBS/FactBatchManager_PBS.hxx similarity index 79% rename from src/PBS/Batch_FactBatchManager_ePBS.hxx rename to src/PBS/FactBatchManager_PBS.hxx index 410f0d9..c26a8ad 100644 --- a/src/PBS/Batch_FactBatchManager_ePBS.hxx +++ b/src/PBS/FactBatchManager_PBS.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * FactBatchManager_ePBS.hxx : + * FactBatchManager_PBS.hxx : * * Auteur : Bernard SECHER : CEA DEN * Date : Avril 2008 @@ -28,24 +28,24 @@ * */ -#ifndef _FACTBATCHMANAGER_ePBS_H_ -#define _FACTBATCHMANAGER_ePBS_H_ +#ifndef _FACTBATCHMANAGER_PBS_H_ +#define _FACTBATCHMANAGER_PBS_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" -#include "Batch_BatchManager.hxx" -#include "Batch_FactBatchManager.hxx" +#include "BatchManager.hxx" +#include "FactBatchManager.hxx" namespace Batch { - class BatchManager_ePBS; + class BatchManager_PBS; - class BATCH_EXPORT FactBatchManager_ePBS : public FactBatchManager + class BATCH_EXPORT FactBatchManager_PBS : public FactBatchManager { public: // Constructeur et destructeur - FactBatchManager_ePBS(); - virtual ~FactBatchManager_ePBS(); + FactBatchManager_PBS(); + virtual ~FactBatchManager_PBS(); virtual BatchManager * operator() (const char * hostname, const char * username, diff --git a/src/PBS/Batch_JobInfo_ePBS.cxx b/src/PBS/JobInfo_PBS.cxx similarity index 89% rename from src/PBS/Batch_JobInfo_ePBS.cxx rename to src/PBS/JobInfo_PBS.cxx index 6211073..514e258 100644 --- a/src/PBS/Batch_JobInfo_ePBS.cxx +++ b/src/PBS/JobInfo_PBS.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * JobInfo_ePBS.cxx : emulation of PBS client + * JobInfo_PBS.cxx : emulation of PBS client * * Auteur : Bernard SECHER - CEA DEN * Mail : mailto:bernard.secher@cea.fr @@ -33,15 +33,15 @@ #include #include -#include -#include "Batch_JobInfo_ePBS.hxx" +#include +#include "JobInfo_PBS.hxx" using namespace std; namespace Batch { // Constructeurs - JobInfo_ePBS::JobInfo_ePBS(int id, string queryOutput) : JobInfo() + JobInfo_PBS::JobInfo_PBS(int id, string queryOutput) : JobInfo() { // Fill ID parameter ostringstream oss; @@ -91,13 +91,13 @@ namespace Batch { } // Destructeur - JobInfo_ePBS::~JobInfo_ePBS() + JobInfo_PBS::~JobInfo_PBS() { // Nothing to do } // Convertit une date HH:MM:SS en secondes - long JobInfo_ePBS::HMStoLong(const string & s) + long JobInfo_PBS::HMStoLong(const string & s) { long hour, min, sec; @@ -106,10 +106,10 @@ namespace Batch { } // Methode pour l'interfacage avec Python (SWIG) : affichage en Python - string JobInfo_ePBS::__str__() const + string JobInfo_PBS::__str__() const { ostringstream sst; - sst << " #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -44,7 +44,7 @@ using namespace Batch; void print_usage() { - cout << "usage: Test_ePBS PROTOCOL" << endl; + cout << "usage: Test_PBS PROTOCOL" << endl; cout << " PROTOCOL \"SSH\" or \"RSH\"" << endl; } @@ -89,7 +89,7 @@ int main(int argc, char** argv) // ... and its parameters ... Parametre p; p[EXECUTABLE] = "./test-script.sh"; - p[NAME] = string("Test_ePBS_") + argv[1]; + p[NAME] = string("Test_PBS_") + argv[1]; p[WORKDIR] = homedir + "/tmp/Batch"; p[INFILE] = Couple("seta.sh", "tmp/Batch/seta.sh"); p[INFILE] += Couple("setb.sh", "tmp/Batch/setb.sh"); diff --git a/src/Python/libBatch_Swig.i b/src/Python/libBatch_Swig.i index dea1d94..37445c1 100644 --- a/src/Python/libBatch_Swig.i +++ b/src/Python/libBatch_Swig.i @@ -56,17 +56,17 @@ %include libBatch_Swig_exception.i %{ -#include "Batch_Defines.hxx" -#include "Batch_Constants.hxx" -#include "Batch_Job.hxx" -#include "Batch_JobId.hxx" -#include "Batch_JobInfo.hxx" +#include "Defines.hxx" +#include "Constants.hxx" +#include "Job.hxx" +#include "JobId.hxx" +#include "JobInfo.hxx" -#include "Batch_CommunicationProtocol.hxx" +#include "CommunicationProtocol.hxx" -#include "Batch_BatchManager.hxx" -#include "Batch_BatchManagerCatalog.hxx" -#include "Batch_FactBatchManager.hxx" +#include "BatchManager.hxx" +#include "BatchManagerCatalog.hxx" +#include "FactBatchManager.hxx" %} /* Les classes exportees en Python */ @@ -74,18 +74,18 @@ %ignore operator<<(std::ostream & os, const Job & job); %ignore operator<<(std::ostream & os, const JobInfo & ji); -%include Batch_Defines.hxx -%include Batch_Job.hxx -%include Batch_JobId.hxx -%include Batch_JobInfo.hxx +%include Defines.hxx +%include Job.hxx +%include JobId.hxx +%include JobInfo.hxx -%include Batch_CommunicationProtocol.hxx +%include CommunicationProtocol.hxx -%include Batch_BatchManager.hxx -%include Batch_BatchManagerCatalog.hxx -%include Batch_FactBatchManager.hxx +%include BatchManager.hxx +%include BatchManagerCatalog.hxx +%include FactBatchManager.hxx -%include Batch_Constants.hxx +%include Constants.hxx /* Les methodes alterJob (surchargees et mal gerees en Python) sont diff --git a/src/Python/libBatch_Swig_typemap.i b/src/Python/libBatch_Swig_typemap.i index 355a36d..5c9e513 100644 --- a/src/Python/libBatch_Swig_typemap.i +++ b/src/Python/libBatch_Swig_typemap.i @@ -32,11 +32,11 @@ #include #include #include -#include "Batch_ParameterTypeMap.hxx" -#include "Batch_Parametre.hxx" -#include "Batch_JobId.hxx" -#include "Batch_FactBatchManager.hxx" -#include "Batch_RunTimeException.hxx" +#include "ParameterTypeMap.hxx" +#include "Parametre.hxx" +#include "JobId.hxx" +#include "FactBatchManager.hxx" +#include "RunTimeException.hxx" %} # // supprime toutes les definitions par defaut => sert au debug diff --git a/src/SGE/Batch_BatchManager_eSGE.cxx b/src/SGE/BatchManager_SGE.cxx similarity index 83% rename from src/SGE/Batch_BatchManager_eSGE.cxx rename to src/SGE/BatchManager_SGE.cxx index 0bb4fbb..cb71a06 100644 --- a/src/SGE/Batch_BatchManager_eSGE.cxx +++ b/src/SGE/BatchManager_SGE.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * BatchManager_eSGE.cxx : emulation of SGE client + * BatchManager_SGE.cxx : emulation of SGE client * * Auteur : Bernard SECHER - CEA DEN * Mail : mailto:bernard.secher@cea.fr @@ -46,18 +46,18 @@ #include #endif -#include -#include -#include +#include +#include +#include -#include "Batch_BatchManager_eSGE.hxx" -#include "Batch_JobInfo_eSGE.hxx" +#include "BatchManager_SGE.hxx" +#include "JobInfo_SGE.hxx" using namespace std; namespace Batch { - BatchManager_eSGE::BatchManager_eSGE(const FactBatchManager * parent, const char * host, + BatchManager_SGE::BatchManager_SGE(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) : BatchManager(parent, host, username, protocolType, mpiImpl) @@ -66,13 +66,13 @@ namespace Batch { } // Destructeur - BatchManager_eSGE::~BatchManager_eSGE() + BatchManager_SGE::~BatchManager_SGE() { // Nothing to do } // Methode pour le controle des jobs : soumet un job au gestionnaire - const JobId BatchManager_eSGE::submitJob(const Job & job) + const JobId BatchManager_SGE::submitJob(const Job & job) { Parametre params = job.getParametre(); const std::string workDir = params[WORKDIR]; @@ -110,13 +110,13 @@ namespace Batch { // Ce manager permet de faire de la reprise const Batch::JobId - BatchManager_eSGE::addJob(const Batch::Job & job, const std::string reference) + BatchManager_SGE::addJob(const Batch::Job & job, const std::string reference) { return JobId(this, reference); } // Methode pour le controle des jobs : retire un job du gestionnaire - void BatchManager_eSGE::deleteJob(const JobId & jobid) + void BatchManager_SGE::deleteJob(const JobId & jobid) { int status; int ref; @@ -135,38 +135,38 @@ namespace Batch { } // Methode pour le controle des jobs : suspend un job en file d'attente - void BatchManager_eSGE::holdJob(const JobId & jobid) + void BatchManager_SGE::holdJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eSGE::holdJob"); + throw NotYetImplementedException("BatchManager_SGE::holdJob"); } // Methode pour le controle des jobs : relache un job suspendu - void BatchManager_eSGE::releaseJob(const JobId & jobid) + void BatchManager_SGE::releaseJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eSGE::releaseJob"); + throw NotYetImplementedException("BatchManager_SGE::releaseJob"); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_eSGE::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) + void BatchManager_SGE::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) { - throw NotYetImplementedException("BatchManager_eSGE::alterJob"); + throw NotYetImplementedException("BatchManager_SGE::alterJob"); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_eSGE::alterJob(const JobId & jobid, const Parametre & param) + void BatchManager_SGE::alterJob(const JobId & jobid, const Parametre & param) { alterJob(jobid, param, Environnement()); } // Methode pour le controle des jobs : modifie un job en file d'attente - void BatchManager_eSGE::alterJob(const JobId & jobid, const Environnement & env) + void BatchManager_SGE::alterJob(const JobId & jobid, const Environnement & env) { alterJob(jobid, Parametre(), env); } // Methode pour le controle des jobs : renvoie l'etat du job - JobInfo BatchManager_eSGE::queryJob(const JobId & jobid) + JobInfo BatchManager_SGE::queryJob(const JobId & jobid) { int id; istringstream iss(jobid.getReference()); @@ -182,17 +182,17 @@ namespace Batch { if (status && status != 256) throw RunTimeException("Error of connection on remote host"); - JobInfo_eSGE ji = JobInfo_eSGE(id, output); + JobInfo_SGE ji = JobInfo_SGE(id, output); return ji; } // Methode pour le controle des jobs : teste si un job est present en machine - bool BatchManager_eSGE::isRunning(const JobId & jobid) + bool BatchManager_SGE::isRunning(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eSGE::isRunning"); + throw NotYetImplementedException("BatchManager_SGE::isRunning"); } - void BatchManager_eSGE::buildBatchScript(const Job & job) + void BatchManager_SGE::buildBatchScript(const Job & job) { #ifndef WIN32 //TODO porting on Win32 platform @@ -268,7 +268,7 @@ namespace Batch { #endif //WIN32 } - std::string BatchManager_eSGE::getWallTime(const long edt) + std::string BatchManager_SGE::getWallTime(const long edt) { long h, m; h = edt / 60; diff --git a/src/SGE/Batch_BatchManager_eSGE.hxx b/src/SGE/BatchManager_SGE.hxx similarity index 89% rename from src/SGE/Batch_BatchManager_eSGE.hxx rename to src/SGE/BatchManager_SGE.hxx index d432f40..ec12da2 100644 --- a/src/SGE/Batch_BatchManager_eSGE.hxx +++ b/src/SGE/BatchManager_SGE.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * BatchManager_eSGE.hxx : emulation of SGE client + * BatchManager_SGE.hxx : emulation of SGE client * * Auteur : Bernard SECHER - CEA DEN * Mail : mailto:bernard.secher@cea.fr @@ -32,22 +32,22 @@ #ifndef _BATCHMANAGER_ESGE_H_ #define _BATCHMANAGER_ESGE_H_ -#include "Batch_Defines.hxx" -#include "Batch_JobId.hxx" -#include "Batch_JobInfo.hxx" -#include "Batch_FactBatchManager.hxx" -#include "Batch_BatchManager.hxx" +#include "Defines.hxx" +#include "JobId.hxx" +#include "JobInfo.hxx" +#include "FactBatchManager.hxx" +#include "BatchManager.hxx" namespace Batch { - class BATCH_EXPORT BatchManager_eSGE : public BatchManager + class BATCH_EXPORT BatchManager_SGE : public BatchManager { public: // Constructeur et destructeur - BatchManager_eSGE(const FactBatchManager * parent, const char * host="localhost", + BatchManager_SGE(const FactBatchManager * parent, const char * host="localhost", const char * username="", CommunicationProtocolType protocolType = SSH, const char * mpiImpl="nompi"); // connexion a la machine host - virtual ~BatchManager_eSGE(); + virtual ~BatchManager_SGE(); // Recupere le nom du serveur par defaut // static string BatchManager_LSF::getDefaultServer(); diff --git a/src/SGE/CMakeLists.txt b/src/SGE/CMakeLists.txt index af32b39..68b706c 100644 --- a/src/SGE/CMakeLists.txt +++ b/src/SGE/CMakeLists.txt @@ -20,9 +20,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(CLASS_LIST SGE/Batch_BatchManager_eSGE - SGE/Batch_FactBatchManager_eSGE - SGE/Batch_JobInfo_eSGE +SET(CLASS_LIST SGE/BatchManager_SGE + SGE/FactBatchManager_SGE + SGE/JobInfo_SGE ) APPEND_CLASSES_TO_SRC_FILES(${CLASS_LIST}) diff --git a/src/SGE/Batch_FactBatchManager_eSGE.cxx b/src/SGE/FactBatchManager_SGE.cxx similarity index 77% rename from src/SGE/Batch_FactBatchManager_eSGE.cxx rename to src/SGE/FactBatchManager_SGE.cxx index 79cfc9d..00e4ea8 100644 --- a/src/SGE/Batch_FactBatchManager_eSGE.cxx +++ b/src/SGE/FactBatchManager_SGE.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * FactBatchManager_eSGE.cxx : + * FactBatchManager_SGE.cxx : * * Auteur : Bernard SECHER - CEA DEN * Date : Avril 2008 @@ -28,32 +28,32 @@ * */ -#include "Batch_BatchManager_eSGE.hxx" -#include "Batch_FactBatchManager_eSGE.hxx" +#include "BatchManager_SGE.hxx" +#include "FactBatchManager_SGE.hxx" namespace Batch { - static FactBatchManager_eSGE sFBM_eSGE; + static FactBatchManager_SGE sFBM_SGE; // Constructeur - FactBatchManager_eSGE::FactBatchManager_eSGE() : FactBatchManager("SGE") + FactBatchManager_SGE::FactBatchManager_SGE() : FactBatchManager("SGE") { // Nothing to do } // Destructeur - FactBatchManager_eSGE::~FactBatchManager_eSGE() + FactBatchManager_SGE::~FactBatchManager_SGE() { // Nothing to do } - BatchManager * FactBatchManager_eSGE::operator() (const char * hostname, + BatchManager * FactBatchManager_SGE::operator() (const char * hostname, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) const { // MESSAGE("Building new BatchManager_SGE on host '" << hostname << "'"); - return new BatchManager_eSGE(this, hostname, username, protocolType, mpiImpl); + return new BatchManager_SGE(this, hostname, username, protocolType, mpiImpl); } } diff --git a/src/SGE/Batch_FactBatchManager_eSGE.hxx b/src/SGE/FactBatchManager_SGE.hxx similarity index 81% rename from src/SGE/Batch_FactBatchManager_eSGE.hxx rename to src/SGE/FactBatchManager_SGE.hxx index 6eda148..1500e4f 100644 --- a/src/SGE/Batch_FactBatchManager_eSGE.hxx +++ b/src/SGE/FactBatchManager_SGE.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * FactBatchManager_eSGE.hxx : + * FactBatchManager_SGE.hxx : * * Auteur : Bernard SECHER : CEA DEN * Date : Avril 2008 @@ -28,22 +28,22 @@ * */ -#ifndef _FACTBATCHMANAGER_eSGE_H_ -#define _FACTBATCHMANAGER_eSGE_H_ +#ifndef _FACTBATCHMANAGER_SGE_H_ +#define _FACTBATCHMANAGER_SGE_H_ -#include "Batch_Defines.hxx" +#include "Defines.hxx" -#include "Batch_BatchManager.hxx" -#include "Batch_FactBatchManager.hxx" +#include "BatchManager.hxx" +#include "FactBatchManager.hxx" namespace Batch { - class BATCH_EXPORT FactBatchManager_eSGE : public FactBatchManager + class BATCH_EXPORT FactBatchManager_SGE : public FactBatchManager { public: // Constructeur et destructeur - FactBatchManager_eSGE(); - virtual ~FactBatchManager_eSGE(); + FactBatchManager_SGE(); + virtual ~FactBatchManager_SGE(); virtual BatchManager * operator() (const char * hostname, const char * username, diff --git a/src/SGE/Batch_JobInfo_eSGE.cxx b/src/SGE/JobInfo_SGE.cxx similarity index 84% rename from src/SGE/Batch_JobInfo_eSGE.cxx rename to src/SGE/JobInfo_SGE.cxx index a15475e..2f14ac4 100644 --- a/src/SGE/Batch_JobInfo_eSGE.cxx +++ b/src/SGE/JobInfo_SGE.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * JobInfo_eSGE.cxx : emulation of SGE client + * JobInfo_SGE.cxx : emulation of SGE client * * Auteur : Bernard SECHER - CEA DEN * Mail : mailto:bernard.secher@cea.fr @@ -33,12 +33,12 @@ #include #include -#include "Batch_Constants.hxx" -#include "Batch_Parametre.hxx" -#include "Batch_Environnement.hxx" -#include "Batch_RunTimeException.hxx" -#include "Batch_APIInternalFailureException.hxx" -#include "Batch_JobInfo_eSGE.hxx" +#include "Constants.hxx" +#include "Parametre.hxx" +#include "Environnement.hxx" +#include "RunTimeException.hxx" +#include "APIInternalFailureException.hxx" +#include "JobInfo_SGE.hxx" using namespace std; @@ -47,9 +47,9 @@ namespace Batch { // Constructeurs - JobInfo_eSGE::JobInfo_eSGE(int id, const std::string & output) : JobInfo() + JobInfo_SGE::JobInfo_SGE(int id, const std::string & output) : JobInfo() { - // On remplit les membres _param et _env + // On remplit les membres _param et _nv ostringstream oss; oss << id; _param[ID] = oss.str(); @@ -97,20 +97,20 @@ namespace Batch { } // Teste si un job est present en machine - bool JobInfo_eSGE::isRunning() const + bool JobInfo_SGE::isRunning() const { return _running; } // Destructeur - JobInfo_eSGE::~JobInfo_eSGE() + JobInfo_SGE::~JobInfo_SGE() { // Nothing to do } // Convertit une date HH:MM:SS en secondes - long JobInfo_eSGE::HMStoLong(const string & s) + long JobInfo_SGE::HMStoLong(const string & s) { long hour, min, sec; @@ -119,10 +119,10 @@ namespace Batch { } // Methode pour l'interfacage avec Python (SWIG) : affichage en Python - string JobInfo_eSGE::__str__() const + string JobInfo_SGE::__str__() const { ostringstream sst; - sst << " #include -#include -#include -#include +#include +#include +#include -#include "Batch_BatchManager_eSlurm.hxx" -#include "Batch_JobInfo_eSlurm.hxx" +#include "BatchManager_Slurm.hxx" +#include "JobInfo_Slurm.hxx" using namespace std; namespace Batch { - BatchManager_eSlurm::BatchManager_eSlurm(const FactBatchManager * parent, + BatchManager_Slurm::BatchManager_Slurm(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, @@ -49,12 +49,12 @@ namespace Batch { { } - BatchManager_eSlurm::~BatchManager_eSlurm() + BatchManager_Slurm::~BatchManager_Slurm() { } // Method to submit a job to the batch manager - const JobId BatchManager_eSlurm::submitJob(const Job & job) + const JobId BatchManager_Slurm::submitJob(const Job & job) { Parametre params = job.getParametre(); const string workDir = params[WORKDIR]; @@ -95,7 +95,7 @@ namespace Batch { * Create Slurm command file and copy it on the server. * Return the name of the remote file. */ - string BatchManager_eSlurm::buildCommandFile(const Job & job) + string BatchManager_Slurm::buildCommandFile(const Job & job) { Parametre params = job.getParametre(); @@ -183,7 +183,7 @@ namespace Batch { return remoteFileName; } - void BatchManager_eSlurm::deleteJob(const JobId & jobid) + void BatchManager_Slurm::deleteJob(const JobId & jobid) { // define command to delete job string subCommand = "scancel " + jobid.getReference(); @@ -197,32 +197,32 @@ namespace Batch { cerr << "job " << jobid.getReference() << " killed" << endl; } - void BatchManager_eSlurm::holdJob(const JobId & jobid) + void BatchManager_Slurm::holdJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eSlurm::holdJob"); + throw NotYetImplementedException("BatchManager_Slurm::holdJob"); } - void BatchManager_eSlurm::releaseJob(const JobId & jobid) + void BatchManager_Slurm::releaseJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eSlurm::releaseJob"); + throw NotYetImplementedException("BatchManager_Slurm::releaseJob"); } - void BatchManager_eSlurm::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) + void BatchManager_Slurm::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) { - throw NotYetImplementedException("BatchManager_eSlurm::alterJob"); + throw NotYetImplementedException("BatchManager_Slurm::alterJob"); } - void BatchManager_eSlurm::alterJob(const JobId & jobid, const Parametre & param) + void BatchManager_Slurm::alterJob(const JobId & jobid, const Parametre & param) { - throw NotYetImplementedException("BatchManager_eSlurm::alterJob"); + throw NotYetImplementedException("BatchManager_Slurm::alterJob"); } - void BatchManager_eSlurm::alterJob(const JobId & jobid, const Environnement & env) + void BatchManager_Slurm::alterJob(const JobId & jobid, const Environnement & env) { - throw NotYetImplementedException("BatchManager_eSlurm::alterJob"); + throw NotYetImplementedException("BatchManager_Slurm::alterJob"); } - JobInfo BatchManager_eSlurm::queryJob(const JobId & jobid) + JobInfo BatchManager_Slurm::queryJob(const JobId & jobid) { // define command to query batch string subCommand = "squeue -o %t -j " + jobid.getReference(); @@ -234,11 +234,11 @@ namespace Batch { // returns an error and a message like "slurm_load_jobs error: Invalid job id specified". // So we consider that the job is finished when we get an error. - JobInfo_eSlurm jobinfo = JobInfo_eSlurm(jobid.getReference(), output); + JobInfo_Slurm jobinfo = JobInfo_Slurm(jobid.getReference(), output); return jobinfo; } - const JobId BatchManager_eSlurm::addJob(const Job & job, const string reference) + const JobId BatchManager_Slurm::addJob(const Job & job, const string reference) { return JobId(this, reference); } diff --git a/src/Slurm/Batch_BatchManager_eSlurm.hxx b/src/Slurm/BatchManager_Slurm.hxx similarity index 85% rename from src/Slurm/Batch_BatchManager_eSlurm.hxx rename to src/Slurm/BatchManager_Slurm.hxx index 83a624c..14f9dbf 100644 --- a/src/Slurm/Batch_BatchManager_eSlurm.hxx +++ b/src/Slurm/BatchManager_Slurm.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_BatchManager_eSlurm.hxx : + * BatchManager_Slurm.hxx : * * Created on: 12 may 2011 * Author : Renaud BARATE - EDF R&D @@ -31,24 +31,24 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Batch { - class BATCH_EXPORT BatchManager_eSlurm : public BatchManager + class BATCH_EXPORT BatchManager_Slurm : public BatchManager { public: - BatchManager_eSlurm(const FactBatchManager * parent, + BatchManager_Slurm(const FactBatchManager * parent, const char * host = "localhost", const char * username = "", CommunicationProtocolType protocolType = SSH, const char * mpiImpl = "nompi"); - virtual ~BatchManager_eSlurm(); + virtual ~BatchManager_Slurm(); // Methods to control jobs virtual const JobId submitJob(const Job & job); diff --git a/src/Slurm/CMakeLists.txt b/src/Slurm/CMakeLists.txt index 175559a..e08f31d 100644 --- a/src/Slurm/CMakeLists.txt +++ b/src/Slurm/CMakeLists.txt @@ -20,9 +20,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(CLASS_LIST Slurm/Batch_BatchManager_eSlurm - Slurm/Batch_FactBatchManager_eSlurm - Slurm/Batch_JobInfo_eSlurm +SET(CLASS_LIST Slurm/BatchManager_Slurm + Slurm/FactBatchManager_Slurm + Slurm/JobInfo_Slurm ) APPEND_CLASSES_TO_SRC_FILES(${CLASS_LIST}) diff --git a/src/Slurm/Batch_FactBatchManager_eSlurm.cxx b/src/Slurm/FactBatchManager_Slurm.cxx similarity index 72% rename from src/Slurm/Batch_FactBatchManager_eSlurm.cxx rename to src/Slurm/FactBatchManager_Slurm.cxx index 8f524f2..c4814eb 100644 --- a/src/Slurm/Batch_FactBatchManager_eSlurm.cxx +++ b/src/Slurm/FactBatchManager_Slurm.cxx @@ -20,35 +20,35 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_FactBatchManager_eSlurm.cxx : + * FactBatchManager_Slurm.cxx : * * Created on: 12 may 2011 * Author : Renaud BARATE - EDF R&D */ -#include +#include -#include "Batch_BatchManager_eSlurm.hxx" -#include "Batch_FactBatchManager_eSlurm.hxx" +#include "BatchManager_Slurm.hxx" +#include "FactBatchManager_Slurm.hxx" namespace Batch { - static FactBatchManager_eSlurm sFBM_eSlurm; + static FactBatchManager_Slurm sFBM_Slurm; - FactBatchManager_eSlurm::FactBatchManager_eSlurm() : FactBatchManager("SLURM") + FactBatchManager_Slurm::FactBatchManager_Slurm() : FactBatchManager("SLURM") { } - FactBatchManager_eSlurm::~FactBatchManager_eSlurm() + FactBatchManager_Slurm::~FactBatchManager_Slurm() { } - BatchManager * FactBatchManager_eSlurm::operator() (const char * hostname, + BatchManager * FactBatchManager_Slurm::operator() (const char * hostname, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) const { - return new BatchManager_eSlurm(this, hostname, username, protocolType, mpiImpl); + return new BatchManager_Slurm(this, hostname, username, protocolType, mpiImpl); } } diff --git a/src/Slurm/Batch_FactBatchManager_eSlurm.hxx b/src/Slurm/FactBatchManager_Slurm.hxx similarity index 83% rename from src/Slurm/Batch_FactBatchManager_eSlurm.hxx rename to src/Slurm/FactBatchManager_Slurm.hxx index bf7aaa2..c37838c 100644 --- a/src/Slurm/Batch_FactBatchManager_eSlurm.hxx +++ b/src/Slurm/FactBatchManager_Slurm.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_FactBatchManager_eSlurm.hxx : + * FactBatchManager_Slurm.hxx : * * Created on: 12 may 2011 * Author : Renaud BARATE - EDF R&D @@ -29,18 +29,18 @@ #ifndef _FACTBATCHMANAGER_ESLURM_H_ #define _FACTBATCHMANAGER_ESLURM_H_ -#include -#include -#include +#include +#include +#include namespace Batch { - class BATCH_EXPORT FactBatchManager_eSlurm : public FactBatchManager + class BATCH_EXPORT FactBatchManager_Slurm : public FactBatchManager { public: - FactBatchManager_eSlurm(); - virtual ~FactBatchManager_eSlurm(); + FactBatchManager_Slurm(); + virtual ~FactBatchManager_Slurm(); virtual BatchManager * operator() (const char * hostname, const char * username, diff --git a/src/Slurm/Batch_JobInfo_eSlurm.cxx b/src/Slurm/JobInfo_Slurm.cxx similarity index 90% rename from src/Slurm/Batch_JobInfo_eSlurm.cxx rename to src/Slurm/JobInfo_Slurm.cxx index 3b2d711..6e8aac5 100644 --- a/src/Slurm/Batch_JobInfo_eSlurm.cxx +++ b/src/Slurm/JobInfo_Slurm.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_JobInfo_eSlurm.cxx : + * JobInfo_Slurm.cxx : * * Created on: 12 may 2011 * Author : Renaud BARATE - EDF R&D @@ -28,16 +28,16 @@ #include -#include -#include +#include +#include -#include "Batch_JobInfo_eSlurm.hxx" +#include "JobInfo_Slurm.hxx" using namespace std; namespace Batch { - JobInfo_eSlurm::JobInfo_eSlurm(const std::string & id, const std::string & queryOutput) + JobInfo_Slurm::JobInfo_Slurm(const std::string & id, const std::string & queryOutput) : JobInfo() { _param[ID] = id; @@ -78,7 +78,7 @@ namespace Batch { } } - JobInfo_eSlurm::~JobInfo_eSlurm() + JobInfo_Slurm::~JobInfo_Slurm() { } diff --git a/src/Slurm/Batch_JobInfo_eSlurm.hxx b/src/Slurm/JobInfo_Slurm.hxx similarity index 85% rename from src/Slurm/Batch_JobInfo_eSlurm.hxx rename to src/Slurm/JobInfo_Slurm.hxx index d9c4cc8..cb03982 100644 --- a/src/Slurm/Batch_JobInfo_eSlurm.hxx +++ b/src/Slurm/JobInfo_Slurm.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_JobInfo_eSlurm.hxx : + * JobInfo_Slurm.hxx : * * Created on: 12 may 2011 * Author : Renaud BARATE - EDF R&D @@ -31,16 +31,16 @@ #include -#include +#include namespace Batch { - class JobInfo_eSlurm : public JobInfo + class JobInfo_Slurm : public JobInfo { public: - JobInfo_eSlurm(const std::string & id, const std::string & queryOutput); - virtual ~JobInfo_eSlurm(); + JobInfo_Slurm(const std::string & id, const std::string & queryOutput); + virtual ~JobInfo_Slurm(); }; diff --git a/src/Vishnu/Batch_BatchManager_eVishnu.cxx b/src/Vishnu/BatchManager_Vishnu.cxx similarity index 86% rename from src/Vishnu/Batch_BatchManager_eVishnu.cxx rename to src/Vishnu/BatchManager_Vishnu.cxx index 927f3ce..f9069b1 100644 --- a/src/Vishnu/Batch_BatchManager_eVishnu.cxx +++ b/src/Vishnu/BatchManager_Vishnu.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_BatchManager_eVishnu.cxx : + * BatchManager_Vishnu.cxx : * * Created on: 24 june 2011 * Author : Renaud BARATE - EDF R&D @@ -35,18 +35,18 @@ #include #include -#include -#include -#include +#include +#include +#include -#include "Batch_BatchManager_eVishnu.hxx" -#include "Batch_JobInfo_eVishnu.hxx" +#include "BatchManager_Vishnu.hxx" +#include "JobInfo_Vishnu.hxx" using namespace std; namespace Batch { - BatchManager_eVishnu::BatchManager_eVishnu(const FactBatchManager * parent, + BatchManager_Vishnu::BatchManager_Vishnu(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, @@ -56,12 +56,12 @@ namespace Batch { { } - BatchManager_eVishnu::~BatchManager_eVishnu() + BatchManager_Vishnu::~BatchManager_Vishnu() { } // Method to submit a job to the batch manager - const JobId BatchManager_eVishnu::submitJob(const Job & job) + const JobId BatchManager_Vishnu::submitJob(const Job & job) { // export input files on cluster exportInputFiles(job); @@ -109,7 +109,7 @@ namespace Batch { } - void BatchManager_eVishnu::exportInputFiles(const Job& job) + void BatchManager_Vishnu::exportInputFiles(const Job& job) { Parametre params = job.getParametre(); string subCommand = string("export OMNIORB_CONFIG=$VISHNU_CONFIG_FILE; "); @@ -165,7 +165,7 @@ namespace Batch { * Create Vishnu command file and copy it on the server. * Return the name of the remote file. */ - string BatchManager_eVishnu::buildCommandFile(const Job & job) + string BatchManager_Vishnu::buildCommandFile(const Job & job) { Parametre params = job.getParametre(); @@ -195,7 +195,7 @@ namespace Batch { tempOutputFile << "#!/bin/sh" << endl; tempOutputFile << "#% vishnu_output=" << workDir << "/logs/output.log." << rootNameToExecute << endl; - tempOutputFile << "#% vishnu_error=" << workDir << "/logs/error.log." << rootNameToExecute << endl; + tempOutputFile << "#% vishnu_rror=" << workDir << "/logs/error.log." << rootNameToExecute << endl; if (params.find(NAME) != params.end()) tempOutputFile << "#% vishnu_job_name=\"" << params[NAME] << "\"" << endl; @@ -233,7 +233,7 @@ namespace Batch { return tmpFileName; } - void BatchManager_eVishnu::deleteJob(const JobId & jobid) + void BatchManager_Vishnu::deleteJob(const JobId & jobid) { // define command to delete job string subCommand = string("export OMNIORB_CONFIG=$VISHNU_CONFIG_FILE; "); @@ -250,32 +250,32 @@ namespace Batch { cerr << "job " << jobid.getReference() << " killed" << endl; } - void BatchManager_eVishnu::holdJob(const JobId & jobid) + void BatchManager_Vishnu::holdJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eVishnu::holdJob"); + throw NotYetImplementedException("BatchManager_Vishnu::holdJob"); } - void BatchManager_eVishnu::releaseJob(const JobId & jobid) + void BatchManager_Vishnu::releaseJob(const JobId & jobid) { - throw NotYetImplementedException("BatchManager_eVishnu::releaseJob"); + throw NotYetImplementedException("BatchManager_Vishnu::releaseJob"); } - void BatchManager_eVishnu::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) + void BatchManager_Vishnu::alterJob(const JobId & jobid, const Parametre & param, const Environnement & env) { - throw NotYetImplementedException("BatchManager_eVishnu::alterJob"); + throw NotYetImplementedException("BatchManager_Vishnu::alterJob"); } - void BatchManager_eVishnu::alterJob(const JobId & jobid, const Parametre & param) + void BatchManager_Vishnu::alterJob(const JobId & jobid, const Parametre & param) { - throw NotYetImplementedException("BatchManager_eVishnu::alterJob"); + throw NotYetImplementedException("BatchManager_Vishnu::alterJob"); } - void BatchManager_eVishnu::alterJob(const JobId & jobid, const Environnement & env) + void BatchManager_Vishnu::alterJob(const JobId & jobid, const Environnement & env) { - throw NotYetImplementedException("BatchManager_eVishnu::alterJob"); + throw NotYetImplementedException("BatchManager_Vishnu::alterJob"); } - JobInfo BatchManager_eVishnu::queryJob(const JobId & jobid) + JobInfo BatchManager_Vishnu::queryJob(const JobId & jobid) { // define command to query batch string subCommand = string("export OMNIORB_CONFIG=$VISHNU_CONFIG_FILE; "); @@ -289,16 +289,16 @@ namespace Batch { int status = Utils::getCommandOutput(command, output); if (status != 0) throw RunTimeException("Can't query job " + jobid.getReference()); - JobInfo_eVishnu jobinfo = JobInfo_eVishnu(jobid.getReference(), output); + JobInfo_Vishnu jobinfo = JobInfo_Vishnu(jobid.getReference(), output); return jobinfo; } - const JobId BatchManager_eVishnu::addJob(const Job & job, const string reference) + const JobId BatchManager_Vishnu::addJob(const Job & job, const string reference) { return JobId(this, reference); } - void BatchManager_eVishnu::importOutputFiles(const Job & job, const std::string directory) + void BatchManager_Vishnu::importOutputFiles(const Job & job, const std::string directory) { // Create local result directory char * buf = getcwd(NULL, 0); diff --git a/src/Vishnu/Batch_BatchManager_eVishnu.hxx b/src/Vishnu/BatchManager_Vishnu.hxx similarity index 86% rename from src/Vishnu/Batch_BatchManager_eVishnu.hxx rename to src/Vishnu/BatchManager_Vishnu.hxx index 5674e5b..d43eaaa 100644 --- a/src/Vishnu/Batch_BatchManager_eVishnu.hxx +++ b/src/Vishnu/BatchManager_Vishnu.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_BatchManager_eVishnu.hxx : + * BatchManager_Vishnu.hxx : * * Created on: 24 june 2011 * Author : Renaud BARATE - EDF R&D @@ -31,24 +31,24 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace Batch { - class BATCH_EXPORT BatchManager_eVishnu : public BatchManager + class BATCH_EXPORT BatchManager_Vishnu : public BatchManager { public: - BatchManager_eVishnu(const FactBatchManager * parent, + BatchManager_Vishnu(const FactBatchManager * parent, const char * host = "localhost", const char * username = "", CommunicationProtocolType protocolType = SSH, const char * mpiImpl = "nompi"); - virtual ~BatchManager_eVishnu(); + virtual ~BatchManager_Vishnu(); // Methods to control jobs virtual const JobId submitJob(const Job & job); diff --git a/src/Vishnu/CMakeLists.txt b/src/Vishnu/CMakeLists.txt index 1a0d084..a1fec35 100644 --- a/src/Vishnu/CMakeLists.txt +++ b/src/Vishnu/CMakeLists.txt @@ -20,9 +20,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(CLASS_LIST Vishnu/Batch_BatchManager_eVishnu - Vishnu/Batch_FactBatchManager_eVishnu - Vishnu/Batch_JobInfo_eVishnu +SET(CLASS_LIST Vishnu/BatchManager_Vishnu + Vishnu/FactBatchManager_Vishnu + Vishnu/JobInfo_Vishnu ) APPEND_CLASSES_TO_SRC_FILES(${CLASS_LIST}) diff --git a/src/Vishnu/Batch_FactBatchManager_eVishnu.cxx b/src/Vishnu/FactBatchManager_Vishnu.cxx similarity index 69% rename from src/Vishnu/Batch_FactBatchManager_eVishnu.cxx rename to src/Vishnu/FactBatchManager_Vishnu.cxx index 932e383..53361b3 100644 --- a/src/Vishnu/Batch_FactBatchManager_eVishnu.cxx +++ b/src/Vishnu/FactBatchManager_Vishnu.cxx @@ -20,36 +20,36 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_FactBatchManager_eVishnu.cxx : + * FactBatchManager_Vishnu.cxx : * * Created on: 24 june 2011 * Author : Renaud BARATE - EDF R&D */ -#include +#include -#include "Batch_BatchManager_eVishnu.hxx" -#include "Batch_FactBatchManager_eVishnu.hxx" +#include "BatchManager_Vishnu.hxx" +#include "FactBatchManager_Vishnu.hxx" namespace Batch { - static FactBatchManager_eVishnu sFBM_eVishnu; + static FactBatchManager_Vishnu sFBM_Vishnu; - FactBatchManager_eVishnu::FactBatchManager_eVishnu() : FactBatchManager("VISHNU") + FactBatchManager_Vishnu::FactBatchManager_Vishnu() : FactBatchManager("VISHNU") { } - FactBatchManager_eVishnu::~FactBatchManager_eVishnu() + FactBatchManager_Vishnu::~FactBatchManager_Vishnu() { } - BatchManager * FactBatchManager_eVishnu::operator() (const char * hostname, + BatchManager * FactBatchManager_Vishnu::operator() (const char * hostname, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) const { - // MESSAGE("Building new BatchManager_eVishnu on host '" << hostname << "'"); - return new BatchManager_eVishnu(this, hostname, username, protocolType, mpiImpl); + // MESSAGE("Building new BatchManager_Vishnu on host '" << hostname << "'"); + return new BatchManager_Vishnu(this, hostname, username, protocolType, mpiImpl); } } diff --git a/src/Vishnu/Batch_FactBatchManager_eVishnu.hxx b/src/Vishnu/FactBatchManager_Vishnu.hxx similarity index 82% rename from src/Vishnu/Batch_FactBatchManager_eVishnu.hxx rename to src/Vishnu/FactBatchManager_Vishnu.hxx index 20b9bfe..bc04ec2 100644 --- a/src/Vishnu/Batch_FactBatchManager_eVishnu.hxx +++ b/src/Vishnu/FactBatchManager_Vishnu.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_FactBatchManager_eVishnu.hxx : + * FactBatchManager_Vishnu.hxx : * * Created on: 24 june 2011 * Author : Renaud BARATE - EDF R&D @@ -29,19 +29,19 @@ #ifndef _FACTBATCHMANAGER_EVISHNU_H_ #define _FACTBATCHMANAGER_EVISHNU_H_ -#include -#include -#include -#include +#include +#include +#include +#include namespace Batch { - class BATCH_EXPORT FactBatchManager_eVishnu : public FactBatchManager + class BATCH_EXPORT FactBatchManager_Vishnu : public FactBatchManager { public: - FactBatchManager_eVishnu(); - virtual ~FactBatchManager_eVishnu(); + FactBatchManager_Vishnu(); + virtual ~FactBatchManager_Vishnu(); virtual BatchManager * operator() (const char * hostname, const char * username, diff --git a/src/Vishnu/Batch_JobInfo_eVishnu.cxx b/src/Vishnu/JobInfo_Vishnu.cxx similarity index 91% rename from src/Vishnu/Batch_JobInfo_eVishnu.cxx rename to src/Vishnu/JobInfo_Vishnu.cxx index d4b89d4..68a32b6 100644 --- a/src/Vishnu/Batch_JobInfo_eVishnu.cxx +++ b/src/Vishnu/JobInfo_Vishnu.cxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_JobInfo_eVishnu.cxx : + * JobInfo_Vishnu.cxx : * * Created on: 24 june 2011 * Author : Renaud BARATE - EDF R&D @@ -29,16 +29,16 @@ #include #include -#include -#include +#include +#include -#include "Batch_JobInfo_eVishnu.hxx" +#include "JobInfo_Vishnu.hxx" using namespace std; namespace Batch { - JobInfo_eVishnu::JobInfo_eVishnu(const string & id, const string & queryOutput) + JobInfo_Vishnu::JobInfo_Vishnu(const string & id, const string & queryOutput) : JobInfo() { _param[ID] = id; @@ -91,7 +91,7 @@ namespace Batch { } } - JobInfo_eVishnu::~JobInfo_eVishnu() + JobInfo_Vishnu::~JobInfo_Vishnu() { } diff --git a/src/Vishnu/Batch_JobInfo_eVishnu.hxx b/src/Vishnu/JobInfo_Vishnu.hxx similarity index 84% rename from src/Vishnu/Batch_JobInfo_eVishnu.hxx rename to src/Vishnu/JobInfo_Vishnu.hxx index 5341495..db124e3 100644 --- a/src/Vishnu/Batch_JobInfo_eVishnu.hxx +++ b/src/Vishnu/JobInfo_Vishnu.hxx @@ -20,7 +20,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /* - * Batch_JobInfo_eVishnu.hxx : + * JobInfo_Vishnu.hxx : * * Created on: 24 june 2011 * Author : Renaud BARATE - EDF R&D @@ -31,16 +31,16 @@ #include -#include +#include namespace Batch { - class JobInfo_eVishnu : public JobInfo + class JobInfo_Vishnu : public JobInfo { public: - JobInfo_eVishnu(const std::string & id, const std::string & queryOutput); - virtual ~JobInfo_eVishnu(); + JobInfo_Vishnu(const std::string & id, const std::string & queryOutput); + virtual ~JobInfo_Vishnu(); }; -- 2.39.2