Changeset 1079 for XIOS/dev/branch_yushan/src/client.cpp

Timestamp:

03/17/17 18:02:20 (7 years ago)

Author:

yushan

Message:

backup modification

File:

• XIOS/dev/branch_yushan/src/client.cpp (modified) (8 diffs)

XIOS/dev/branch_yushan/src/client.cpp

@@ -38 +38 @@
 // localComm doesn't given
 
-        printf("check : localComm == MPI_COMM_NULL = %d\n", localComm == MPI_COMM_NULL);
-
         if (localComm == MPI_COMM_NULL)
         {
@@ -69 +67 @@
           MPI_Comm_rank(CXios::globalComm,&rank);
 
-          printf("client init : codeId = %s, xiosCodeId = %s, rank = %d(%d), size = %d\n", codeId, CXios::xiosCodeId, rank, omp_get_thread_num(), size);
+          printf("client init : rank = %d, size = %d\n", rank, size);
           
 
@@ -107 +105 @@
           if (CXios::usingServer)
           {
-            int clientLeader=leaders[hashClient] ;
+            //int clientLeader=leaders[hashClient] ;
             serverLeader=leaders[hashServer] ;
 
@@ -116 +114 @@
             {
               info(50)<<"intercommCreate::client "<<rank<<" intraCommSize : "<<intraCommSize
-                 <<" intraCommRank :"<<intraCommRank<<"  serverLeader "<< serverLeader<<endl ;  
+                 <<" intraCommRank :"<<intraCommRank<<"  serverLeader "<< serverLeader
+                 <<" globalComm : "<< &(CXios::globalComm) << endl ;  
             }
             
             MPI_Intercomm_create(intraComm,0,CXios::globalComm,serverLeader,0,&interComm) ;
+
+            int interCommSize, interCommRank ;
+            MPI_Comm_size(interComm,&interCommSize) ;
+            MPI_Comm_rank(interComm,&interCommRank) ;
+
+            #pragma omp critical(_output)
+            {
+              info(50)<<" interCommRank :"<<interCommRank
+                 <<" interCommSize : "<< interCommSize << endl ;  
+            }
+
 
           }
@@ -176 +186 @@
     void CClient::registerContext(const string& id,MPI_Comm contextComm)
     {
+      //info(50) << "Client "<<getRank() << " start registerContext using info output" << endl;
+      printf("Client %d start registerContext\n", getRank());
+      //printf("Client start registerContext\n");
+
       CContext::setCurrent(id) ;
-      CContext* context=CContext::create(id);
+      printf("Client %d CContext::setCurrent OK\n", getRank());
+      CContext* context = CContext::create(id);
+      printf("Client %d context=CContext::create(%s) OK\n", getRank(), id);
+      
       StdString idServer(id);
       idServer += "_server";
 
-      if (!CXios::isServer)
+      if (!CXios::isServer)  // server mode
       {      
         int size,rank,globalRank ;
@@ -211 +228 @@
 
         MPI_Intercomm_create(contextComm,0,CXios::globalComm,serverLeader,10+globalRank,&contextInterComm) ;
-        //info(10)<<"Register new Context : "<<id<<endl ;
+        
+        #pragma omp critical (_output)
+        info(10)<<"Register new Context : "<<id<<endl ;
                       
 
@@ -217 +236 @@
         MPI_Intercomm_merge(contextInterComm,0,&inter) ;
         MPI_Barrier(inter) ;
+
+        #pragma omp critical (_output)
+        printf("Client %d : MPI_Intercomm_merge OK \n", getRank()) ;
         
         
         context->initClient(contextComm,contextInterComm) ;
+        #pragma omp critical (_output)
+        printf("Client %d : context->initClient(contextComm,contextInterComm) OK \n", getRank()) ;
         
 
@@ -225 +249 @@
         MPI_Comm_free(&inter);
       }
-      else
+      else  // attached mode
       {
         MPI_Comm contextInterComm ;