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

Timestamp:

03/13/17 17:21:04 (7 years ago)

Author:

oabramkina

Message:

dev: test for secondary servers added.

File:

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

XIOS/dev/dev_olga/src/server.cpp

@@ -22 +22 @@
 //    list<MPI_Comm> CServer::interComm ;
     std::list<MPI_Comm> CServer::contextInterComms;
+    std::list<MPI_Comm> CServer::contextIntraComms;
     int CServer::serverLevel = 0 ;
-    int CServer::serverLeader = 0;
-    int CServer::serverSize = 0;
+    int CServer::serverLeader_ = 0;
+    int CServer::serverSize_ = 0;
     int CServer::nbPools = 0;
     int CServer::poolId = 0;
+    int CServer::nbContexts_ = 0;
     bool CServer::isRoot = false ;
     int CServer::rank = INVALID_RANK;
@@ -103 +105 @@
         {
           int serverRank = rank - leaders[hashServer]; // server proc rank starting 0
-          serverSize = size - leaders[hashServer];
-          nbPools = serverSize * CXios::ratioServer2 / 100;
-          if ( serverRank < (serverSize - nbPools) )
+          serverSize_ = size - leaders[hashServer];
+          nbPools = serverSize_ * CXios::ratioServer2 / 100;
+          if ( serverRank < (serverSize_ - nbPools) )
           {
             serverLevel = 1;
@@ -112 +114 @@
           {
             serverLevel = 2;
-            poolId = serverRank - serverSize + nbPools;
+            poolId = serverRank - serverSize_ + nbPools;
             myColor = rank;
           }
@@ -156 +158 @@
             }
             else
-              serverLeader = it->second;
+              serverLeader_ = it->second;
           }
 
           for (int i = 0; i < nbPools; ++i)
           {
-            srvSndLeader = serverLeader + serverSize - nbPools + i;
+            srvSndLeader = serverLeader_ + serverSize_ - nbPools + i;
             int intraCommSize, intraCommRank ;
             MPI_Comm_size(intraComm, &intraCommSize) ;
@@ -239 +241 @@
 
       for (std::list<MPI_Comm>::iterator it = contextInterComms.begin(); it != contextInterComms.end(); it++)
+        MPI_Comm_free(&(*it));
+
+      for (std::list<MPI_Comm>::iterator it = contextIntraComms.begin(); it != contextIntraComms.end(); it++)
         MPI_Comm_free(&(*it));
 
@@ -310 +315 @@
               {
                 MPI_Send(&msg,1,MPI_INT,0,0,*itr) ;
-//                itr = interCommRight.erase(itr) ;
               }
               MPI_Comm_free(&(*it));
@@ -488 +492 @@
        contextList[contextId]=context;
 
-       // All type of servers initialize its own server (CContextServer)
+       // Primary or classical server: initialize its own server (CContextServer)
+       MPI_Comm inter;
        if (serverLevel < 2)
        {
          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);
@@ -499 +503 @@
          context->initServer(intraComm,contextInterComm);
          contextInterComms.push_back(contextInterComm);
-       }
+
+       }
+       // Secondary server: initialize its own server (CContextServer)
        else if (serverLevel == 2)
        {
-         context->initServer(intraComm, interCommLeft.front());
+         MPI_Comm_dup(interCommLeft.front(), &inter);
+         contextInterComms.push_back(inter);
+         context->initServer(intraComm, contextInterComms.back());
+//         context->initServer(intraComm, interCommLeft.front());
        }
 
@@ -520 +529 @@
            CBufferOut buffer(buff,messageSize) ;
            buffer<<msg ;
-           int sndServerGloRanks = serverSize-nbPools+serverLeader +i;  // the assumption is that there is only one proc per secondary server pool
+           int sndServerGloRanks = serverSize_-nbPools+serverLeader_ +i;  // the assumption is that there is only one proc per secondary server pool
            MPI_Send(buff, buffer.count(), MPI_CHAR, sndServerGloRanks, 1, CXios::globalComm) ;
-           context->initClient(intraComm, *it) ;
+           MPI_Comm_dup(*it, &inter);
+           contextInterComms.push_back(inter);
+           MPI_Comm_dup(intraComm, &inter);
+           contextIntraComms.push_back(inter);
+           context->initClient(contextIntraComms.back(), contextInterComms.back()) ;
+//           context->initClient(intraComm, contextPrimInterComms.back()) ;
+//           context->initClient(intraComm, *it) ;
            delete [] buff ;
          }
+         ++nbContexts_;
        }
      }
@@ -539 +555 @@
          if (finished)
          {
+//           it->second->freeComms();  // deallocate internally allcoated context communicators
            contextList.erase(it) ;
            break ;
          }
          else
+         {
            finished=it->second->checkBuffersAndListen();
+         }
        }
      }
@@ -579 +598 @@
       {
         if (serverLevel == 1)
-          id = rank-serverLeader;
+          id = rank-serverLeader_;
         else
           id = poolId;