Changeset 1228

Timestamp:

07/27/17 19:09:24 (7 years ago)

Author:

oabramkina

Message:

Resolving a deadlock introduced in r1225.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• context_server.cpp (modified) (4 diffs)
• context_server.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/context_server.cpp

@@ -86 +86 @@
     {
       rank=status.MPI_SOURCE ;
-
-      if (pendingRequest.find(rank)==pendingRequest.end()) listenPendingRequest(status) ;
-      else
+      bool okLoop;
+      if (pendingRequest.find(rank)==pendingRequest.end())
+        okLoop = !listenPendingRequest(status) ;
+      if (okLoop)
       {
         for(rank=0;rank<commSize;rank++)
@@ -105 +106 @@
   }
 
-  void CContextServer::listenPendingRequest(MPI_Status& status)
+  bool CContextServer::listenPendingRequest(MPI_Status& status)
   {
     int count;
@@ -119 +120 @@
        mapBufferSize_.insert(std::make_pair(rank, buffSize));
        it=(buffers.insert(pair<int,CServerBuffer*>(rank,new CServerBuffer(buffSize)))).first;
+       return true;
     }
     else
@@ -128 +130 @@
          MPI_Irecv(addr,count,MPI_CHAR,rank,20,interComm,&pendingRequest[rank]);
          bufferRequest[rank]=addr;
+         return true;
        }
+      else
+        return false;
     }
   }

XIOS/dev/XIOS_DEV_CMIP6/src/context_server.hpp

@@ -17 +17 @@
     bool eventLoop(bool enableEventsProcessing = true);
     void listen(void) ;
-    void listenPendingRequest(MPI_Status& status) ;
+    bool listenPendingRequest(MPI_Status& status) ;
     void checkPendingRequest(void) ;
     void processRequest(int rank, char* buff,int count) ;