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

Timestamp:

03/14/17 19:12:25 (7 years ago)

Author:

yushan

Message:

Using threads : modif for xios_initialize

File:

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

XIOS/dev/branch_yushan/src/cxios.cpp

@@ -22 +22 @@
   bool CXios::isServer ;
   MPI_Comm CXios::globalComm ;
+  // #pragma omp threadprivate(CXios::globalComm)
+
   bool CXios::usingOasis ;
   bool CXios::usingServer = false;
@@ -35 +37 @@
   {    
     set_new_handler(noMemory);
-    parseFile(rootFile);
+    //#pragma omp critical(_output)
+    #pragma omp master
+    {
+      parseFile(rootFile);  
+    }
     parseXiosConfig();
   }
@@ -45 +51 @@
   void CXios::parseXiosConfig()
   {
+
     usingOasis=getin<bool>("using_oasis",false) ;
     usingServer=getin<bool>("using_server",false) ;
@@ -63 +70 @@
     bufferSizeFactor = getin<double>("buffer_size_factor", defaultBufferSizeFactor);
     minBufferSize = getin<int>("min_buffer_size", 1024 * sizeof(double));
-
+ 
     int num_ep;
-    if(isClient) 
+    if(isClient)  
     { 
-      num_ep = 1;
+      num_ep = omp_get_num_threads();
+      printf("Client %d: num_ep = %d\n", omp_get_thread_num(), num_ep);
     }
     
     if(isServer) 
     { 
-      num_ep = 1; 
+      num_ep = omp_get_num_threads();
+      printf("Server %d: num_ep = %d\n", omp_get_thread_num(), num_ep); 
     }
     
     MPI_Info info;
-    MPI_Comm *ep_comm;
-    if(omp_get_thread_num()==0)
-    {
+    #pragma omp master
+    {
+      MPI_Comm *ep_comm;
       MPI_Comm_create_endpoints(MPI_COMM_WORLD, num_ep, info, ep_comm);  // servers should reach here too.
       passage = ep_comm;  
@@ -86 +95 @@
       
     globalComm = passage[omp_get_thread_num()];
+
+    int tmp_rank;
+    MPI_Comm_rank(MPI_COMM_WORLD, &tmp_rank);
+    if(isClient) printf("client thread %d/%d, globalComm = %p\n", omp_get_thread_num(), tmp_rank, &passage[omp_get_thread_num()]);
+    if(isServer) printf("server thread %d/%d, globalComm = %p\n", omp_get_thread_num(), tmp_rank, &passage[omp_get_thread_num()]);
     
   }