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

Timestamp:

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

Author:

yushan

Message:

initialize the branch

File:

• XIOS/dev/branch_yushan/src/cxios.cpp (modified) (9 diffs)

XIOS/dev/branch_yushan/src/cxios.cpp

@@ -30 +30 @@
   bool CXios::isOptPerformance = true;
   CRegistry* CXios::globalRegistry = 0;
-  double CXios::recvFieldTimeout = 10.0;
 
   //! Parse configuration file and create some objects from it
   void CXios::initialize()
   {
+    
+    
     set_new_handler(noMemory);
     parseFile(rootFile);
@@ -64 +65 @@
     bufferSizeFactor = getin<double>("buffer_size_factor", defaultBufferSizeFactor);
     minBufferSize = getin<int>("min_buffer_size", 1024 * sizeof(double));
-    recvFieldTimeout = getin<double>("recv_field_timeout", 10.0);
-    if (recvFieldTimeout < 0.0)
-      ERROR("CXios::parseXiosConfig()", "recv_field_timeout cannot be negative.");
-
-    globalComm=MPI_COMM_WORLD ;
+
+    int num_ep;
+    if(isClient) 
+    { 
+      num_ep = 1;
+    }
+    
+    if(isServer) 
+    { 
+      num_ep = 1; 
+    }
+    
+    MPI_Info info;
+    MPI_Comm *ep_comm;
+    MPI_Comm_create_endpoints(MPI_COMM_WORLD, num_ep, info, ep_comm); 
+      
+    globalComm = ep_comm[0];
+    
+    int tmp_size;
+    MPI_Comm_size(globalComm, &tmp_size);
+    printf("globalcomm size = %d\n", tmp_size);
+
+    
   }
 
@@ -79 +98 @@
   void CXios::initClientSide(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)
   {
+    isClient = true;
+    
     initialize() ;
 
-    isClient = true;
-
+   
     CClient::initialize(codeId,localComm,returnComm) ;
     if (CClient::getRank()==0) globalRegistry = new CRegistry(returnComm) ;
@@ -89 +109 @@
     // and the clients are also servers
     isServer = !usingServer;
-
+    
+    
     if (printLogs2Files)
     {
@@ -100 +121 @@
       CClient::openErrorStream();
     }
+    
+   
   }
 
@@ -123 +146 @@
   void CXios::initServer()
   {
+    int initialized;
+    MPI_Initialized(&initialized);
+    if (initialized) CServer::is_MPI_Initialized=true ;
+    else CServer::is_MPI_Initialized=false ;
+      
+ 
+    if(!CServer::is_MPI_Initialized)
+    {
+      MPI_Init(NULL, NULL);
+    }
+      
     set_new_handler(noMemory);
     std::set<StdString> parseList;
@@ -133 +167 @@
   void CXios::initServerSide(void)
   {
-    initServer();
+    
     isClient = false;
     isServer = true;
-
+    
+    initServer();
+    
+    
     // Initialize all aspects MPI
     CServer::initialize();
     if (CServer::getRank()==0) globalRegistry = new CRegistry(CServer::intraComm) ;
     
+      
     if (printLogs2Files)
     {
@@ -151 +189 @@
       CServer::openErrorStream();
     }
-
+    
     // Enter the loop to listen message from Client
     CServer::eventLoop();
+    
+    printf("server eventloop OK\n");
 
     // Finalize
@@ -162 +202 @@
        delete globalRegistry ;
      }
+     
+     printf("server globalRegistry OK\n");
+     
     CServer::finalize();
+    
+    printf("server finalize OK\n");
+    
     CServer::closeInfoStream();
   }