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

Timestamp:

03/17/17 15:05:36 (7 years ago)

Author:

oabramkina

Message:

dev: Intermediate commit

Done:
Registries: ok with two server levels

To do (on a single server level):
test_complete
reading

File:

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

XIOS/dev/dev_olga/src/server.cpp

@@ -30 +30 @@
     int CServer::nbContexts_ = 0;
     bool CServer::isRoot = false ;
-    int CServer::rank = INVALID_RANK;
+    int CServer::rank_ = INVALID_RANK;
     StdOFStream CServer::m_infoStream;
     StdOFStream CServer::m_errorStream;
@@ -81 +81 @@
 
         MPI_Comm_size(CXios::globalComm, &size) ;
-        MPI_Comm_rank(CXios::globalComm, &rank);
+        MPI_Comm_rank(CXios::globalComm, &rank_);
 
         hashAll=new unsigned long[size] ;
@@ -104 +104 @@
         if (CXios::usingServer2)
         {
-          int serverRank = rank - leaders[hashServer]; // server proc rank starting 0
+          int serverRank = rank_ - leaders[hashServer]; // server proc rank starting 0
           serverSize_ = size - leaders[hashServer];
           nbPools = serverSize_ * CXios::ratioServer2 / 100;
@@ -115 +115 @@
             serverLevel = 2;
             poolId = serverRank - serverSize_ + nbPools;
-            myColor = rank;
+            myColor = rank_;
           }
         }
 
-        MPI_Comm_split(CXios::globalComm, myColor, rank, &intraComm) ;
+        MPI_Comm_split(CXios::globalComm, myColor, rank_, &intraComm) ;
 
         if (serverLevel == 0)
@@ -132 +132 @@
               MPI_Comm_size(intraComm,&intraCommSize) ;
               MPI_Comm_rank(intraComm,&intraCommRank) ;
-              info(50)<<"intercommCreate::server "<<rank<<" intraCommSize : "<<intraCommSize
+              info(50)<<"intercommCreate::server "<<rank_<<" intraCommSize : "<<intraCommSize
                        <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
 
@@ -152 +152 @@
               MPI_Comm_size(intraComm, &intraCommSize) ;
               MPI_Comm_rank(intraComm, &intraCommRank) ;
-              info(50)<<"intercommCreate::server "<<rank<<" intraCommSize : "<<intraCommSize
+              info(50)<<"intercommCreate::server "<<rank_<<" intraCommSize : "<<intraCommSize
                        <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
               MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
@@ -167 +167 @@
             MPI_Comm_size(intraComm, &intraCommSize) ;
             MPI_Comm_rank(intraComm, &intraCommRank) ;
-            info(50)<<"intercommCreate::client "<<rank<<" intraCommSize : "<<intraCommSize
+            info(50)<<"intercommCreate::client "<<rank_<<" intraCommSize : "<<intraCommSize
                 <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< srvSndLeader<<endl ;
             MPI_Intercomm_create(intraComm, 0, CXios::globalComm, srvSndLeader, 0, &newComm) ;
@@ -180 +180 @@
           MPI_Comm_size(intraComm, &intraCommSize) ;
           MPI_Comm_rank(intraComm, &intraCommRank) ;
-          info(50)<<"intercommCreate::server "<<rank<<" intraCommSize : "<<intraCommSize
+          info(50)<<"intercommCreate::server "<<rank_<<" intraCommSize : "<<intraCommSize
                    <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
 
@@ -202 +202 @@
         MPI_Comm_dup(localComm, &intraComm);
 
-        MPI_Comm_rank(intraComm,&rank) ;
+        MPI_Comm_rank(intraComm,&rank_) ;
         MPI_Comm_size(intraComm,&size) ;
         string codesId=CXios::getin<string>("oasis_codes_id") ;
@@ -217 +217 @@
         {
           oasis_get_intercomm(newComm,*it) ;
-          if (rank==0) MPI_Send(&globalRank,1,MPI_INT,0,0,newComm) ;
+          if (rank_==0) MPI_Send(&globalRank,1,MPI_INT,0,0,newComm) ;
           MPI_Comm_remote_size(newComm,&size);
 //          interComm.push_back(newComm) ;
@@ -225 +225 @@
       }
 
-      int rankServer;
-      MPI_Comm_rank(intraComm, &rankServer) ;
-      if (rankServer==0) isRoot=true;
+      MPI_Comm_rank(intraComm, &rank_) ;
+      if (rank_==0) isRoot=true;
       else isRoot=false;
       
@@ -249 +248 @@
 //        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 = interCommLeft.begin(); it != interCommLeft.end(); it++)
+//          MPI_Comm_free(&(*it));
 
         for (std::list<MPI_Comm>::iterator it = interCommRight.begin(); it != interCommRight.end(); it++)
@@ -524 +523 @@
          {
            StdString str = contextId +"_server_" + boost::lexical_cast<string>(i);
-           msg<<str<<size<<rank ;
+           msg<<str<<size<<rank_ ;
            messageSize = msg.size() ;
            buff = new char[messageSize] ;
@@ -555 +554 @@
          if (finished)
          {
-//           it->second->freeComms();  // deallocate internally allcoated context communicators
+           it->second->freeComms();  // deallocate internally allocated context communicators
            contextList.erase(it) ;
            break ;
          }
          else
-         {
            finished=it->second->checkBuffersAndListen();
-         }
        }
      }
@@ -569 +566 @@
      int CServer::getRank()
      {
-       return rank;
+       return rank_;
      }
 
@@ -598 +595 @@
       {
         if (serverLevel == 1)
-          id = rank-serverLeader_;
+          id = rank_;
         else
           id = poolId;