MC: Trade less use of executed_req for more network messages

[simgrid.git] / src / mc / checker / CommunicationDeterminismChecker.cpp

diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp
index a5042f9..e402b1e 100644 (file)
--- a/src/mc/checker/CommunicationDeterminismChecker.cpp
+++ b/src/mc/checker/CommunicationDeterminismChecker.cpp
@@ -125,7 +125,7 @@ namespace simgrid {
 namespace mc {
 
 void CommunicationDeterminismChecker::deterministic_comm_pattern(aid_t process, const PatternCommunication* comm,
-                                                                 int backtracking)
+                                                                 bool backtracking)
 {
   if (not backtracking) {
     PatternCommunicationList& list = initial_communications_pattern[process];
@@ -175,7 +175,7 @@ void CommunicationDeterminismChecker::deterministic_comm_pattern(aid_t process,
 
 /********** Non Static functions ***********/
 
-void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, CallType call_type, int backtracking)
+void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, CallType call_type, bool backtracking)
 {
   const smx_actor_t issuer                                     = api::get().simcall_get_issuer(request);
   const mc::PatternCommunicationList& initial_pattern          = initial_communications_pattern[issuer->get_pid()];
@@ -228,8 +228,8 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca
   incomplete_communications_pattern[issuer->get_pid()].push_back(pattern.release());
 }
 
-void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr<kernel::activity::CommImpl> const& comm_addr, aid_t issuer,
-                                                            int backtracking)
+void CommunicationDeterminismChecker::complete_comm_pattern(RemotePtr<kernel::activity::CommImpl> const& comm_addr,
+                                                            aid_t issuer, bool backtracking)
 {
   /* Complete comm pattern */
   std::vector<PatternCommunication*>& incomplete_pattern = incomplete_communications_pattern[issuer];
@@ -269,10 +269,8 @@ RecordTrace CommunicationDeterminismChecker::get_record_trace() // override
 std::vector<std::string> CommunicationDeterminismChecker::get_textual_trace() // override
 {
   std::vector<std::string> trace;
-  for (auto const& state : stack_) {
-    smx_simcall_t req = &state->executed_req_;
-    trace.push_back(api::get().request_to_string(req, state->transition_.times_considered_));
-  }
+  for (auto const& state : stack_)
+    trace.push_back(api::get().request_to_string(state->transition_.aid_, state->transition_.times_considered_));
   return trace;
 }
 
@@ -381,7 +379,8 @@ void CommunicationDeterminismChecker::restoreState()
   }
 }
 
-void CommunicationDeterminismChecker::handle_comm_pattern(simgrid::mc::CallType call_type, smx_simcall_t req, int value, int backtracking)
+void CommunicationDeterminismChecker::handle_comm_pattern(simgrid::mc::CallType call_type, smx_simcall_t req, int value,
+                                                          bool backtracking)
 {
   using simgrid::mc::CallType;
   switch(call_type) {
@@ -409,7 +408,6 @@ void CommunicationDeterminismChecker::handle_comm_pattern(simgrid::mc::CallType
 void CommunicationDeterminismChecker::real_run()
 {
   std::unique_ptr<VisitedState> visited_state = nullptr;
-  smx_simcall_t req                           = nullptr;
 
   while (not stack_.empty()) {
     /* Get current state */
@@ -422,19 +420,20 @@ void CommunicationDeterminismChecker::real_run()
     /* Update statistics */
     api::get().mc_inc_visited_states();
 
+    bool found_transition = false;
     if (stack_.size() <= (std::size_t)_sg_mc_max_depth)
-      req = api::get().mc_state_choose_request(cur_state);
-    else
-      req = nullptr;
+      found_transition = api::get().mc_state_choose_request(cur_state);
 
-    if (req != nullptr && visited_state == nullptr) {
+    if (found_transition && visited_state == nullptr) {
+      aid_t aid         = cur_state->transition_.aid_;
       int req_num = cur_state->transition_.times_considered_;
+      smx_simcall_t req = &cur_state->executed_req_;
 
-      XBT_DEBUG("Execute: %s", api::get().request_to_string(req, req_num).c_str());
+      XBT_DEBUG("Execute: %s", api::get().request_to_string(aid, req_num).c_str());
 
       std::string req_str;
       if (dot_output != nullptr)
-        req_str = api::get().request_get_dot_output(req, req_num);
+        req_str = api::get().request_get_dot_output(aid, req_num);
 
       api::get().mc_inc_executed_trans();