Changeset 634 for XIOS/trunk/src/transformation/transformation_mapping.cpp

Timestamp:

07/15/15 16:36:38 (9 years ago)

Author:

rlacroix

Message:

Transformations: Fix some errors in MPI communications

• Some communications could have caused deadlocks.
• Some communications were not properly checked for completion.

File:

• XIOS/trunk/src/transformation/transformation_mapping.cpp (modified) (3 diffs)

XIOS/trunk/src/transformation/transformation_mapping.cpp

@@ -140 +140 @@
   if (0 != buffSize) recvBuffGlobalIndex = new unsigned long [buffSize];
 
+  std::map<int, MPI_Request> requests;
+
   // Inform all "source clients" about index that they need to send
   for (itMapSrc = itbMapSrc; itMapSrc != iteMapSrc; ++itMapSrc)
   {
-    MPI_Request request;
     unsigned long* sendPtr = const_cast<unsigned long*>(&(itMapSrc->second)[0]);
     MPI_Isend(sendPtr,
@@ -151 +152 @@
               11,
               client->intraComm,
-              &request);
+              &requests[itMapSrc->first]);
   }
 
@@ -177 +178 @@
   }
 
+  std::map<int, MPI_Request>::iterator itRequest;
+  for (itRequest = requests.begin(); itRequest != requests.end(); ++itRequest)
+    MPI_Wait(&itRequest->second, MPI_STATUS_IGNORE);
+
   delete [] sendBuff;
   delete [] recvBuff;