Changeset 2423 for XIOS3

Timestamp:

10/27/22 13:56:18 (18 months ago)

Author:

jderouillat

Message:

Introduce partially trunk's developement to manage N2 servers (especially to put in order the send of closeDefinition to N2 servers)

Location:

XIOS3/branches/xios-3.0-beta/src/node

Files:

• context.cpp (modified) (2 diffs)
• context.hpp (modified) (1 diff)

XIOS3/branches/xios-3.0-beta/src/node/context.cpp

@@ -640 +640 @@
         serverPrimServer.push_back(server);  
 
-      
+        // Already integrated in trunk with new service management commit ids = [2405-2407]
+        clientsId_[client] = CXios::getContextsManager()->getServerContextName( CXios::defaultPoolId, CXios::defaultServerId, i, type, getContextId() ) ;
       }
     }
@@ -1104 +1105 @@
     if (serviceType_==CServicesManager::CLIENT) 
     {
-      for(auto field : fileOutField) slaveServers_.insert(field->getContextClient()) ; 
-      for(auto field : fileInField) slaveServers_.insert(field->getContextClient()) ; 
-    }
-    else if (serviceType_==CServicesManager::GATHERER) 
-      for(auto field : fileOutField) slaveServers_.insert(field->getContextClient()) ; 
+      // Intermediary implementation looking at trunk service management commit ids = [2405-2407]
+      //  -> slaveServers from trunk (std::vector), going through a std::set
+      //  -> clientsId_ not implemented for CLIENT for now (while done in trunk within the new service management)
+      set< CContextClient*>  slaves ; // need an ordered list ;
+      for(auto field : fileOutField) slaves.insert(field->getContextClient()) ; 
+      for(auto field : fileInField) slaves.insert(field->getContextClient()) ; 
+      for(auto& slave : slaves) slaveServers_.push_back(slave) ;
+    }
+    else if (serviceType_==CServicesManager::GATHERER)
+    {
+      // Already integrated in trunk with new service management commit ids = [2405-2407]
+      map<string, CContextClient*> slaves ; // need an ordered list ;
+      for(auto field : fileOutField) slaves[clientsId_[field->getContextClient()]] = field->getContextClient() ;
+      for(auto& slave : slaves) slaveServers_.push_back(slave.second) ;
+    }
 
     for(auto& slaveServer : slaveServers_) sendCloseDefinition(slaveServer) ;

XIOS3/branches/xios-3.0-beta/src/node/context.hpp

@@ -314 +314 @@
 
          // list of slave servers (IO server or others)
-         set<CContextClient*> slaveServers_ ;
+         // Already in trunk within the new service management, commit ids = [2405-2407]
+         std::vector<CContextClient*> slaveServers_ ;
+         std::map<CContextClient*, std::string> clientsId_ ;
+
       private:
          // the map containing context client associated to it string id for coupling out ;