Changeset 1646 for XIOS/dev/dev_trunk_omp/src/context_client.cpp

Timestamp:

01/31/19 12:12:52 (5 years ago)

Author:

yushan

Message:

branch merged with trunk @1645. arch file (ep&mpi) added for ADA

File:

• XIOS/dev/dev_trunk_omp/src/context_client.cpp (modified) (8 diffs)

XIOS/dev/dev_trunk_omp/src/context_client.cpp

@@ -12 +12 @@
 #include "cxios.hpp"
 #include "server.hpp"
+#ifdef _usingEP
 using namespace ep_lib;
+#endif
 
 namespace xios
@@ -96 +98 @@
     {
       list<int> ranks = event.getRanks();
-
+      #pragma omp critical (_output)
+      {
+        info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<endl ;
+      }
       if (CXios::checkEventSync)
       {
@@ -124 +129 @@
         {
           event.send(timeLine, sizes, buffList);
+          #pragma omp critical (_output)
+          {
+            info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<"  sent"<<endl ;
+          }
 
           checkBuffers(ranks);
@@ -140 +149 @@
           for (list<int>::const_iterator it = sizes.begin(); it != sizes.end(); it++)
             tmpBufferedEvent.buffers.push_back(new CBufferOut(*it));
-          info(100)<<"DEBUG : temporaly event created : timeline "<<timeLine<<endl ;
+          #pragma omp critical (_output)
+          {
+            info(100)<<"DEBUG : temporaly event created : timeline "<<timeLine<<endl ;
+          }
           event.send(timeLine, tmpBufferedEvent.sizes, tmpBufferedEvent.buffers);
+          #pragma omp critical (_output)
+          {
+            info(100)<<"Event "<<timeLine<<" of context "<<context->getId()<<"  sent"<<endl ;
+          }
         }
       }
@@ -167 +183 @@
             (*itBuffer)->put((char*)(*it)->start(), (*it)->count());
 
-          info(100)<<"DEBUG : temporaly event sent "<<endl ;
+          #pragma omp critical (_output)
+          {
+            info(100)<<"DEBUG : temporaly event sent "<<endl ;
+          }
           checkBuffers(tmpBufferedEvent.ranks);
 
@@ -341 +360 @@
        if (ratio < minBufferSizeEventSizeRatio) minBufferSizeEventSizeRatio = ratio;
      }
+     
+     #ifdef _usingEP
      MPI_Allreduce(&minBufferSizeEventSizeRatio, &minBufferSizeEventSizeRatio, 1, MPI_DOUBLE, MPI_MIN, intraComm);
+     #elif _usingMPI
+     MPI_Allreduce(MPI_IN_PLACE, &minBufferSizeEventSizeRatio, 1, MPI_DOUBLE, MPI_MIN, intraComm);
+     #endif
 
      if (minBufferSizeEventSizeRatio < 1.0)
@@ -426 +450 @@
       {
         #pragma omp critical (_output)
-        info(100)<<"DEBUG : Sent context Finalize event to rank "<<*itRank<<endl ;
+        {
+          info(100)<<"DEBUG : Sent context Finalize event to rank "<<*itRank<<endl ;
+        }
         event.push(*itRank, 1, msg);
       }
@@ -452 +478 @@
     {
       #pragma omp critical (_output)
-      report(10) << " Memory report : Context <" << context->getId() << "> : client side : memory used for buffer of each connection to server" << endl
+      {
+        report(10) << " Memory report : Context <" << context->getId() << "> : client side : memory used for buffer of each connection to server" << endl
                  << "  +) To server with rank " << itMap->first << " : " << itMap->second << " bytes " << endl;
+      }
       totalBuf += itMap->second;
     }
     #pragma omp critical (_output)
-    report(0) << " Memory report : Context <" << context->getId() << "> : client side : total memory used for buffer " << totalBuf << " bytes" << endl;
+    {
+      report(0) << " Memory report : Context <" << context->getId() << "> : client side : total memory used for buffer " << totalBuf << " bytes" << endl;
+    }
 
     //releaseBuffers(); // moved to CContext::finalize()