Changeset 1037 for XIOS/dev/branch_yushan/src/server.cpp

Timestamp:

01/25/17 16:25:17 (7 years ago)

Author:

yushan

Message:

initialize the branch

File:

• XIOS/dev/branch_yushan/src/server.cpp (modified) (21 diffs)

XIOS/dev/branch_yushan/src/server.cpp

@@ -9 +9 @@
 #include <boost/functional/hash.hpp>
 #include <boost/algorithm/string.hpp>
-#include "mpi.hpp"
+//#include "mpi.hpp"
 #include "tracer.hpp"
 #include "timer.hpp"
@@ -26 +26 @@
     bool CServer::finished=false ;
     bool CServer::is_MPI_Initialized ;
+
+    
     CEventScheduler* CServer::eventScheduler = 0;
    
     void CServer::initialize(void)
     {
-      int initialized ;
-      MPI_Initialized(&initialized) ;
-      if (initialized) is_MPI_Initialized=true ;
-      else is_MPI_Initialized=false ;
-
       // Not using OASIS
       if (!CXios::usingOasis)
       {
 
-        if (!is_MPI_Initialized)
-        {
-          MPI_Init(NULL, NULL);
-        }
         CTimer::get("XIOS").resume() ;
 
@@ -50 +43 @@
         unsigned long* hashAll ;
 
-//        int rank ;
+
         int size ;
         int myColor ;
@@ -77 +70 @@
 
         myColor=colors[hashServer] ;
-        MPI_Comm_split(MPI_COMM_WORLD,myColor,rank,&intraComm) ;
-
+
+
+        MPI_Comm_split(CXios::globalComm,myColor,rank,&intraComm) ;
+
+        
         int serverLeader=leaders[hashServer] ;
         int clientLeader;
@@ -96 +92 @@
              MPI_Intercomm_create(intraComm,0,CXios::globalComm,clientLeader,0,&newComm) ;
              interComm.push_back(newComm) ;
+             printf("after inter create, interComm.size = %lu\n", interComm.size());
            }
          }
@@ -104 +101 @@
       else
       {
-//        int rank ,size;
         int size;
         if (!is_MPI_Initialized) oasis_init(CXios::xiosCodeId);
@@ -148 +144 @@
      
       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);
 
@@ -158 +158 @@
       {
         if (CXios::usingOasis) oasis_finalize();
-        else MPI_Finalize() ;
+        else  {MPI_Finalize() ; printf("CServer::finalize called MPI_finalize\n");}
       }
+
+      
       report(0)<<"Performance report : Time spent for XIOS : "<<CTimer::get("XIOS server").getCumulatedTime()<<endl  ;
       report(0)<<"Performance report : Time spent in processing events : "<<CTimer::get("Process events").getCumulatedTime()<<endl  ;
@@ -174 +176 @@
          if (isRoot)
          {
-           listenContext();
-           if (!finished) listenFinalize() ;
+           listenContext(); 
+           if (!finished) listenFinalize() ; 
          }
          else
          {
-           listenRootContext();
-           if (!finished) listenRootFinalize() ;
-         }
-
+           listenRootContext(); 
+           if (!finished) 
+           {
+             listenRootFinalize() ; 
+           }
+         }
+         
          contextEventLoop() ;
          if (finished && contextList.empty()) stop=true ;
+         
          eventScheduler->checkEvent() ;
        }
+       
+       
        CTimer::get("XIOS server").suspend() ;
      }
@@ -195 +203 @@
         int msg ;
         int flag ;
+        
 
         for(it=interComm.begin();it!=interComm.end();it++)
@@ -205 +214 @@
            {
               MPI_Recv(&msg,1,MPI_INT,0,0,*it,&status) ;
+              printf(" CServer : Receive client finalize\n");
               info(20)<<" CServer : Receive client finalize"<<endl ;
+
               MPI_Comm_free(&(*it));
               interComm.erase(it) ;
@@ -234 +245 @@
         MPI_Status status ;
         int msg ;
-
+        
         traceOff() ;
         MPI_Iprobe(0,4,intraComm, &flag, &status) ;
@@ -249 +260 @@
 
        MPI_Status status ;
-       int flag ;
-       static char* buffer ;
+       int flag = false ;
+       static void* buffer ;
        static MPI_Request request ;
        static bool recept=false ;
        int rank ;
-       int count ;
+       int count ; 
 
        if (recept==false)
-       {
+       {      
          traceOff() ;
          MPI_Iprobe(MPI_ANY_SOURCE,1,CXios::globalComm, &flag, &status) ;
          traceOn() ;
+         
          if (flag==true)
          {
+           #ifdef _usingMPI
            rank=status.MPI_SOURCE ;
+           #elif _usingEP
+           rank= status.ep_src ;
+           #endif
            MPI_Get_count(&status,MPI_CHAR,&count) ;
            buffer=new char[count] ;
-           MPI_Irecv((void*)buffer,count,MPI_CHAR,rank,1,CXios::globalComm,&request) ;
+           MPI_Irecv(buffer,count,MPI_CHAR,rank,1,CXios::globalComm,&request) ;
            recept=true ;
          }
+          
        }
        else
@@ -277 +294 @@
          if (flag==true)
          {
+           #ifdef _usingMPI
            rank=status.MPI_SOURCE ;
+           #elif _usingEP
+           rank= status.ep_src ;
+           #endif
            MPI_Get_count(&status,MPI_CHAR,&count) ;
-           recvContextMessage((void*)buffer,count) ;
+           recvContextMessage(buffer,count) ;
+           printf("listerContext register context OK, interComm size = %lu\n", interComm.size());
+           
            delete [] buffer ;
            recept=false ;
@@ -322 +345 @@
          MPI_Waitall(size-1,requests,status) ;
          registerContext(buff,count,it->second.leaderRank) ;
+         printf("recvContextMessage register context OK\n");
 
          recvContextId.erase(it) ;
@@ -335 +359 @@
        MPI_Status status ;
        int flag ;
-       static char* buffer ;
+       static void* buffer ;
        static MPI_Request request ;
        static bool recept=false ;
@@ -341 +365 @@
        int count ;
        const int root=0 ;
+       
 
        if (recept==false)
@@ -351 +376 @@
            MPI_Get_count(&status,MPI_CHAR,&count) ;
            buffer=new char[count] ;
-           MPI_Irecv((void*)buffer,count,MPI_CHAR,root,2,intraComm,&request) ;
+           MPI_Irecv(buffer,count,MPI_CHAR,root,2,intraComm,&request) ;
            recept=true ;
          }
@@ -361 +386 @@
          {
            MPI_Get_count(&status,MPI_CHAR,&count) ;
-           registerContext((void*)buffer,count) ;
+           registerContext(buffer,count) ;
+           printf("listenRootContext register context OK, interComm size = %lu\n", interComm.size());
            delete [] buffer ;
            recept=false ;
@@ -381 +407 @@
 
        MPI_Comm contextIntercomm;
+       
        MPI_Intercomm_create(intraComm,0,CXios::globalComm,leaderRank,10+leaderRank,&contextIntercomm);
 
@@ -386 +413 @@
        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);
+       
+       printf(" ****   server: register context OK\n");
      }