dictation corrected

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

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index c4dcd46c64ea8acccb0ce6ce5d15a8ad96b30f1b..8e4d30dbcb959bbd1eaf7eb79d5ed994575618f5 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -18,7 +18,7 @@
 #include "src/smpi/include/smpi_request.hpp"
 #endif
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Fasade APIs ");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Facade APIs ");
 
 using Simcall = simgrid::simix::Simcall;
 
@@ -311,6 +311,21 @@ const char* Api::actor_get_host_name(smx_actor_t actor) const
   return info->hostname;
 }
 
+const char* Api::actor_get_name(smx_actor_t actor) const
+{
+  if (mc_model_checker == nullptr)
+    return actor->get_cname();
+
+  const simgrid::mc::RemoteSimulation* process = &mc_model_checker->get_remote_simulation();
+
+  simgrid::mc::ActorInformation* info = actor_info_cast(actor);
+  if (info->name.empty()) {
+    simgrid::xbt::string_data string_data = simgrid::xbt::string::to_string_data(actor->name_);
+    info->name = process->read_string(remote(string_data.data), string_data.len);
+  }
+  return info->name.c_str();
+}
+
 void Api::initialize(char** argv) const
 {
   simgrid::mc::session = new simgrid::mc::Session([argv] {
@@ -616,9 +631,9 @@ smx_simcall_t Api::mc_state_choose_request(simgrid::mc::State* state) const
   return nullptr;
 }
 
-std::list<udpor_transition_t> Api::get_enabled_transitions(simgrid::mc::State* state)
+std::list<transition_detail_t> Api::get_enabled_transitions(simgrid::mc::State* state)
 {
-  std::list<udpor_transition_t> tr_list{};
+  std::list<transition_detail_t> tr_list{};
 
   for (auto& actor : mc_model_checker->get_remote_simulation().actors()) {
     auto actor_pid  = actor.copy.get_buffer()->get_pid();
@@ -631,22 +646,22 @@ std::list<udpor_transition_t> Api::get_enabled_transitions(simgrid::mc::State* s
     if (not simgrid::mc::actor_is_enabled(actor_impl))
       continue;
 
-    udpor_transition_t udpor_transition = std::unique_ptr<s_udpor_transition>(new s_udpor_transition());
+    transition_detail_t transition = std::unique_ptr<s_transition_detail>(new s_transition_detail());
     Simcall simcall_call                = actor_impl->simcall_.call_;
     smx_simcall_t simcall               = &actor_impl->simcall_;
-    udpor_transition->call_             = simcall_call;
+    transition->call_             = simcall_call;
     switch (simcall_call) {
       case Simcall::COMM_ISEND:
       case Simcall::COMM_IRECV: {
-        udpor_transition->mbox_remote_addr = get_mbox_remote_addr(simcall);
-        udpor_transition->comm_remote_addr = get_comm_remote_addr(simcall);
+        transition->mbox_remote_addr = get_mbox_remote_addr(simcall);
+        transition->comm_remote_addr = get_comm_remote_addr(simcall);
         break;
       }
 
       default:
         break;
     }
-    tr_list.emplace_back(std::move(udpor_transition));
+    tr_list.emplace_back(std::move(transition));
   }
   
   return tr_list;
@@ -720,9 +735,9 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req
       char* bs = buff_size_to_string(simcall_comm_isend__get__src_buff_size(req));
       if (issuer->get_host())
         args = bprintf("src=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), actor_get_host_name(issuer),
-                       MC_smx_actor_get_name(issuer), p, bs);
+                       actor_get_name(issuer), p, bs);
       else
-        args = bprintf("src=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_name(issuer), p, bs);
+        args = bprintf("src=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), actor_get_name(issuer), p, bs);
       xbt_free(bs);
       xbt_free(p);
       break;
@@ -739,9 +754,9 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req
       char* bs = buff_size_to_string(size);
       if (issuer->get_host())
         args = bprintf("dst=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), actor_get_host_name(issuer),
-                       MC_smx_actor_get_name(issuer), p, bs);
+                       actor_get_name(issuer), p, bs);
       else
-        args = bprintf("dst=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_name(issuer), p, bs);
+        args = bprintf("dst=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), actor_get_name(issuer), p, bs);
       xbt_free(bs);
       xbt_free(p);
       break;
@@ -772,9 +787,9 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req
             mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->dst_actor_.get()));
         args = bprintf("comm=%s [(%ld)%s (%s)-> (%ld)%s (%s)]", p, src_proc ? src_proc->get_pid() : 0,
                        src_proc ? actor_get_host_name(src_proc) : "",
-                       src_proc ? MC_smx_actor_get_name(src_proc) : "", dst_proc ? dst_proc->get_pid() : 0,
+                       src_proc ? actor_get_name(src_proc) : "", dst_proc ? dst_proc->get_pid() : 0,
                        dst_proc ? actor_get_host_name(dst_proc) : "",
-                       dst_proc ? MC_smx_actor_get_name(dst_proc) : "");
+                       dst_proc ? actor_get_name(dst_proc) : "");
       }
       xbt_free(p);
       break;
@@ -804,8 +819,8 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req
         smx_actor_t dst_proc =
             mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->dst_actor_.get()));
         args = bprintf("comm=%s [(%ld)%s (%s) -> (%ld)%s (%s)]", p, src_proc->get_pid(),
-                       MC_smx_actor_get_name(src_proc), actor_get_host_name(src_proc), dst_proc->get_pid(),
-                       MC_smx_actor_get_name(dst_proc), actor_get_host_name(dst_proc));
+                       actor_get_name(src_proc), actor_get_host_name(src_proc), dst_proc->get_pid(),
+                       actor_get_name(dst_proc), actor_get_host_name(dst_proc));
       }
       xbt_free(p);
       break;
@@ -871,10 +886,10 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req
   std::string str;
   if (args != nullptr)
     str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s(%s)", issuer->get_pid(), actor_get_host_name(issuer),
-                                      MC_smx_actor_get_name(issuer), type, args);
+                                      actor_get_name(issuer), type, args);
   else
     str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s ", issuer->get_pid(), actor_get_host_name(issuer),
-                                      MC_smx_actor_get_name(issuer), type);
+                                      actor_get_name(issuer), type);
   xbt_free(args);
   return str;
 }