Changeset 2612

Timestamp:

02/06/24 15:41:08 (3 months ago)

Author:

jderouillat

Message:

Fix management of a service created onto a service through XML

Location:

XIOS3/trunk/src/node

Files:

• service_node.cpp (modified) (3 diffs)
• service_node.hpp (modified) (1 diff)

XIOS3/trunk/src/node/service_node.cpp

@@ -11 +11 @@
 
   CServiceNode::~CServiceNode(void)
-  { /* Ne rien faire de plus */ }
+  {
+    for(auto& serviceOnto : servicesOnto_)
+    {
+      delete serviceOnto;
+    }
+  }
 
 
@@ -17 +22 @@
   {
     SuperClass::parse(node);
+    if (node.goToChildElement())
+    {
+      do
+      {
+        CServiceNode* serviceOnto = new CServiceNode();
+        serviceOnto->parse( node );
+        if ( (serviceOnto->name.isEmpty()) || (serviceOnto->type.isEmpty()) )
+        {
+          ERROR("void CServiceNode::parse(xml::CXMLNode & node)",<<"Service onto is not defined correctly <name> and <type> must be specified")
+        }
+        servicesOnto_.push_back( serviceOnto );
+      } while (node.goToNextElement());
+      node.goToParentElement();
+    }
   }
 
@@ -62 +81 @@
     
     servicesManager->createServices(poolId, serviceId, serviceType, nbRessources, nb_partitions, true) ;
+
+    for(auto& serviceOnto : servicesOnto_)
+    {
+      if (serviceOnto->type.getValue() == type_attr::writer) serviceType=CServicesManager::WRITER ;
+      else if (serviceOnto->type.getValue() == type_attr::reader) serviceType=CServicesManager::READER ;
+      else if (serviceOnto->type.getValue() == type_attr::gatherer) serviceType=CServicesManager::GATHERER ;
+      servicesManager->createServicesOnto(poolId, serviceOnto->name, serviceType, serviceId, true) ;
+    }
+    
     if (CThreadManager::isUsingThreads())
       for(int i=0; i<nb_partitions; i++)

XIOS3/trunk/src/node/service_node.hpp

@@ -59 +59 @@
       virtual void parse(xml::CXMLNode & node);
       void allocateRessources(const string& poolId) ;
+      std::vector<CServiceNode*> servicesOnto_;
 
   }; // class CServiceNode