Changeset 1060 for XIOS/dev/branch_yushan/src

Timestamp:

02/23/17 15:51:56 (7 years ago)

Author:

yushan

Message:

minor corrections + clean up

Location:

XIOS/dev/branch_yushan/src

Files:

• client.cpp (modified) (5 diffs)
• context_client.cpp (modified) (2 diffs)
• context_server.cpp (modified) (1 diff)
• cxios.cpp (modified) (4 diffs)
• interface/c/icdata.cpp (modified) (4 diffs)
• node/context.cpp (modified) (1 diff)
• server.cpp (modified) (8 diffs)
• xios_server.f90 (modified) (1 diff)

XIOS/dev/branch_yushan/src/client.cpp

@@ -24 +24 @@
     StdOFStream CClient::m_errorStream;
 
-    void CClient::initialize(const string& codeId,MPI_Comm& localComm,MPI_Comm& returnComm)
+    void CClient::initialize(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)
     {
       int initialized ;
@@ -161 +161 @@
 
       if (!CXios::isServer)
-      {
-      
-        
-        
+      {      
         int size,rank,globalRank ;
         size_t message_size ;
@@ -191 +188 @@
         delete [] buff ;
         
-        printf("====== Client: begin context_init \n");
+        //printf("====== Client: begin context_init \n");
       
 
@@ -197 +194 @@
         info(10)<<"Register new Context : "<<id<<endl ;
         
-        cout<<"Register new Context : "<<id<<endl ;
+        //cout<<"Register new Context : "<<id<<endl ;
               
 
-        MPI_Comm inter ;
-        MPI_Intercomm_merge(contextInterComm,0,&inter) ;
-        MPI_Barrier(inter) ;
+        // MPI_Comm inter ;
+        // MPI_Intercomm_merge(contextInterComm,0,&inter) ;
+        // MPI_Barrier(inter) ;
         
         
         context->initClient(contextComm,contextInterComm) ;
         
-        printf("====== Client: context_init OK\n");
+        //printf("====== Client: context_init OK\n");
 
         contextInterComms.push_back(contextInterComm);
-        MPI_Comm_free(&inter);
+        // MPI_Comm_free(&inter);
       }
       else
@@ -252 +249 @@
       for (std::list<MPI_Comm>::iterator it = contextInterComms.begin(); it != contextInterComms.end(); it++)
         MPI_Comm_free(&(*it));
+      
       MPI_Comm_free(&interComm);
       MPI_Comm_free(&intraComm);

XIOS/dev/branch_yushan/src/context_client.cpp

@@ -199 +199 @@
       map<int,CClientBuffer*>::iterator itBuff;
       bool pending = false;
+      if(! buffers.empty())
       for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++) pending |= itBuff->second->checkBuffer();
       return pending;
@@ -307 +308 @@
        checkBuffers();
        stop = false;
-       for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++) stop |= itBuff->second->hasPendingRequest();
+       for (itBuff = buffers.begin(); itBuff != buffers.end(); ++itBuff) stop |= itBuff->second->hasPendingRequest();
      }
      CTimer::get("Blocking time").suspend();

XIOS/dev/branch_yushan/src/context_server.cpp

@@ -122 +122 @@
 
     //printf("enter checkPendingRequest\n");
-
+    if(!pendingRequest.empty())
     for(it=pendingRequest.begin();it!=pendingRequest.end();it++)
     {

XIOS/dev/branch_yushan/src/cxios.cpp

@@ -33 +33 @@
   //! Parse configuration file and create some objects from it
   void CXios::initialize()
-  {
-    
-    
+  {    
     set_new_handler(noMemory);
     parseFile(rootFile);
@@ -85 +83 @@
     int tmp_size;
     MPI_Comm_size(globalComm, &tmp_size);
-    printf("globalcomm size = %d\n", tmp_size);
+    if(isClient) printf("Client : globalcomm size = %d\n", tmp_size);
+    if(isServer) printf("Server : globalcomm size = %d\n", tmp_size);
 
     
@@ -176 +175 @@
     // Initialize all aspects MPI
     CServer::initialize();
+    
     if (CServer::getRank()==0) globalRegistry = new CRegistry(CServer::intraComm) ;
     
@@ -193 +193 @@
     CServer::eventLoop();
     
-    printf("server eventloop OK\n");
+    printf("server start finalize \n");
 
     // Finalize

XIOS/dev/branch_yushan/src/interface/c/icdata.cpp

@@ -63 +63 @@
       int initialized;
       MPI_Initialized(&initialized);
-      //if (initialized) local_comm.mpi_comm = MPI_Comm_f2c(*f_local_comm);
+
       if (initialized) local_comm = ep_lib::EP_Comm_f2c(static_cast< int >(*f_local_comm));
       else local_comm = MPI_COMM_NULL;
@@ -73 +73 @@
       *f_return_comm = ep_lib::EP_Comm_c2f(return_comm);
 
-      printf("in icdata.cpp, f_return_comm = %d\n", *f_return_comm);
+      //printf("in icdata.cpp, f_return_comm = %d\n", *f_return_comm);
 
       CTimer::get("XIOS init").suspend();
@@ -91 +91 @@
      CClient::registerContext(str, comm);
      
-     printf("icdata.cpp: client register context OK\n");
+     //printf("icdata.cpp: client register context OK\n");
      
      CTimer::get("XIOS init context").suspend();
@@ -128 +128 @@
      
      CContext* context = CContext::getCurrent();
-     //printf("CContext* context = CContext::getCurrent();\n");
      context->finalize();
      
-     //printf("client context_finalize OK\n");
+     printf("client context_finalize OK\n");
      
      CTimer::get("XIOS context finalize").suspend();

XIOS/dev/branch_yushan/src/node/context.cpp

@@ -369 +369 @@
           closeAllFile();
           registryOut->hierarchicalGatherRegistry() ;
-          //registryOut->gatherRegistry() ;
           if (server->intraCommRank==0) CXios::globalRegistry->mergeRegistry(*registryOut) ;
         }

XIOS/dev/branch_yushan/src/server.cpp

@@ -32 +32 @@
     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() ;
@@ -79 +88 @@
 
          serverLeader=leaders[hashServer] ;
-         for(it=leaders.begin();it!=leaders.end();it++)
+         for(it=leaders.begin();it!=leaders.end();++it)
          {
            if (it->first!=hashServer)
@@ -92 +101 @@
              MPI_Intercomm_create(intraComm,0,CXios::globalComm,clientLeader,0,&newComm) ;
              interComm.push_back(newComm) ;
-             printf("after inter create, interComm.size = %lu\n", interComm.size());
+             //printf("after inter create, interComm.size = %lu\n", interComm.size());
            }
          }
@@ -131 +140 @@
       }
 
-//      int rank;
       MPI_Comm_rank(intraComm,&rank) ;
       if (rank==0) isRoot=true;
@@ -147 +155 @@
       
 
-      for (std::list<MPI_Comm>::iterator it = contextInterComms.begin(); it != contextInterComms.end(); it++)
+      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++)
+      for (std::list<MPI_Comm>::iterator it = interComm.begin(); it != interComm.end(); ++it)
         MPI_Comm_free(&(*it));
 
@@ -214 +222 @@
            {
               MPI_Recv(&msg,1,MPI_INT,0,0,*it,&status) ;
-              printf(" CServer : Receive client finalize\n");
+              printf(" CServer : Receive finalize sign from client 0\n");
               info(20)<<" CServer : Receive client finalize"<<endl ;
 
@@ -410 +418 @@
        MPI_Intercomm_create(intraComm,0,CXios::globalComm,leaderRank,10+leaderRank,&contextIntercomm);
 
-       MPI_Comm inter;
-       MPI_Intercomm_merge(contextIntercomm,1,&inter);
-       MPI_Barrier(inter);
+       // MPI_Comm inter;
+       // MPI_Intercomm_merge(contextIntercomm,1,&inter);
+       // MPI_Barrier(inter);
        
 
@@ -424 +432 @@
        
        
-       MPI_Comm_free(&inter);
-       
-       printf(" ****   server: register context OK\n");
+       // MPI_Comm_free(&inter);
+       
+       //printf(" ****   server: register context OK\n");
      }
 

XIOS/dev/branch_yushan/src/xios_server.f90

@@ -1 +1 @@
 PROGRAM server_main
   USE xios
+  USE mod_wait
   IMPLICIT NONE
   INCLUDE "mpif.h"
   INTEGER :: ierr
-  
+    
+    CALL MPI_INIT(ierr)
+    CALL init_wait
     CALL xios_init_server