Changeset 2343 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp

Timestamp:

06/29/22 18:19:45 (2 years ago)

Author:

ymipsl

Message:

• Implement new infrastructure for transfert protocol.
• new purelly one sided protocol is now available, the previous protocol (legacy, mix send/recv and one sided) is still available. Other specific protocol could be implemented more easilly in future.
• switch can be operate with "transport_protocol" variable in XIOS context :

ex:
<variable id="transport_protocol" type="string">one_sided</variable>

Available protocols are : one_sided, legacy or default. The default protocol is "legacy".

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp (modified) (7 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp

@@ -7 +7 @@
 #include "duration.hpp"
 
-#include "context_client.hpp"
-#include "context_server.hpp"
+#include "legacy_context_client.hpp"
+#include "legacy_context_server.hpp"
+#include "one_sided_context_client.hpp"
+#include "one_sided_context_server.hpp"
 #include "nc4_data_output.hpp"
 #include "node_type.hpp"
@@ -532 +534 @@
     comms.push_back(intraCommClient);
     // attached_mode=parentServerContext_->isAttachedMode() ; //ym probably inherited from source context
-    server = new CContextServer(this,intraComm_, interCommServer); // check if we need to dupl. intraComm_ ?
-    client = new CContextClient(this,intraCommClient,interCommClient);
+    server = CContextServer::getNew(this,intraComm_, interCommServer); // check if we need to dupl. intraComm_ ?
+    client = CContextClient::getNew(this,intraCommClient,interCommClient);
     client->setAssociatedServer(server) ;  
     server->setAssociatedClient(client) ;  
@@ -594 +596 @@
       intraCommClient=intraComm_ ;
       MPI_Comm_dup(intraComm_, &intraCommServer) ;
-      client = new CContextClient(this, intraCommClient, interCommClient);
-      server = new CContextServer(this, intraCommServer, interCommServer);
+      client = CContextClient::getNew(this, intraCommClient, interCommClient);
+      server = CContextServer::getNew(this, intraCommServer, interCommServer);
       client->setAssociatedServer(server) ;
       server->setAssociatedClient(client) ;
@@ -631 +633 @@
         MPI_Comm_dup(intraComm_, &intraCommServer) ;
 
-        CContextClient* client = new CContextClient(this, intraCommClient, interCommClient) ;
-        CContextServer* server = new CContextServer(this, intraCommServer, interCommServer) ;
+        CContextClient* client = CContextClient::getNew(this, intraCommClient, interCommClient) ;
+        CContextServer* server = CContextServer::getNew(this, intraCommServer, interCommServer) ;
         client->setAssociatedServer(server) ;
         server->setAssociatedClient(client) ;
@@ -728 +730 @@
         MPI_Comm_dup(interComm, &interCommClient) ;
         MPI_Comm_dup(interComm, &interCommServer) ;
-        CContextClient* client = new CContextClient(this, intraCommClient, interCommClient);
-        CContextServer* server = new CContextServer(this, intraCommServer, interCommServer);
+        CContextClient* client = CContextClient::getNew(this, intraCommClient, interCommClient);
+        CContextServer* server = CContextServer::getNew(this, intraCommServer, interCommServer);
         client->setAssociatedServer(server) ;
         server->setAssociatedClient(client) ;
@@ -750 +752 @@
        MPI_Comm_dup(interComm, &interCommServer) ;
        MPI_Comm_dup(interComm, &interCommClient) ;
-       CContextServer* server = new CContextServer(this, intraCommServer, interCommServer);
-       CContextClient* client = new CContextClient(this, intraCommClient, interCommClient);
+       CContextServer* server = CContextServer::getNew(this, intraCommServer, interCommServer);
+       CContextClient* client = CContextClient::getNew(this, intraCommClient, interCommClient);
        client->setAssociatedServer(server) ;
        server->setAssociatedClient(client) ;
@@ -765 +767 @@
    {
       registryOut->hierarchicalGatherRegistry() ;
-      if (server->intraCommRank==0) CXios::getRegistryManager()->merge(*registryOut) ;
+      if (server->getIntraCommRank()==0) CXios::getRegistryManager()->merge(*registryOut) ;
 
       if (serviceType_==CServicesManager::CLIENT)