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
Increment version: 7.6.0
[modules/kernel.git]
/
src
/
ResourcesManager
/
SALOME_LoadRateManager.cxx
diff --git
a/src/ResourcesManager/SALOME_LoadRateManager.cxx
b/src/ResourcesManager/SALOME_LoadRateManager.cxx
index 60eacc2c0f613f7d136e5b806ec6e846d85f69af..8dca0d08435a8c5112c7c914f4e2d5c816e519b6 100644
(file)
--- a/
src/ResourcesManager/SALOME_LoadRateManager.cxx
+++ b/
src/ResourcesManager/SALOME_LoadRateManager.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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,7
+25,7
@@
#include <map>
std::string LoadRateManagerFirst::Find(const std::vector<std::string>& hosts,
#include <map>
std::string LoadRateManagerFirst::Find(const std::vector<std::string>& hosts,
- MapOfParserResourcesType& resList)
+
const
MapOfParserResourcesType& resList)
{
if (hosts.size() == 0)
return std::string("");
{
if (hosts.size() == 0)
return std::string("");
@@
-34,7
+34,7
@@
std::string LoadRateManagerFirst::Find(const std::vector<std::string>& hosts,
}
std::string LoadRateManagerCycl::Find(const std::vector<std::string>& hosts,
}
std::string LoadRateManagerCycl::Find(const std::vector<std::string>& hosts,
- MapOfParserResourcesType& resList)
+
const
MapOfParserResourcesType& resList)
{
static int imachine = 0;
static int iproc = 0;
{
static int imachine = 0;
static int iproc = 0;
@@
-43,7
+43,10
@@
std::string LoadRateManagerCycl::Find(const std::vector<std::string>& hosts,
if (hosts.size() == 0)
return std::string("");
else{
if (hosts.size() == 0)
return std::string("");
else{
- ParserResourcesType resource = resList[std::string(hosts[imachine])];
+ MapOfParserResourcesType::const_iterator it(resList.find(hosts[imachine]));
+ ParserResourcesType resource;
+ if(it!=resList.end())
+ resource = (*it).second;
int nbproc = resource.DataForSort._nbOfProcPerNode * resource.DataForSort._nbOfNodes;
if( nbproc <= 0) nbproc = 1;
if( iproc < nbproc ){
int nbproc = resource.DataForSort._nbOfProcPerNode * resource.DataForSort._nbOfNodes;
if( nbproc <= 0) nbproc = 1;
if( iproc < nbproc ){
@@
-61,7
+64,7
@@
std::string LoadRateManagerCycl::Find(const std::vector<std::string>& hosts,
}
std::string LoadRateManagerAltCycl::Find(const std::vector<std::string>& hosts,
}
std::string LoadRateManagerAltCycl::Find(const std::vector<std::string>& hosts,
- MapOfParserResourcesType& resList)
+
const
MapOfParserResourcesType& resList)
{
if (hosts.size() == 0)
return std::string("");
{
if (hosts.size() == 0)
return std::string("");