Changeset 992 for XIOS/dev/dev_olga/src/server.cpp

Timestamp:

11/16/16 18:00:52 (7 years ago)

Author:

oabramkina

Message:

First rebond on the secondary server pool. XIOS finalizes correctly.

File:

• XIOS/dev/dev_olga/src/server.cpp (modified) (10 diffs)

XIOS/dev/dev_olga/src/server.cpp

@@ -18 +18 @@
 {
     MPI_Comm CServer::intraComm ;
+    list<MPI_Comm> CServer::interCommLeft ;
+    list<MPI_Comm> CServer::interCommRight ;
     list<MPI_Comm> CServer::interComm ;
     std::list<MPI_Comm> CServer::contextInterComms;
@@ -103 +105 @@
 
                MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
+               interCommLeft.push_back(newComm) ;
                interComm.push_back(newComm) ;
             }
@@ -125 +128 @@
                          <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
                 MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
+                interCommLeft.push_back(newComm) ;
                 interComm.push_back(newComm) ;
               }
@@ -134 +138 @@
           }
 
-        CClient::initializeClientOnServer(rank, intraComm, srvSndLeader);
+          CClient::initializeClientOnServer(rank, intraComm, srvSndLeader);
+          interCommRight.push_back(CClient::getInterComm());
+          interComm.push_back(CClient::getInterComm());
+
         }
 
@@ -144 +151 @@
             if (it->first == hashServer1)
             {
-              // no changes needed here to create one context per process of the secondary server pool
               clientLeader=it->second ;
               int intraCommSize, intraCommRank ;
@@ -153 +159 @@
 
               MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
+              interCommLeft.push_back(newComm) ;
               interComm.push_back(newComm) ;
 
@@ -207 +214 @@
     void CServer::finalize(void)
     {
-      if (CXios::serverLevel == 1)
-      {
-        CClient::finalize();
-      }
 
       CTimer::get("XIOS").suspend() ;
@@ -219 +222 @@
         MPI_Comm_free(&(*it));
 
-      for (std::list<MPI_Comm>::iterator it = interComm.begin(); it != interComm.end(); it++)
+//      for (std::list<MPI_Comm>::iterator it = interComm.begin(); it != interComm.end(); it++)
+//        MPI_Comm_free(&(*it));
+
+      for (std::list<MPI_Comm>::iterator it = interCommLeft.begin(); it != interCommLeft.end(); it++)
+        MPI_Comm_free(&(*it));
+
+      for (std::list<MPI_Comm>::iterator it = interCommRight.begin(); it != interCommRight.end(); it++)
         MPI_Comm_free(&(*it));
 
@@ -263 +272 @@
      void CServer::listenFinalize(void)
      {
-        list<MPI_Comm>::iterator it;
+        list<MPI_Comm>::iterator it, itr;
         int msg ;
         int flag ;
 
-        for(it=interComm.begin();it!=interComm.end();it++)
+        for(it=interCommLeft.begin();it!=interCommLeft.end();it++)
         {
            MPI_Status status ;
@@ -275 +284 @@
            if (flag==true)
            {
-              MPI_Recv(&msg,1,MPI_INT,0,0,*it,&status) ;
-              info(20)<<" CServer : Receive client finalize"<<endl ;
+             MPI_Recv(&msg,1,MPI_INT,0,0,*it,&status) ;
+             info(20)<<" CServer : Receive client finalize"<<endl ;
+
+             // If primary server, send finalize to secondary server pool(s)
+             for(itr=interCommRight.begin(); itr!=interCommRight.end(); itr++)
+             {
+               MPI_Send(&msg,1,MPI_INT,0,0,*itr) ;
+
+//               MPI_Comm_free(&(*itr));
+//               interCommRight.erase(itr) ;
+             }
+
               MPI_Comm_free(&(*it));
-              interComm.erase(it) ;
+//              interComm.erase(it) ;
+              interCommLeft.erase(it) ;
               break ;
             }
          }
 
-         if (interComm.empty())
+        if (interCommLeft.empty())
+//        if (interComm.empty())
          {
            int i,size ;