X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FResourcesManager%2FSALOME_LoadRateManager.cxx;h=8dca0d08435a8c5112c7c914f4e2d5c816e519b6;hb=2e44426f61da038fedaa98b8c48e82d1dfcca29f;hp=60eacc2c0f613f7d136e5b806ec6e846d85f69af;hpb=0fac7040be417aab7228a4e23904b4cf22a8dda4;p=modules%2Fkernel.git diff --git a/src/ResourcesManager/SALOME_LoadRateManager.cxx b/src/ResourcesManager/SALOME_LoadRateManager.cxx index 60eacc2c0..8dca0d084 100644 --- a/src/ResourcesManager/SALOME_LoadRateManager.cxx +++ b/src/ResourcesManager/SALOME_LoadRateManager.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 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 @@ -25,7 +25,7 @@ #include std::string LoadRateManagerFirst::Find(const std::vector& hosts, - MapOfParserResourcesType& resList) + const MapOfParserResourcesType& resList) { if (hosts.size() == 0) return std::string(""); @@ -34,7 +34,7 @@ std::string LoadRateManagerFirst::Find(const std::vector& hosts, } std::string LoadRateManagerCycl::Find(const std::vector& hosts, - MapOfParserResourcesType& resList) + const MapOfParserResourcesType& resList) { static int imachine = 0; static int iproc = 0; @@ -43,7 +43,10 @@ std::string LoadRateManagerCycl::Find(const std::vector& hosts, 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 ){ @@ -61,7 +64,7 @@ std::string LoadRateManagerCycl::Find(const std::vector& hosts, } std::string LoadRateManagerAltCycl::Find(const std::vector& hosts, - MapOfParserResourcesType& resList) + const MapOfParserResourcesType& resList) { if (hosts.size() == 0) return std::string("");