Changeset 655 for XIOS/trunk/src/server.cpp

Timestamp:

07/24/15 16:40:07 (9 years ago)

Author:

rlacroix

Message:

Properly release all MPI resources.

File:

• XIOS/trunk/src/server.cpp (modified) (5 diffs)

XIOS/trunk/src/server.cpp

@@ -18 +18 @@
     MPI_Comm CServer::intraComm ;
     list<MPI_Comm> CServer::interComm ;
+    std::list<MPI_Comm> CServer::contextInterComms;
     bool CServer::isRoot ;
     int CServer::rank = INVALID_RANK;
@@ -110 +111 @@
 
         CTimer::get("XIOS").resume() ;
-        oasis_get_localcomm(intraComm) ;
+        MPI_Comm localComm;
+        oasis_get_localcomm(localComm);
+        MPI_Comm_dup(localComm, &intraComm);
+
         MPI_Comm_rank(intraComm,&rank) ;
         MPI_Comm_size(intraComm,&size) ;
@@ -144 +148 @@
     {
       CTimer::get("XIOS").suspend() ;
-      
+
       delete eventScheduler ;
-      
+
+      for (std::list<MPI_Comm>::iterator it = contextInterComms.begin(); it != contextInterComms.end(); it++)
+        MPI_Comm_free(&(*it));
+      for (std::list<MPI_Comm>::iterator it = interComm.begin(); it != interComm.end(); it++)
+        MPI_Comm_free(&(*it));
+      MPI_Comm_free(&intraComm);
+
       if (!is_MPI_Initialized)
       {
@@ -198 +208 @@
               MPI_Recv(&msg,1,MPI_INT,0,0,*it,&status) ;
               info(20)<<" CServer : Receive client finalize"<<endl ;
+              MPI_Comm_free(&(*it));
               interComm.erase(it) ;
               break ;
@@ -361 +372 @@
 
 
-     void CServer::registerContext(void* buff,int count, int leaderRank)
-     {
-
+     void CServer::registerContext(void* buff, int count, int leaderRank)
+     {
        string contextId;
-       CBufferIn buffer(buff,count) ;
-
-       buffer>>contextId ;
-       MPI_Comm contextIntercomm ;
-       MPI_Intercomm_create(intraComm,0,CXios::globalComm,leaderRank,10+leaderRank,&contextIntercomm) ;
-
-       info(20)<<"CServer : Register new Context : "<<contextId<<endl  ;
-       MPI_Comm inter ;
-       MPI_Intercomm_merge(contextIntercomm,1,&inter) ;
-       MPI_Barrier(inter) ;
+       CBufferIn buffer(buff, count);
+       buffer >> contextId;
+
+       info(20)<<"CServer : Register new Context : "<<contextId<<endl;
+
        if (contextList.find(contextId)!=contextList.end())
         ERROR("void CServer::registerContext(void* buff,int count, int leaderRank)",
-              <<"Context has already been registred") ;
-
-      CContext* context=CContext::create(contextId) ;
-      contextList[contextId]=context ;
-      context->initServer(intraComm,contextIntercomm) ;
-
+              << "Context has already been registred");
+
+       MPI_Comm contextIntercomm;
+       MPI_Intercomm_create(intraComm,0,CXios::globalComm,leaderRank,10+leaderRank,&contextIntercomm);
+
+       MPI_Comm inter;
+       MPI_Intercomm_merge(contextIntercomm,1,&inter);
+       MPI_Barrier(inter);
+
+       CContext* context=CContext::create(contextId);
+       contextList[contextId]=context;
+       context->initServer(intraComm,contextIntercomm);
+
+       contextInterComms.push_back(contextIntercomm);
+       MPI_Comm_free(&inter);
      }