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

Timestamp:

11/07/16 17:55:55 (7 years ago)

Author:

oabramkina

Message:

My branch

Location:

XIOS/dev/dev_olga

Files:

• . (copied) (copied from XIOS/trunk)
• src/server.cpp (modified) (16 diffs)

XIOS/dev/dev_olga/src/server.cpp

@@ -3 +3 @@
 #include "cxios.hpp"
 #include "server.hpp"
+#include "client.hpp"
 #include "type.hpp"
 #include "context.hpp"
@@ -19 +20 @@
     list<MPI_Comm> CServer::interComm ;
     std::list<MPI_Comm> CServer::contextInterComms;
-    bool CServer::isRoot ;
+    bool CServer::isRoot = false ;
     int CServer::rank = INVALID_RANK;
     StdOFStream CServer::m_infoStream;
@@ -27 +28 @@
     bool CServer::is_MPI_Initialized ;
     CEventScheduler* CServer::eventScheduler = 0;
-   
+
+//---------------------------------------------------------------
+/*!
+ * \fn void CServer::initialize(void)
+ * Function creates intra and inter comm for each initialized server pool
+ */
     void CServer::initialize(void)
     {
@@ -45 +51 @@
         CTimer::get("XIOS").resume() ;
 
+        int nbSrvLevels = 2;
+
         boost::hash<string> hashString ;
-
-        unsigned long hashServer=hashString(CXios::xiosCodeId) ;
+        unsigned long hashServer1 = hashString(CXios::xiosCodeIdPrm);
+        unsigned long hashServer2 = hashString(CXios::xiosCodeIdSnd);
+        unsigned long hashServer = (CXios::serverLevel < 2)  ? hashServer1 : hashServer2;
+
         unsigned long* hashAll ;
 
@@ -56 +66 @@
         MPI_Comm newComm ;
 
-        MPI_Comm_size(CXios::globalComm,&size) ;
-        MPI_Comm_rank(CXios::globalComm,&rank);
+        MPI_Comm_size(CXios::globalComm, &size) ;
+        MPI_Comm_rank(CXios::globalComm, &rank);
         hashAll=new unsigned long[size] ;
-
-        MPI_Allgather(&hashServer,1,MPI_LONG,hashAll,1,MPI_LONG,CXios::globalComm) ;
+        MPI_Allgather(&hashServer, 1, MPI_LONG, hashAll, 1, MPI_LONG, CXios::globalComm) ;
 
         map<unsigned long, int> colors ;
@@ -77 +86 @@
 
         myColor=colors[hashServer] ;
-        MPI_Comm_split(MPI_COMM_WORLD,myColor,rank,&intraComm) ;
-
-        int serverLeader=leaders[hashServer] ;
-        int clientLeader;
-
-         serverLeader=leaders[hashServer] ;
-         for(it=leaders.begin();it!=leaders.end();it++)
-         {
-           if (it->first!=hashServer)
-           {
-             clientLeader=it->second ;
-             int intraCommSize, intraCommRank ;
-             MPI_Comm_size(intraComm,&intraCommSize) ;
-             MPI_Comm_rank(intraComm,&intraCommRank) ;
-             info(50)<<"intercommCreate::server "<<rank<<" intraCommSize : "<<intraCommSize
-                     <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
-
-             MPI_Intercomm_create(intraComm,0,CXios::globalComm,clientLeader,0,&newComm) ;
-             interComm.push_back(newComm) ;
-           }
-         }
-
-         delete [] hashAll ;
+        MPI_Comm_split(MPI_COMM_WORLD, myColor, rank, &intraComm) ;
+
+        if (CXios::serverLevel == 0)
+        {
+          int clientLeader;
+          for(it=leaders.begin();it!=leaders.end();it++)
+          {
+            if (it->first!=hashServer)
+            {
+              clientLeader=it->second ;
+              int intraCommSize, intraCommRank ;
+              MPI_Comm_size(intraComm,&intraCommSize) ;
+              MPI_Comm_rank(intraComm,&intraCommRank) ;
+              info(50)<<"intercommCreate::server "<<rank<<" intraCommSize : "<<intraCommSize
+                       <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
+
+               MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
+               interComm.push_back(newComm) ;
+            }
+          }
+        }
+
+        else if ((CXios::serverLevel == 1))
+        {
+          int clientLeader;
+          int srvSndLeader;
+          for(it=leaders.begin();it!=leaders.end();it++)
+          {
+            if (it->first != hashServer2)
+            {
+              if (it->first != hashServer1)
+              {
+                clientLeader=it->second ;
+                int intraCommSize, intraCommRank ;
+                MPI_Comm_size(intraComm,&intraCommSize) ;
+                MPI_Comm_rank(intraComm,&intraCommRank) ;
+                info(50)<<"intercommCreate::server "<<rank<<" intraCommSize : "<<intraCommSize
+                         <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
+                MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
+                interComm.push_back(newComm) ;
+              }
+            }
+            else
+            {
+              srvSndLeader = it->second;
+            }
+          }
+
+        CClient::initializeClientOnServer(rank, intraComm, srvSndLeader);
+        }
+
+        else // secondary server pool
+        {
+          int clientLeader;
+          for(it=leaders.begin();it!=leaders.end();it++)
+          {
+            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 ;
+              MPI_Comm_size(intraComm,&intraCommSize) ;
+              MPI_Comm_rank(intraComm,&intraCommRank) ;
+              info(50)<<"intercommCreate::server "<<rank<<" intraCommSize : "<<intraCommSize
+                       <<" intraCommRank :"<<intraCommRank<<"  clientLeader "<< clientLeader<<endl ;
+
+              MPI_Intercomm_create(intraComm, 0, CXios::globalComm, clientLeader, 0, &newComm) ;
+              interComm.push_back(newComm) ;
+
+              break;
+            }
+          }
+        }
+
+        delete [] hashAll ;
+
       }
       // using OASIS
@@ -145 +207 @@
     void CServer::finalize(void)
     {
+      if (CXios::serverLevel == 1)
+      {
+        CClient::finalize();
+      }
+
       CTimer::get("XIOS").suspend() ;
      
@@ -151 +218 @@
       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);
 
@@ -172 +241 @@
        while(!stop)
        {
+
          if (isRoot)
          {
@@ -186 +256 @@
          if (finished && contextList.empty()) stop=true ;
          eventScheduler->checkEvent() ;
+
        }
        CTimer::get("XIOS server").suspend() ;
@@ -288 +359 @@
      void CServer::recvContextMessage(void* buff,int count)
      {
-       static map<string,contextMessage> recvContextId ;
+       static map<string,contextMessage> recvContextId;
+
        map<string,contextMessage>::iterator it ;
 
@@ -362 +434 @@
            MPI_Get_count(&status,MPI_CHAR,&count) ;
            registerContext(buffer,count) ;
+
            delete [] buffer ;
            recept=false ;
@@ -373 +446 @@
        CBufferIn buffer(buff, count);
        buffer >> contextId;
+       CContext* context;
 
        info(20) << "CServer : Register new Context : " << contextId << endl;
@@ -380 +454 @@
                << "Context '" << contextId << "' has already been registred");
 
-       MPI_Comm contextIntercomm;
-       MPI_Intercomm_create(intraComm,0,CXios::globalComm,leaderRank,10+leaderRank,&contextIntercomm);
+       MPI_Comm contextInterComm;
+       MPI_Intercomm_create(intraComm,0,CXios::globalComm,leaderRank,10+leaderRank,&contextInterComm);
 
        MPI_Comm inter;
-       MPI_Intercomm_merge(contextIntercomm,1,&inter);
+       MPI_Intercomm_merge(contextInterComm,1,&inter);
        MPI_Barrier(inter);
 
-       CContext* context=CContext::create(contextId);
+       context=CContext::create(contextId);
        contextList[contextId]=context;
-       context->initServer(intraComm,contextIntercomm);
-
-       contextInterComms.push_back(contextIntercomm);
+       context->initServer(intraComm,contextInterComm);
+       contextInterComms.push_back(contextInterComm);
+
+       if (CXios::serverLevel == 1)
+       {
+         CClient::registerContext(contextId, intraComm);
+       }
+
        MPI_Comm_free(&inter);
+
      }
 
@@ -399 +479 @@
        bool finished ;
        map<string,CContext*>::iterator it ;
+
        for(it=contextList.begin();it!=contextList.end();it++)
        {
@@ -408 +489 @@
          }
        }
-
      }