Changeset 1377 for XIOS/dev/XIOS_DEV_CMIP6/src/context_client.cpp

Timestamp:

12/13/17 16:06:32 (6 years ago)

Author:

ymipsl

Message:

• Add more debugging information at info_level 100
• Enforce synchronisation check for event on client side, using parameter "check_event_sync" at true

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/context_client.cpp (modified) (5 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/context_client.cpp

@@ -96 +96 @@
       list<int> ranks = event.getRanks();
 
+      if (CXios::checkEventSync)
+      {
+        int typeId, classId, typeId_in, classId_in, timeLine_out;
+        typeId_in=event.getTypeId() ;
+        classId_in=event.getClassId() ;
+        MPI_Allreduce(&timeLine,&timeLine_out, 1, MPI_UINT64_T, MPI_SUM, intraComm) ;
+        MPI_Allreduce(&typeId_in,&typeId, 1, MPI_INT, MPI_SUM, intraComm) ;
+        MPI_Allreduce(&classId_in,&classId, 1, MPI_INT, MPI_SUM, intraComm) ;
+        if (typeId/clientSize!=event.getTypeId() || classId/clientSize!=event.getClassId() || timeLine_out/clientSize!=timeLine)
+        {
+           ERROR("void CContextClient::sendEvent(CEventClient& event)",
+               << "Event are not coherent between client.");
+        }
+      }
+
       if (!event.isEmpty())
       {
@@ -124 +139 @@
           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 ;
           event.send(timeLine, tmpBufferedEvent.sizes, tmpBufferedEvent.buffers);
         }
@@ -151 +166 @@
             (*itBuffer)->put((char*)(*it)->start(), (*it)->count());
 
+          info(100)<<"DEBUG : temporaly event sent "<<endl ;
           checkBuffers(tmpBufferedEvent.ranks);
 
@@ -230 +246 @@
             for (int i = 0; i < context->serverPrimServer.size(); ++i)
               context->serverPrimServer[i]->listen();
+//            CServer::contextEventLoop(false) ; // avoid dead-lock at finalize...
           }
 
@@ -406 +423 @@
       const std::list<int>& ranks = getRanksServerLeader();
       for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+      {
+        info(100)<<"DEBUG : Sent context Finalize event to rank "<<*itRank<<endl ;
         event.push(*itRank, 1, msg);
+      }
       sendEvent(event);
     }