Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
in session_attached mode synchronize local NS with content of salome.[cm,rm,esm,dsm]
[modules/kernel.git]
/
src
/
Launcher
/
SALOME_Launcher.hxx
diff --git
a/src/Launcher/SALOME_Launcher.hxx
b/src/Launcher/SALOME_Launcher.hxx
index ffb339e05301ca46f5879d8bd5bd1c5795629020..9fcbc2023bdd0d8fcd1b0cf5f7e7270d189415ff 100644
(file)
--- a/
src/Launcher/SALOME_Launcher.hxx
+++ b/
src/Launcher/SALOME_Launcher.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-25,14
+25,14
@@
#include "SALOME_Launcher_defs.hxx"
#include "SALOME_Launcher_defs.hxx"
-#include <SALOMEconfig.h>
+#include "SALOME_NamingService.hxx"
+#include "SALOMEconfig.h"
#include CORBA_CLIENT_HEADER(SALOME_Launcher)
#include "Launcher.hxx"
#include <string>
#include <list>
#include CORBA_CLIENT_HEADER(SALOME_Launcher)
#include "Launcher.hxx"
#include <string>
#include <list>
-class SALOME_NamingService;
class SALOME_ContainerManager;
class SALOME_ResourcesManager;
class SALOME_ContainerManager;
class SALOME_ResourcesManager;
@@
-43,17
+43,22
@@
class SALOMELAUNCHER_EXPORT SALOME_Launcher:
public:
SALOME_Launcher(CORBA::ORB_ptr orb, PortableServer::POA_var poa);
public:
SALOME_Launcher(CORBA::ORB_ptr orb, PortableServer::POA_var poa);
+ SALOME_Launcher(CORBA::ORB_ptr orb, PortableServer::POA_var poa, SALOME_NamingService_Abstract *externalNS);
virtual ~SALOME_Launcher();
virtual ~SALOME_Launcher();
-
// Main methods
CORBA::Long createJob (const Engines::JobParameters & job_parameters);
void launchJob (CORBA::Long job_id);
char * getJobState (CORBA::Long job_id);
char * getAssignedHostnames (CORBA::Long job_id); // Get names or ids of hosts assigned to the job
// Main methods
CORBA::Long createJob (const Engines::JobParameters & job_parameters);
void launchJob (CORBA::Long job_id);
char * getJobState (CORBA::Long job_id);
char * getAssignedHostnames (CORBA::Long job_id); // Get names or ids of hosts assigned to the job
+ void exportInputFiles(CORBA::Long job_id);
void getJobResults(CORBA::Long job_id, const char * directory);
void getJobResults(CORBA::Long job_id, const char * directory);
+ void clearJobWorkingDir(CORBA::Long job_id);
CORBA::Boolean getJobDumpState(CORBA::Long job_id, const char * directory);
CORBA::Boolean getJobDumpState(CORBA::Long job_id, const char * directory);
+ CORBA::Boolean getJobWorkFile(CORBA::Long job_id, const char * work_file, const char * directory);
void stopJob (CORBA::Long job_id);
void removeJob (CORBA::Long job_id);
void stopJob (CORBA::Long job_id);
void removeJob (CORBA::Long job_id);
+ char * dumpJob(CORBA::Long job_id);
+ CORBA::Long restoreJob(const char * dumpedJob);
// Useful methods
CORBA::Long createJobWithFile(const char * xmlExecuteFile, const char * clusterName);
// Useful methods
CORBA::Long createJobWithFile(const char * xmlExecuteFile, const char * clusterName);
@@
-72,24
+77,39
@@
public:
// Save and load methods
virtual void loadJobs(const char* jobs_file);
virtual void saveJobs(const char* jobs_file);
// Save and load methods
virtual void loadJobs(const char* jobs_file);
virtual void saveJobs(const char* jobs_file);
-
+
+ void DeclareUsingSalomeSession();
static const char *_LauncherNameInNS;
static const char *_LauncherNameInNS;
+ static JobParameters_cpp
+ JobParameters_CORBA2CPP(const Engines::JobParameters& job_parameters);
+
+ static Engines::JobParameters_var
+ JobParameters_CPP2CORBA(const JobParameters_cpp& job_parameters);
+
protected:
// Internal methods
virtual void notifyObservers(const std::string & event_name, const std::string & event_data);
protected:
// Internal methods
virtual void notifyObservers(const std::string & event_name, const std::string & event_data);
-
+ void init(CORBA::ORB_ptr orb, PortableServer::POA_var poa);
protected:
CORBA::ORB_var _orb;
PortableServer::POA_var _poa;
SALOME_ContainerManager *_ContManager;
SALOME_ResourcesManager *_ResManager;
protected:
CORBA::ORB_var _orb;
PortableServer::POA_var _poa;
SALOME_ContainerManager *_ContManager;
SALOME_ResourcesManager *_ResManager;
- SALOME_NamingService
*_NS
;
+ SALOME_NamingService
_Abstract *_NS = nullptr
;
std::list<Engines::SalomeLauncherObserver_var> _observers;
Launcher_cpp _l;
};
std::list<Engines::SalomeLauncherObserver_var> _observers;
Launcher_cpp _l;
};
+/*!
+ * Methods to be used in SSL mode to skip NS.
+ */
+namespace KERNEL
+{
+ SALOMELAUNCHER_EXPORT SALOME_Launcher *getLauncherSA();
+}
+
#endif
#endif