Changes due to recent improvements in libBatch.

Add batch parameter "EXCLUSIVE" in Launcher: Salome jobs are launched in exclusive mode, command jobs in shared mode.

diff --git a/src/Launcher/Launcher_Job_Command.cxx b/src/Launcher/Launcher_Job_Command.cxx
index 7a588cc888391e4d93ccef26f7ca5363ba7c49a0..f4efb9a1e9f1774d1ae401864eb418d472a19a74 100644 (file)
--- a/src/Launcher/Launcher_Job_Command.cxx
+++ b/src/Launcher/Launcher_Job_Command.cxx
@@ -40,6 +40,7 @@ Launcher::Job_Command::update_job()
 #ifdef WITH_LIBBATCH
   Batch::Parametre params = common_job_params();
   params[Batch::EXECUTABLE] = buildCommandScript(params, _launch_date);
+  params[Batch::EXCLUSIVE] = false;
   _batch_job->setParametre(params);
 #endif
 }

diff --git a/src/Launcher/Launcher_Job_SALOME.cxx b/src/Launcher/Launcher_Job_SALOME.cxx
index 1875482952ead686ab7714f7b9db5c2f381ca63b..d1fafd3e56548c282a8e4d1787d5c8b897094b73 100644 (file)
--- a/src/Launcher/Launcher_Job_SALOME.cxx
+++ b/src/Launcher/Launcher_Job_SALOME.cxx
@@ -52,6 +52,7 @@ Launcher::Job_SALOME::update_job()
 #ifdef WITH_LIBBATCH
   Batch::Parametre params = common_job_params();
   params[Batch::EXECUTABLE] = buildSalomeScript(params);
+  params[Batch::EXCLUSIVE] = true;
   _batch_job->setParametre(params);
 #endif
 }

diff --git a/src/ResourcesManager/Makefile.am b/src/ResourcesManager/Makefile.am
index c7f073d3b53b83f0697484e00e1dc36b9beb08fb..c915a4896721613cc7e3b04f62888437048c1319 100755 (executable)
--- a/src/ResourcesManager/Makefile.am
+++ b/src/ResourcesManager/Makefile.am
@@ -50,7 +50,6 @@ salomeinclude_HEADERS = \
 
 # This local variable defines the list of CPPFLAGS common to all target in this package.
 COMMON_CPPFLAGS=\
-       -I$(srcdir)/../Batch \
        -I$(srcdir)/../Basics \
        -I$(srcdir)/../SALOMELocalTrace \
        -I$(srcdir)/../NamingService \

diff --git a/src/ResourcesManager/ResourcesManager.hxx b/src/ResourcesManager/ResourcesManager.hxx
index 1e44512745ddb35fa63c64030fefb16bdff4c265..3eaf02cf1c004a1a6970ab98268acf9d3d7d885d 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.hxx
+++ b/src/ResourcesManager/ResourcesManager.hxx
@@ -54,11 +54,11 @@ struct resourceParams
   std::string name;
   std::string hostname;
   std::string OS;
-  unsigned int nb_proc;
-  unsigned int nb_node;
-  unsigned int nb_proc_per_node;
-  unsigned int cpu_clock;
-  unsigned int mem_mb;
+  long nb_proc;
+  long nb_node;
+  long nb_proc_per_node;
+  long cpu_clock;
+  long mem_mb;
   std::vector<std::string> componentList;
   std::vector<std::string> resourceList;
 };