Changeset 1271 for XIOS/dev

Timestamp:

09/20/17 09:41:51 (7 years ago)

Author:

oabramkina

Message:

Corrections in addition to r1270. The algorithm for registering context is improved to avoid possible interference among contexts.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/server.cpp (modified) (2 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/server.cpp

@@ -615 +615 @@
        static std::vector<void*> buffers;
        static std::vector<MPI_Request> requests ;
-       static std::vector<bool> recept;
        static std::vector<int> counts ;
+       static std::vector<bool> isEventRegistered ;
        MPI_Request request;
 
-//       void* buffer ;
-//       static MPI_Request request ;
-//       static bool recept=false ;
-//       static int count ;
        int rank ;
        const int root=0 ;
@@ -629 +625 @@
 
        // (1) Receive context id from the root, save it into a buffer
-       if (recept.size() == nbContexts) recept.push_back(false);
-       if (recept[nbContexts]==false)
-       {
-         traceOff() ;
-         MPI_Iprobe(root,2,intraComm, &flag, &status) ;
-         traceOn() ;
-         if (flag==true)
-         {
-           counts.push_back(0);
-           MPI_Get_count(&status,MPI_CHAR,&counts[nbContexts]) ;
-           requests.push_back(request);
-           buffers.push_back(new char[counts[nbContexts]]) ;
-           MPI_Irecv((void*)(buffers.back()),counts.back(),MPI_CHAR,root,2,intraComm,&(requests.back())) ;
-           recept[nbContexts]=true ;
-         }
-       }
-       // (2) If context id is received, register an event
-       else
-       {
-         MPI_Test(&requests[nbContexts],&flag,&status) ;
-         if (flag==true)
-         {
-           eventScheduler->registerEvent(nbContexts,hashId);
-           recept[nbContexts]=false ;
-         }
-       }
-       // (3) If event has been scheduled, call register context
-       if (eventScheduler->queryEvent(nbContexts,hashId))
-       {
-         registerContext(buffers[nbContexts],counts[nbContexts]) ;
-         delete [] buffers[nbContexts] ;
-         ++nbContexts;
-       }
+       traceOff() ;
+       MPI_Iprobe(root,2,intraComm, &flag, &status) ;
+       traceOn() ;
+       if (flag==true)
+       {
+         counts.push_back(0);
+         MPI_Get_count(&status,MPI_CHAR,&(counts.back())) ;
+         buffers.push_back(new char[counts.back()]) ;
+         requests.push_back(request);
+         MPI_Irecv((void*)(buffers.back()),counts.back(),MPI_CHAR,root,2,intraComm,&(requests.back())) ;
+         isEventRegistered.push_back(false);
+         nbContexts++;
+       }
+
+       for (int ctxNb = 0; ctxNb < nbContexts; ctxNb++ )
+       {
+         // (2) If context id is received, register an event
+         MPI_Test(&requests[ctxNb],&flag,&status) ;
+         if (flag==true && !isEventRegistered[ctxNb])
+         {
+           eventScheduler->registerEvent(ctxNb,hashId);
+           isEventRegistered[ctxNb] = true;
+         }
+         // (3) If event has been scheduled, call register context
+         if (eventScheduler->queryEvent(ctxNb,hashId))
+         {
+           registerContext(buffers[ctxNb],counts[ctxNb]) ;
+           delete [] buffers[ctxNb] ;
+         }
+       }
+
      }