Bug fix

wrench-project · Dec 9, 2023 · 9a0ad2c · 9a0ad2c
1 parent 76d238b
commit 9a0ad2c
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/wrench/simgrid_S4U_util/S4U_CommPort.cpp b/src/wrench/simgrid_S4U_util/S4U_CommPort.cpp
@@ -107,13 +107,15 @@ namespace wrench {
         }
 
         if (log) WRENCH_DEBUG("Getting a message from commport '%s' with timeout %lf sec", this->s4u_mb->get_cname(), timeout);
-        SimulationMessage *msg;
+
+        SimulationMessage *msg_mb;
+        SimulationMessage *msg_mq;
 
         WRENCH_INFO("IN GET MESSAGE FOR COMMPORT %p", this);
         simgrid::s4u::ActivitySet pending_receives;
-        auto mb_comm = this->s4u_mb->get_async<SimulationMessage>(&msg);
+        auto mb_comm = this->s4u_mb->get_async<SimulationMessage>(&msg_mb);
         pending_receives.push(mb_comm);
-        auto mq_comm = this->s4u_mq->get_async<SimulationMessage>(&msg);
+        auto mq_comm = this->s4u_mq->get_async<SimulationMessage>(&msg_mq);
         pending_receives.push(mq_comm);
 
         WRENCH_INFO("IN GET MESSAGE: %p(%s)   %p(%s)",
@@ -151,14 +153,18 @@ namespace wrench {
 
         WRENCH_DEBUG("Got the message\n");
 
+        SimulationMessage *msg = nullptr;
+
         WRENCH_INFO("XXX IN GET MESSAGE NBEFIORE CENCEL");
         if (finished_recv == mb_comm) {
+            msg = msg_mb;
             WRENCH_INFO("IT WAS THE MB_COM");
             WRENCH_INFO("CANCELING %p", mq_comm.get());
             mq_comm->cancel();
             WRENCH_INFO("WAITING ON %p", mb_comm.get());
 //            mb_comm->wait();
         } else if (finished_recv == mq_comm) {
+            msg = msg_mq;
             mb_comm->cancel();
 //            mq_comm->wait();
         }