ready to test

diff --git a/src/runtime/SalomeContainerTools.cxx b/src/runtime/SalomeContainerTools.cxx
index 6ef7b149d7377d71ba7dbd221a97e10241f70cd1..7cbaacce61c1b17ac7e61b58a18b1d2a8c370777 100644 (file)
--- a/src/runtime/SalomeContainerTools.cxx
+++ b/src/runtime/SalomeContainerTools.cxx
@@ -30,6 +30,7 @@
 #include "ServiceNode.hxx"
 #include "ComponentInstance.hxx"
 #include "SalomeContainerHelper.hxx"
+#include "SalomeHPContainerTools.hxx"
 #include "RuntimeSALOME.hxx"
 #include "Exception.hxx"
 
@@ -267,7 +268,7 @@ std::string SalomeContainerTools::getHostName() const
   return std::string(_params.resource_params.hostname);
 }
 
-void SalomeContainerTools::SetContainerNameOf(Engines::ContainerParameters& params, const std::string& name)
+void SalomeContainerToolsBase::SetContainerNameOf(Engines::ContainerParameters& params, const std::string& name)
 {
   params.container_name=CORBA::string_dup(name.c_str());
 }
@@ -316,7 +317,7 @@ std::map<std::string,std::string> SalomeContainerTools::getResourceProperties(co
  * \param [in] compoNames
  * \param [in,out] shutdownLevel
  */
-void SalomeContainerTools::Start(const std::vector<std::string>& compoNames, SalomeContainerHelper *schelp, SalomeContainerTools& sct, int& shutdownLevel, const Container *cont, const Task *askingNode)
+void SalomeContainerToolsBase::Start(const std::vector<std::string>& compoNames, SalomeContainerHelper *schelp, SalomeContainerToolsBase& sct, int& shutdownLevel, const Container *cont, const Task *askingNode)
 {
   CORBA::ORB_ptr orb(getSALOMERuntime()->getOrb());
   SALOME_NamingService ns;
@@ -427,7 +428,7 @@ void SalomeContainerTools::Start(const std::vector<std::string>& compoNames, Sal
   std::cerr << "SalomeContainer launched : " << containerName << " " << hostName << " " << trueCont->getPID() << std::endl;
 }
 
-CORBA::Object_ptr SalomeContainerTools::LoadComponent(SalomeContainerHelper *launchModeType, Container *cont, Task *askingNode)
+CORBA::Object_ptr SalomeContainerToolsBase::LoadComponent(SalomeContainerHelper *launchModeType, Container *cont, Task *askingNode)
 {
   DEBTRACE("SalomeContainer::loadComponent ");
   const ComponentInstance *inst(askingNode?askingNode->getComponent():0);
@@ -437,7 +438,7 @@ CORBA::Object_ptr SalomeContainerTools::LoadComponent(SalomeContainerHelper *lau
       cont->start(askingNode);
   }
   if(!inst)
-    throw Exception("SalomeContainerTools::LoadComponent : no instance of component in the task requesting for a load of its component !");
+    throw Exception("SalomeContainerToolsBase::LoadComponent : no instance of component in the task requesting for a load of its component !");
   CORBA::Object_ptr objComponent=CORBA::Object::_nil();
   {
     YACS::BASES::AutoLocker<Container> alck(cont);//To be sure
@@ -452,10 +453,10 @@ CORBA::Object_ptr SalomeContainerTools::LoadComponent(SalomeContainerHelper *lau
   return objComponent;
 }
 
-CORBA::Object_ptr SalomeContainerTools::CreateComponentInstance(Container *cont, Engines::Container_ptr contPtr, const ComponentInstance *inst)
+CORBA::Object_ptr SalomeContainerToolsBase::CreateComponentInstance(Container *cont, Engines::Container_ptr contPtr, const ComponentInstance *inst)
 {
   if(!inst)
-    throw Exception("SalomeContainerTools::CreateComponentInstance : no instance of component in the task requesting for a load of its component !");
+    throw Exception("SalomeContainerToolsBase::CreateComponentInstance : no instance of component in the task requesting for a load of its component !");
   char *reason(0);
   std::string compoName(inst->getCompoName());
   CORBA::Object_ptr objComponent=CORBA::Object::_nil();
@@ -492,7 +493,7 @@ CORBA::Object_ptr SalomeContainerTools::CreateComponentInstance(Container *cont,
   return objComponent;
 }
 
-std::string SalomeContainerTools::GetPlacementId(const SalomeContainerHelper *launchModeType, const Container *cont, const Task *askingNode)
+std::string SalomeContainerToolsBase::GetPlacementId(const SalomeContainerHelper *launchModeType, const Container *cont, const Task *askingNode)
 {
   if(cont->isAlreadyStarted(askingNode))
     {
@@ -512,7 +513,7 @@ std::string SalomeContainerTools::GetPlacementId(const SalomeContainerHelper *la
     return "Not placed yet !!!";
 }
 
-std::string SalomeContainerTools::GetFullPlacementId(const SalomeContainerHelper *launchModeType, const Container *cont, const Task *askingNode)
+std::string SalomeContainerToolsBase::GetFullPlacementId(const SalomeContainerHelper *launchModeType, const Container *cont, const Task *askingNode)
 {
   if(cont->isAlreadyStarted(askingNode))
     {
@@ -531,3 +532,18 @@ std::string SalomeContainerTools::GetFullPlacementId(const SalomeContainerHelper
   else
     return "Not_placed_yet";
 }
+
+Engines::ContainerParameters SalomeContainerToolsDecorator::getParameters() const
+{
+  Engines::ContainerParameters ret(_decorated->getParameters());
+  std::string st(ret.resource_params.hostname);
+  if(!st.empty())
+    return ret;
+  int nbProcPerNode(this->_nb_cores_per_worker);
+  std::size_t iPos(_vh->locateTask(_node)),nPos(_vh->size());
+  if(_vh->size()!=_pg->getNumberOfWorkers(nbProcPerNode))
+    throw YACS::Exception("SalomeContainerToolsDecorator::getParameters : Internal error !");
+  std::string zeMachine(_pg->deduceMachineFrom(iPos,nbProcPerNode));
+  ret.resource_params.hostname=CORBA::string_dup(zeMachine.c_str());
+  return ret;
+}
\ No newline at end of file

diff --git a/src/runtime/SalomeContainerTools.hxx b/src/runtime/SalomeContainerTools.hxx
index bf27eef97e608dc0cbae5c4080815fce75aac401..0b5744c34928151c4b7ce35325c638dc7b08af62 100644 (file)
--- a/src/runtime/SalomeContainerTools.hxx
+++ b/src/runtime/SalomeContainerTools.hxx
@@ -36,36 +36,85 @@ namespace YACS
     class ComponentInstance;
     class SalomeContainerHelper;
 
-    class YACSRUNTIMESALOME_EXPORT SalomeContainerTools
+    class YACSRUNTIMESALOME_EXPORT SalomeContainerToolsBase
     {
     public:
-      SalomeContainerTools();
-      SalomeContainerTools(const SalomeContainerTools& other);
-      std::string getProperty(const std::string& name) const;
-      void setProperty(const std::string& name, const std::string& value);
-      const std::map<std::string,std::string>& getProperties() const { return _propertyMap; }
-      void clearProperties();
-      std::map<std::string,std::string> getResourceProperties(const std::string& name) const;
-      void addToComponentList(const std::string& name);
-      void addToResourceList(const std::string& name);
+      virtual ~SalomeContainerToolsBase() { }
+      virtual std::string getProperty(const std::string& name) const = 0;
+      virtual void setProperty(const std::string& name, const std::string& value) = 0;
+      virtual const std::map<std::string,std::string>& getProperties() const = 0;
+      virtual std::map<std::string,std::string> getResourceProperties(const std::string& name) const = 0;
+      virtual void clearProperties() = 0;
+      virtual void addToComponentList(const std::string& name) = 0;
+      virtual void addToResourceList(const std::string& name) = 0;
+      virtual Engines::ContainerParameters getParameters() const = 0;
+      virtual void setContainerName(const std::string& name) = 0;
+      virtual std::string getHostName() const = 0;
+      virtual std::string getNotNullContainerName(const Container *contPtr, const Task *askingNode, bool& isEmpty) const = 0;
+      virtual std::string getContainerName() const = 0;
+      virtual int getNumberOfCoresPerWorker() const = 0;
     public:
-      std::string getContainerName() const;
-      int getNumberOfCoresPerWorker() const;
-      void setContainerName(const std::string& name);
-      std::string getNotNullContainerName(const Container *contPtr, const Task *askingNode, bool& isEmpty) const;
-      std::string getHostName() const;
-      Engines::ContainerParameters getParameters() const { return _params; }
-
       static void SetContainerNameOf(Engines::ContainerParameters& params, const std::string& name);
     public:
-      static void Start(const std::vector<std::string>& compoNames, SalomeContainerHelper *schelp, SalomeContainerTools& sct, int& shutdownLevel, const Container *cont, const Task *askingNode);
+      static void Start(const std::vector<std::string>& compoNames, SalomeContainerHelper *schelp, SalomeContainerToolsBase& sct, int& shutdownLevel, const Container *cont, const Task *askingNode);
       static CORBA::Object_ptr LoadComponent(SalomeContainerHelper *launchModeType, Container *cont, Task *askingNode);
       static CORBA::Object_ptr CreateComponentInstance(Container *cont, Engines::Container_ptr contPtr, const ComponentInstance *inst);
       static std::string GetPlacementId(const SalomeContainerHelper *launchModeType, const Container *cont, const Task *askingNode);
       static std::string GetFullPlacementId(const SalomeContainerHelper *launchModeType, const Container *cont, const Task *askingNode);
-    protected:
+    };
+
+    class YACSRUNTIMESALOME_EXPORT SalomeContainerTools : public SalomeContainerToolsBase
+    {
+    public:
+      SalomeContainerTools();
+      SalomeContainerTools(const SalomeContainerTools& other);
+      ~SalomeContainerTools() { }
+      std::string getProperty(const std::string& name) const override;
+      void setProperty(const std::string& name, const std::string& value) override;
+      const std::map<std::string,std::string>& getProperties() const override { return _propertyMap; }
+      std::map<std::string,std::string> getResourceProperties(const std::string& name) const override;
+      void clearProperties() override;
+      void addToComponentList(const std::string& name) override;
+      void addToResourceList(const std::string& name) override;
+      Engines::ContainerParameters getParameters() const override { return _params; }
+      void setContainerName(const std::string& name) override;
+      std::string getHostName() const override;
+      std::string getNotNullContainerName(const Container *contPtr, const Task *askingNode, bool& isEmpty) const override;
+      std::string getContainerName() const override;
+      int getNumberOfCoresPerWorker() const override;
+    private:
       std::map<std::string,std::string> _propertyMap;
       Engines::ContainerParameters _params;
     };
+
+    class PlayGround;
+    class SalomeHPContainerVectOfHelper;
+
+    class YACSRUNTIMESALOME_EXPORT SalomeContainerToolsDecorator : public SalomeContainerToolsBase
+    {
+    public:
+      SalomeContainerToolsDecorator(SalomeContainerToolsBase *decorated, const PlayGround *pg, SalomeHPContainerVectOfHelper *vh, const Task *node, int nbCoresPerWorker)
+      :_decorated(decorated),_pg(pg),_vh(vh),_node(node),_nb_cores_per_worker(nbCoresPerWorker) { }
+      std::string getProperty(const std::string& name) const override { return _decorated->getProperty(name); }
+      void setProperty(const std::string& name, const std::string& value) override { return _decorated->setProperty(name,value); }
+      const std::map<std::string,std::string>& getProperties() const override { return _decorated->getProperties(); }
+      std::map<std::string,std::string> getResourceProperties(const std::string& name) const override { return _decorated->getResourceProperties(name); }
+      void clearProperties() override { return _decorated->clearProperties(); }
+      void addToComponentList(const std::string& name) override { return _decorated->addToComponentList(name); }
+      void addToResourceList(const std::string& name) override { return _decorated->addToResourceList(name); }
+      // Everything for it
+      Engines::ContainerParameters getParameters() const override;
+      void setContainerName(const std::string& name) override { return _decorated->setContainerName(name); }
+      std::string getHostName() const override { return _decorated->getHostName(); }
+      std::string getNotNullContainerName(const Container *contPtr, const Task *askingNode, bool& isEmpty) const override { return _decorated->getNotNullContainerName(contPtr,askingNode,isEmpty); }
+      std::string getContainerName() const override { return _decorated->getContainerName(); }
+      int getNumberOfCoresPerWorker() const override { return _decorated->getNumberOfCoresPerWorker(); }
+    private:
+      SalomeContainerToolsBase *_decorated;
+      const PlayGround *_pg;
+      SalomeHPContainerVectOfHelper *_vh;
+      const Task *_node;
+      int _nb_cores_per_worker;
+    };
   }
 }

diff --git a/src/runtime/SalomeHPContainer.cxx b/src/runtime/SalomeHPContainer.cxx
index 6e2a2728e73c3657201c8601a582412e1d393f48..5925a9b8902b5058dabe0e118bd448c9bb4e21ce 100644 (file)
--- a/src/runtime/SalomeHPContainer.cxx
+++ b/src/runtime/SalomeHPContainer.cxx
@@ -114,6 +114,7 @@ bool SalomeHPContainer::isAlreadyStarted(const Task *askingNode) const
 void SalomeHPContainer::start(const Task *askingNode) throw(YACS::Exception)
 {
   SalomeContainerMonoHelper *helper(_launchModeType.getHelperOfTaskThreadSafe(this,askingNode));
+  SalomeContainerToolsDecorator sctDeco(&_sct,this->getPG(),&_launchModeType,askingNode,this->getNumberOfCoresPerWorker());
   SalomeContainerTools::Start(_componentNames,helper,_sct,_shutdownLevel,this,askingNode);
 }