Changeset 2589 for XIOS3/trunk/src/server.cpp

Timestamp:

10/06/23 11:32:05 (9 months ago)

Author:

jderouillat

Message:

Specify the usage of the xios namespace to overload the MPI funtions

File:

• XIOS3/trunk/src/server.cpp (modified) (9 diffs)

XIOS3/trunk/src/server.cpp

@@ -101 +101 @@
         delete[] hashAll ;
 
-        MPI_Comm_split(globalComm, color, commRank, &serverComm) ;
+        xios::MPI_Comm_split(globalComm, color, commRank, &serverComm) ;
         CXios::getMpiGarbageCollector().registerCommunicator(serverComm) ;
 
@@ -119 +119 @@
         driver_->getComponentCommunicator( serverComm );
       }
-      MPI_Comm_dup(serverComm, &intraComm_);
+      xios::MPI_Comm_dup(serverComm, &intraComm_);
       CXios::getMpiGarbageCollector().registerCommunicator(intraComm_) ;
       
@@ -142 +142 @@
         MPI_Comm splitComm,interComm ;
         MPI_Comm_rank(globalComm,&commGlobalRank) ;
-        MPI_Comm_split(globalComm, 1, commGlobalRank, &splitComm) ;
+        xios::MPI_Comm_split(globalComm, 1, commGlobalRank, &splitComm) ;
         MPI_Comm_rank(splitComm,&commRank) ;
         if (commRank==0) serverLeader=commGlobalRank ;
@@ -149 +149 @@
         MPI_Allreduce(&clientLeader,&clientRemoteLeader,1,MPI_INT,MPI_SUM,globalComm) ;
         MPI_Allreduce(&serverLeader,&serverRemoteLeader,1,MPI_INT,MPI_SUM,globalComm) ;
-        MPI_Intercomm_create(splitComm, 0, globalComm, clientRemoteLeader,1341,&interComm) ;
-        MPI_Intercomm_merge(interComm,false,&xiosGlobalComm) ;
+        xios::MPI_Intercomm_create(splitComm, 0, globalComm, clientRemoteLeader,1341,&interComm) ;
+        xios::MPI_Intercomm_merge(interComm,false,&xiosGlobalComm) ;
         CXios::setXiosComm(xiosGlobalComm) ;
       }
@@ -167 +167 @@
       int commRank ;
       MPI_Comm_rank(CXios::getXiosComm(), &commRank) ;
-      MPI_Comm_split(CXios::getXiosComm(),true,commRank,&serversComm_) ;
+      xios::MPI_Comm_split(CXios::getXiosComm(),true,commRank,&serversComm_) ;
       CXios::getMpiGarbageCollector().registerCommunicator(serversComm_) ;
       
@@ -442 +442 @@
 
       MPI_Comm intraComm ;
-      MPI_Comm_dup(serverComm,&intraComm) ;
+      xios::MPI_Comm_dup(serverComm,&intraComm) ;
       MPI_Comm interComm ;
       for(int i=0 ; i<clientsRank.size(); i++)
       {  
-        MPI_Intercomm_create(intraComm, 0, globalComm, clientsRank[i], 3141, &interComm);
+        xios::MPI_Intercomm_create(intraComm, 0, globalComm, clientsRank[i], 3141, &interComm);
         CXios::getMpiGarbageCollector().registerCommunicator(interComm) ;
         interCommLeft.push_back(interComm) ;
-        MPI_Comm_free(&intraComm) ;
-        MPI_Intercomm_merge(interComm,false, &intraComm ) ;
+        xios::MPI_Comm_free(&intraComm) ;
+        xios::MPI_Intercomm_merge(interComm,false, &intraComm ) ;
       }
       xiosGlobalComm=intraComm ;  
@@ -485 +485 @@
         {  
           MPI_Comm_accept(portName, MPI_INFO_NULL, 0, intraComm, &interComm);
-          MPI_Intercomm_merge(interComm,false, &intraComm ) ;
+          xios::MPI_Intercomm_merge(interComm,false, &intraComm ) ;
         }
 */      
@@ -590 +590 @@
 
       for (std::list<MPI_Comm>::iterator it = contextInterComms.begin(); it != contextInterComms.end(); it++)
-        MPI_Comm_free(&(*it));
+        xios::MPI_Comm_free(&(*it));
 
       for (std::list<MPI_Comm>::iterator it = contextIntraComms.begin(); it != contextIntraComms.end(); it++)
-        MPI_Comm_free(&(*it));
+        xios::MPI_Comm_free(&(*it));
 
         for (std::list<MPI_Comm>::iterator it = interCommRight.begin(); it != interCommRight.end(); it++)
-          MPI_Comm_free(&(*it));
-
-//      MPI_Comm_free(&intraComm);
+          xios::MPI_Comm_free(&(*it));
+
+//      xios::MPI_Comm_free(&intraComm);
       CXios::finalizeDaemonsManager();
       finalizeServersRessource();
@@ -606 +606 @@
       CXios::getMpiGarbageCollector().release() ; // release unfree MPI ressources
       MPI_Comm xiosComm=CXios::getXiosComm() ;
-      MPI_Comm_free(&xiosComm) ;
+      xios::MPI_Comm_free(&xiosComm) ;
       CMemChecker::logMem( "CServer::finalize", true );