Remove distinction between batch managers ssh_batch and none

[modules/yacs.git] / src / Launcher / Launcher.hxx

diff --git a/src/Launcher/Launcher.hxx b/src/Launcher/Launcher.hxx
index f459fca2cb5875464ccca5648d2bd8dd5b0c2c2d..228355c301cc58f137e8eb86a6b6c17913e5be63 100644 (file)
--- a/src/Launcher/Launcher.hxx
+++ b/src/Launcher/Launcher.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -39,7 +39,7 @@
 class MpiImpl;
 
 namespace Batch{
-  class BatchManager_eClient;
+  class BatchManager;
   class Job;
 }
 
@@ -48,6 +48,10 @@ struct batchParams{
   std::string expected_during_time;
   std::string mem;
   unsigned long nb_proc;
+
+  // Parameters for COORM
+  std::string launcher_file;
+  std::string launcher_args;
 };
 
 class LAUNCHER_EXPORT Launcher_cpp
@@ -61,6 +65,7 @@ public:
   void         createJob(Launcher::Job * new_job);
   void         launchJob(int job_id);
   const char * getJobState(int job_id);
+  const char * getAssignedHostnames(int job_id); // Get names or ids of hosts assigned to the job
   void         getJobResults(int job_id, std::string directory);
   bool         getJobDumpState(int job_id, std::string directory);
   void         stopJob(int job_id);
@@ -83,8 +88,8 @@ protected:
 
   // Methods used by user interface methods
 #ifdef WITH_LIBBATCH
-  Batch::BatchManager_eClient *FactoryBatchManager(ParserResourcesType& params);
-  std::map <int, Batch::BatchManager_eClient*> _batchmap;
+  Batch::BatchManager *FactoryBatchManager(ParserResourcesType& params);
+  std::map <int, Batch::BatchManager*> _batchmap;
 #endif
   ParserLauncherType ParseXmlFile(std::string xmlExecuteFile);