Remove the hostnames from the CommDet patterns: MC does not have this info anymore

diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp
index 357548a..388e9e2 100644 (file)
--- a/src/mc/checker/CommunicationDeterminismChecker.cpp
+++ b/src/mc/checker/CommunicationDeterminismChecker.cpp
@@ -113,8 +113,6 @@ static void update_comm_pattern(simgrid::mc::PatternCommunication* comm_pattern,
   auto dst_proc = api::get().get_dst_actor(comm_addr);
   comm_pattern->src_proc = src_proc->get_pid();
   comm_pattern->dst_proc = dst_proc->get_pid();
-  comm_pattern->src_host = &api::get().get_actor_host_name(src_proc);
-  comm_pattern->dst_host = &api::get().get_actor_host_name(dst_proc);
 
   if (comm_pattern->data.empty()) {
     comm_pattern->data = api::get().get_pattern_comm_data(comm_addr);
@@ -190,7 +188,6 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca
     pattern->comm_addr = api::get().get_comm_isend_raw_addr(request);
     pattern->rdv       = api::get().get_pattern_comm_rdv(pattern->comm_addr);
     pattern->src_proc  = api::get().get_pattern_comm_src_proc(pattern->comm_addr);
-    pattern->src_host  = &api::get().get_actor_host_name(issuer);
 
 #if HAVE_SMPI
     pattern->tag = api::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_ISEND);
@@ -220,7 +217,6 @@ void CommunicationDeterminismChecker::get_comm_pattern(smx_simcall_t request, Ca
 #endif
     pattern->rdv = api::get().get_pattern_comm_rdv(pattern->comm_addr);
     pattern->dst_proc = api::get().get_pattern_comm_dst_proc(pattern->comm_addr);
-    pattern->dst_host = &api::get().get_actor_host_name(issuer);
   } else
     xbt_die("Unexpected call_type %i", (int)call_type);
 

diff --git a/src/mc/checker/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp
index 1927cc4..e8f39c1 100644 (file)
--- a/src/mc/checker/LivenessChecker.cpp
+++ b/src/mc/checker/LivenessChecker.cpp
@@ -214,11 +214,9 @@ void LivenessChecker::show_acceptance_cycle(std::size_t depth)
 std::vector<std::string> LivenessChecker::get_textual_trace() // override
 {
   std::vector<std::string> trace;
-  for (std::shared_ptr<Pair> const& pair : exploration_stack_) {
-    smx_simcall_t req = &pair->graph_state->executed_req_;
-    if (req->call_ != simix::Simcall::NONE)
-      trace.push_back(pair->graph_state->get_transition()->to_string());
-  }
+  for (std::shared_ptr<Pair> const& pair : exploration_stack_)
+    trace.push_back(pair->graph_state->get_transition()->to_string());
+
   return trace;
 }
 

diff --git a/src/mc/mc_pattern.hpp b/src/mc/mc_pattern.hpp
index be02f98..ba2f560 100644 (file)
--- a/src/mc/mc_pattern.hpp
+++ b/src/mc/mc_pattern.hpp
@@ -25,8 +25,6 @@ public:
   PatternCommunicationType type = PatternCommunicationType::send;
   unsigned long src_proc        = 0;
   unsigned long dst_proc        = 0;
-  const xbt::string* src_host   = nullptr;
-  const xbt::string* dst_host   = nullptr;
   std::string rdv;
   std::vector<char> data;
   int tag   = 0;
@@ -41,7 +39,6 @@ public:
     // src_proc?
     // dst_proc?
     res.dst_proc = this->dst_proc;
-    res.dst_host = this->dst_host;
     res.rdv      = this->rdv;
     res.data     = this->data;
     // tag?