Changeset 655

Timestamp:

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

Author:

rlacroix

Message:

Properly release all MPI resources.

Location:

XIOS/trunk/src

Files:

• client.cpp (modified) (5 diffs)
• client.hpp (modified) (1 diff)
• node/context.cpp (modified) (3 diffs)
• node/context.hpp (modified) (1 diff)
• server.cpp (modified) (5 diffs)
• server.hpp (modified) (1 diff)
• test/test_client.f90 (modified) (1 diff)
• test/test_complete.f90 (modified) (1 diff)
• test/test_cs.f90 (modified) (1 diff)
• test/test_new_features.f90 (modified) (1 diff)
• test/test_unstruct_complete.f90 (modified) (1 diff)
• test/test_xios_interface.f90 (modified) (1 diff)

XIOS/trunk/src/client.cpp

@@ -17 +17 @@
     MPI_Comm CClient::intraComm ;
     MPI_Comm CClient::interComm ;
+    std::list<MPI_Comm> CClient::contextInterComms;
     int CClient::serverLeader ;
     bool CClient::is_MPI_Initialized ;
@@ -128 +129 @@
         {
           if (!is_MPI_Initialized) oasis_init(codeId) ;
-          oasis_get_localcomm(intraComm) ;
-        }
-        else MPI_Comm_dup(localComm,&intraComm) ;
+          oasis_get_localcomm(localComm) ;
+        }
+        MPI_Comm_dup(localComm,&intraComm) ;
+
         CTimer::get("XIOS").resume() ;
         CTimer::get("XIOS init").resume() ;
@@ -191 +193 @@
 
         context->initClient(contextComm,contextInterComm) ;
+
+        contextInterComms.push_back(contextInterComm);
+        MPI_Comm_free(&inter);
       }
       else
@@ -206 +211 @@
         // Finally, we should return current context to context client
         CContext::setCurrent(id);
-//        context->initServer(contextComm,contextInterComm) ;
+
+        contextInterComms.push_back(contextInterComm);
       }
     }
@@ -223 +229 @@
       }
 
-     CTimer::get("XIOS finalize").suspend() ;
-     CTimer::get("XIOS").suspend() ;
+      for (std::list<MPI_Comm>::iterator it = contextInterComms.begin(); it != contextInterComms.end(); it++)
+        MPI_Comm_free(&(*it));
+      MPI_Comm_free(&interComm);
+      MPI_Comm_free(&intraComm);
+
+      CTimer::get("XIOS finalize").suspend() ;
+      CTimer::get("XIOS").suspend() ;
 
       if (!is_MPI_Initialized)

XIOS/trunk/src/client.hpp

@@ -16 +16 @@
         static MPI_Comm intraComm;
         static MPI_Comm interComm;
+        static std::list<MPI_Comm> contextInterComms;
         static int serverLeader;
         static bool is_MPI_Initialized ;

XIOS/trunk/src/node/context.cpp

@@ -248 +248 @@
      {
        MPI_Comm_dup(intraComm, &intraCommServer);
+       comms.push_back(intraCommServer);
        MPI_Comm_dup(interComm, &interCommServer);
+       comms.push_back(interCommServer);
      }
      server = new CContextServer(this,intraCommServer,interCommServer);
@@ -303 +305 @@
      {
        MPI_Comm_dup(intraComm, &intraCommClient);
+       comms.push_back(intraCommClient);
        MPI_Comm_dup(interComm, &interCommClient);
+       comms.push_back(interCommClient);
      }
      client = new CContextClient(this,intraCommClient,interCommClient, cxtClient);
@@ -338 +342 @@
           closeAllFile();
         }
+
+        for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
+          MPI_Comm_free(&(*it));
+        comms.clear();
       }
    }

XIOS/trunk/src/node/context.hpp

@@ -219 +219 @@
          StdString idServer_;
          CGarbageCollector garbageCollector;
-
+         std::list<MPI_Comm> comms; //!< Communicators allocated internally
 
       public: // Some function maybe removed in the near future

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);
      }
 

XIOS/trunk/src/server.hpp

@@ -25 +25 @@
         static MPI_Comm intraComm;
         static list<MPI_Comm> interComm;
+        static std::list<MPI_Comm> contextInterComms;
         static CEventScheduler* eventScheduler;
 

XIOS/trunk/src/test/test_client.f90

@@ -133 +133 @@
   DEALLOCATE(lon, lat, field_A, lonvalue)
 
+  CALL MPI_COMM_FREE(comm, ierr)
+
   CALL xios_finalize()
 

XIOS/trunk/src/test/test_complete.f90

@@ -264 +264 @@
 !!! Fin de XIOS
 
+    CALL MPI_COMM_FREE(comm, ierr)
+
     CALL xios_finalize()
 

XIOS/trunk/src/test/test_cs.f90

@@ -145 +145 @@
     DEALLOCATE(mask)
 
+    CALL MPI_COMM_FREE(comm, ierr)
+
     CALL xios_finalize()
 

XIOS/trunk/src/test/test_new_features.f90

@@ -178 +178 @@
   DEALLOCATE(mask)
 
+  CALL MPI_COMM_FREE(comm, ierr)
+
   CALL xios_finalize()
 

XIOS/trunk/src/test/test_unstruct_complete.f90

@@ -238 +238 @@
   DEALLOCATE(data_i_index)
 
-    CALL xios_finalize()
+  CALL MPI_COMM_FREE(comm, ierr)
+
+  CALL xios_finalize()
 
   END PROGRAM test_unstruct_complete

XIOS/trunk/src/test/test_xios_interface.f90

@@ -345 +345 @@
 !!! Fin de XIOS
 
+    CALL MPI_COMM_FREE(comm, ierr)
+
     CALL xios_finalize()