From: Christian Heinrich <franz-christian.heinrich@inria.fr>
Date: Fri, 13 Apr 2018 08:08:59 +0000 (+0200)
Subject: [SMPI] Replay: Move ActionWait to the RequestStore
X-Git-Tag: v3.20~445
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8fc62f8b40bf977a42f16281950ce7564cd6f91a

[SMPI] Replay: Move ActionWait to the RequestStore
---

diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp
index e75c8e236c..e7c7a07a15 100644
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -567,9 +567,9 @@ public:
   void kernel(simgrid::xbt::ReplayAction& action) override
   {
     std::string s = boost::algorithm::join(action, " ");
-    xbt_assert(get_reqq_self()->size(), "action wait not preceded by any irecv or isend: %s", s.c_str());
-    MPI_Request request = get_reqq_self()->back();
-    get_reqq_self()->pop_back();
+    xbt_assert(req_storage->size(), "action wait not preceded by any irecv or isend: %s", s.c_str());
+    MPI_Request request = req_storage->find(args.src, args.dst, args.tag);
+    req_storage->remove(request);
 
     if (request == MPI_REQUEST_NULL) {
       /* Assume that the trace is well formed, meaning the comm might have been caught by a MPI_test. Then just