[bos #35138][EDF] (2023-T1) Specialization of resources in KERNEL.

This commit is contained in:
Konstantin Leontev 2023-08-01 15:20:28 +01:00
parent e0552dbb7f
commit 85825d340a

View File

@ -451,9 +451,9 @@ CORBA::Long MeshJobManager_i::initialize(const MESHJOB::MeshJobFileList & meshJo
//const char * resourceName = "nepal@nepal"; //const char * resourceName = "nepal@nepal";
const char * resourceName = _configMap[configId].resname; const char * resourceName = _configMap[configId].resname;
Engines::ResourceDefinition * resourceDefinition; Engines::ResourceDefinitionContainer* resourceDefinition;
try { try {
resourceDefinition = _resourcesManager->GetResourceDefinition(resourceName); resourceDefinition = _resourcesManager->GetResourceDefinitionContainer(resourceName);
} }
catch (const CORBA::SystemException& ex) { catch (const CORBA::SystemException& ex) {
_lastErrorMessage = std::string("We can not access the resource ") + std::string(resourceName); _lastErrorMessage = std::string("We can not access the resource ") + std::string(resourceName);
@ -664,11 +664,8 @@ std::vector<std::string> * MeshJobManager_i::_getResourceNames() {
// //
// These part is just to control the available resources // These part is just to control the available resources
// //
Engines::ResourceParameters params; Engines::ResourceList* resourceList = _resourcesManager->ListAllResourcesInCatalogContainer();
KERNEL::getLifeCycleCORBA()->preSet(params); Engines::ResourceDefinitionContainer* resourceDefinition = nullptr;
Engines::ResourceList * resourceList = _resourcesManager->GetFittingResources(params);
Engines::ResourceDefinition * resourceDefinition = NULL;
LOG("### resource list:"); LOG("### resource list:");
std::vector<std::string>* resourceNames = new std::vector<std::string>(); std::vector<std::string>* resourceNames = new std::vector<std::string>();
if (resourceList) { if (resourceList) {
@ -676,7 +673,7 @@ std::vector<std::string> * MeshJobManager_i::_getResourceNames() {
const char* aResourceName = (*resourceList)[i]; const char* aResourceName = (*resourceList)[i];
resourceNames->push_back(std::string(aResourceName)); resourceNames->push_back(std::string(aResourceName));
LOG("resource["<<i<<"] = "<<aResourceName); LOG("resource["<<i<<"] = "<<aResourceName);
resourceDefinition = _resourcesManager->GetResourceDefinition(aResourceName); resourceDefinition = _resourcesManager->GetResourceDefinitionContainer(aResourceName);
LOG("protocol["<<i<<"] = "<<resourceDefinition->protocol); LOG("protocol["<<i<<"] = "<<resourceDefinition->protocol);
(void)resourceDefinition; // unused in release mode (void)resourceDefinition; // unused in release mode
} }