Little simplification.

diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp
index 820d15d..18baf18 100644 (file)
--- a/src/kernel/activity/CommImpl.cpp
+++ b/src/kernel/activity/CommImpl.cpp
@@ -225,16 +225,11 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity:
 
 void simcall_HANDLER_comm_test(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm)
 {
-  bool res;
+  if ((MC_is_active() || MC_record_replay_is_active()) && comm->src_actor_ && comm->dst_actor_)
+    comm->state_ = simgrid::kernel::activity::State::DONE;
 
-  if (MC_is_active() || MC_record_replay_is_active()) {
-    res = comm->src_actor_ && comm->dst_actor_;
-    if (res)
-      comm->state_ = simgrid::kernel::activity::State::DONE;
-  } else {
-    res = comm->state_ != simgrid::kernel::activity::State::WAITING &&
-          comm->state_ != simgrid::kernel::activity::State::RUNNING;
-  }
+  bool res = comm->state_ != simgrid::kernel::activity::State::WAITING &&
+             comm->state_ != simgrid::kernel::activity::State::RUNNING;
 
   simcall_comm_test__set__result(simcall, res);
   if (res) {