From: barate <barate>
Date: Fri, 2 Sep 2011 15:53:09 +0000 (+0000)
Subject: Changes due to recent improvements in libBatch.
X-Git-Tag: Before_0020136~36
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c54d2bd5920a49c6c47c7006e9a7004d74604be9;p=modules%2Fkernel.git

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 7a588cc88..f4efb9a1e 100644
--- 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 187548295..d1fafd3e5 100644
--- 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 c7f073d3b..c915a4896 100755
--- 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 1e4451274..3eaf02cf1 100644
--- 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;
 };