Don't display strings with %p [Mahesh Ketkar]

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

diff --git a/src/mc/mc_comm_pattern.cpp b/src/mc/mc_comm_pattern.cpp
index 9a3d3b5b34dcc85af21b07b9ca257b61045e6f54..d2fb5e6b36168b7f53724b263854efe850daece8 100644 (file)
--- a/src/mc/mc_comm_pattern.cpp
+++ b/src/mc/mc_comm_pattern.cpp
@@ -15,7 +15,7 @@ static void MC_patterns_copy(std::vector<simgrid::mc::PatternCommunication*>& de
 {
   dest.clear();
   for (simgrid::mc::PatternCommunication const& comm : source) {
-    simgrid::mc::PatternCommunication* copy_comm = new simgrid::mc::PatternCommunication(comm.dup());
+    auto* copy_comm = new simgrid::mc::PatternCommunication(comm.dup());
     dest.push_back(copy_comm);
   }
 }
@@ -50,8 +50,7 @@ void MC_state_copy_index_communications_pattern(simgrid::mc::State* state)
 void MC_handle_comm_pattern(e_mc_call_type_t call_type, smx_simcall_t req, int value, int backtracking)
 {
   // HACK, do not rely on the Checker implementation outside of it
-  simgrid::mc::CommunicationDeterminismChecker* checker =
-    (simgrid::mc::CommunicationDeterminismChecker*) mc_model_checker->getChecker();
+  auto* checker = static_cast<simgrid::mc::CommunicationDeterminismChecker*>(mc_model_checker->getChecker());
 
   switch(call_type) {
   case MC_CALL_TYPE_NONE:
@@ -65,11 +64,11 @@ void MC_handle_comm_pattern(e_mc_call_type_t call_type, smx_simcall_t req, int v
     {
     simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr{nullptr};
     if (call_type == MC_CALL_TYPE_WAIT)
-      comm_addr = remote(static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req)));
+      comm_addr = remote(simcall_comm_wait__getraw__comm(req));
 
     else {
       simgrid::kernel::activity::ActivityImpl* addr;
-      addr      = mc_model_checker->process().read(remote(simcall_comm_waitany__getraw__comms(req) + value));
+      addr = mc_model_checker->get_remote_simulation().read(remote(simcall_comm_waitany__getraw__comms(req) + value));
       comm_addr = remote(static_cast<simgrid::kernel::activity::CommImpl*>(addr));
       }
       checker->complete_comm_pattern(comm_addr, MC_smx_simcall_get_issuer(req)->get_pid(), backtracking);