Merge pull request ComputationalRadiationPhysics#1326 from psychocode…

…rHPC/fix-asyncCommunication fix deadlock in asyncSend
ax3l · Jan 11, 2016 · 16b85fe · 16b85fe
2 parents abffb22 + 39158c7
commit 16b85fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/libPMacc/include/memory/buffers/GridBuffer.hpp b/src/libPMacc/include/memory/buffers/GridBuffer.hpp
@@ -519,6 +519,7 @@ class GridBuffer
         {
             __startTransaction(serialEvent + sendEvents[sendEx]);
             sendEvents[sendEx] = sendExchanges[sendEx]->startSend(gpuFree);
+            gpuFree = sendEvents[sendEx];
             __endTransaction();
             return sendEvents[sendEx];
         }

diff --git a/src/libPMacc/include/particles/memory/buffers/ParticlesBuffer.hpp b/src/libPMacc/include/particles/memory/buffers/ParticlesBuffer.hpp
@@ -282,7 +282,7 @@ class ParticlesBuffer
         EventTask exchangeMemoryIndexerGPUEvent;
         EventTask returnEvent = framesExchanges->asyncSend(serialEvent, ex, framesExchangesGPUEvent) +
             exchangeMemoryIndexer->asyncSend(serialEvent, ex, exchangeMemoryIndexerGPUEvent);
-        gpuFree = framesExchangesGPUEvent + exchangeMemoryIndexerGPUEvent;
+        gpuFree = returnEvent;
         return returnEvent;
     }