Have the application execute its transition before returning SIMCALL_EXECUTE_ANSWER

[simgrid.git] / src / mc / ModelChecker.cpp

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index fdae4fe19d11df535085804a78ddb154be6a01f5..9dbc7412bf4f84e08476a3d047f062ac62896a96 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -318,6 +318,10 @@ Transition* ModelChecker::handle_simcall(aid_t aid, int times_considered, bool n
   m.times_considered_ = times_considered;
   checker_side_.get_channel().send(m);
 
+  this->remote_process_->clear_cache();
+  if (this->remote_process_->running())
+    checker_side_.dispatch(); // The app may send messages while processing the transition
+
   s_mc_message_simcall_execute_answer_t answer;
   ssize_t s = checker_side_.get_channel().receive(answer);
   xbt_assert(s != -1, "Could not receive message");
@@ -327,13 +331,10 @@ Transition* ModelChecker::handle_simcall(aid_t aid, int times_considered, bool n
              to_c_str(answer.type), (int)answer.type, (int)s, (int)MessageType::SIMCALL_EXECUTE_ANSWER,
              (int)sizeof(answer));
 
-  this->remote_process_->clear_cache();
-  if (this->remote_process_->running())
-    checker_side_.dispatch(); // The app may send messages while processing the transition
-
-  if (new_transition)
-    return recv_transition(aid, times_considered, answer.simcall, answer.buffer);
-  else
+  if (new_transition) {
+    std::stringstream stream(answer.buffer.data());
+    return deserialize_transition(aid, times_considered, stream);
+  } else
     return nullptr;
 }
 bool ModelChecker::simcall_is_visible(aid_t aid)