From: secher Date: Thu, 26 Apr 2007 09:26:52 +0000 (+0000) Subject: debug FindBest X-Git-Tag: BR_V326p4_20070428~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6145b09e81882b5e24d5349fd77bd0f0277d36c4;p=modules%2Fkernel.git debug FindBest --- diff --git a/idl/SALOME_ContainerManager.idl b/idl/SALOME_ContainerManager.idl index 894701482..20867310f 100644 --- a/idl/SALOME_ContainerManager.idl +++ b/idl/SALOME_ContainerManager.idl @@ -66,7 +66,7 @@ struct MachineParameters Container StartContainer( in MachineParameters params, in ResPolicy policy); - string FindBest(in MachineList possibleComputers); + string FindFirst(in MachineList possibleComputers); MachineList GetFittingResources( in MachineParameters params, in string componentName ) diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx index 61656b179..413934de5 100644 --- a/src/Container/SALOME_ContainerManager.cxx +++ b/src/Container/SALOME_ContainerManager.cxx @@ -334,9 +334,9 @@ GetFittingResources(const Engines::MachineParameters& params, char* SALOME_ContainerManager:: -FindBest(const Engines::MachineList& possibleComputers) +FindFirst(const Engines::MachineList& possibleComputers) { - string theMachine=_ResManager->FindBest(possibleComputers); + string theMachine=_ResManager->FindFirst(possibleComputers); return CORBA::string_dup(theMachine.c_str()); } diff --git a/src/Container/SALOME_ContainerManager.hxx b/src/Container/SALOME_ContainerManager.hxx index 9573e06e3..a4f7dba70 100644 --- a/src/Container/SALOME_ContainerManager.hxx +++ b/src/Container/SALOME_ContainerManager.hxx @@ -70,7 +70,7 @@ public: GetFittingResources(const Engines::MachineParameters& params, const char *componentName); - char* FindBest(const Engines::MachineList& possibleComputers); + char* FindFirst(const Engines::MachineList& possibleComputers); void Shutdown(); void ShutdownContainers(); diff --git a/src/LifeCycleCORBA/LifeCycleCORBA.py b/src/LifeCycleCORBA/LifeCycleCORBA.py index e0a7ac0f3..928c83cea 100644 --- a/src/LifeCycleCORBA/LifeCycleCORBA.py +++ b/src/LifeCycleCORBA/LifeCycleCORBA.py @@ -159,7 +159,7 @@ class LifeCycleCORBA: pass pass if len(machinesOK)!=0: - bestMachine=self._contManager.FindBest(machinesOK) + bestMachine=self._contManager.FindFirst(machinesOK) componentNameForNS= [CosNaming.NameComponent(bestMachine,"dir"), CosNaming.NameComponent(containerName,"dir"), CosNaming.NameComponent(componentName,"object")] @@ -176,7 +176,7 @@ class LifeCycleCORBA: else: return None else: - bestMachine=self._contManager.FindBest(listOfMachines) + bestMachine=self._contManager.FindFirst(listOfMachines) MESSAGE("Not implemented yet ...") return None pass diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx index 07250628a..ace68d25b 100644 --- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx +++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx @@ -422,7 +422,7 @@ _FindComponent(const Engines::MachineParameters& params, if(lghtOfmachinesOK != 0) { machinesOK->length(lghtOfmachinesOK); - CORBA::String_var bestMachine = _ContManager->FindBest(machinesOK); + CORBA::String_var bestMachine = _ContManager->FindFirst(machinesOK); CORBA::Object_var obj = _NS->ResolveComponent(bestMachine, containerName, componentName,