MC_smx_actor_get_name() implemented in Api class, it renamed to actor_get_name().

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index c4dcd46..684b9c9 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -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] {
@@ -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;
 }

diff --git a/src/mc/api.hpp b/src/mc/api.hpp
index 1a2faf1..3a92bc1 100644 (file)
--- a/src/mc/api.hpp
+++ b/src/mc/api.hpp
@@ -50,6 +50,7 @@ private:
   bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const;
   simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor) const;
   const char* actor_get_host_name(smx_actor_t actor) const;
+  const char* actor_get_name(smx_actor_t actor) const;
 
 public:
   // No copy:

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 0cdde6f..3079827 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -10,21 +10,6 @@
 
 using simgrid::mc::remote;
 
-/** HACK, Statically "upcast" a s_smx_actor_t into an ActorInformation
- *
- *  This gets 'actorInfo' from '&actorInfo->copy'. It upcasts in the
- *  sense that we could achieve the same thing by having ActorInformation
- *  inherit from s_smx_actor_t but we don't really want to do that.
- */
-static inline simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor)
-{
-  simgrid::mc::ActorInformation temp;
-  std::size_t offset = (char*)temp.copy.get_buffer() - (char*)&temp;
-
-  auto* process_info = reinterpret_cast<simgrid::mc::ActorInformation*>((char*)actor - offset);
-  return process_info;
-}
-
 /** Load the remote list of processes into a vector
  *
  *  @param process      MCed process
@@ -87,21 +72,6 @@ void RemoteSimulation::refresh_simix()
 }
 }
 
-const char* MC_smx_actor_get_name(smx_actor_t actor)
-{
-  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();
-}
-
 unsigned long MC_smx_get_maxpid()
 {
   unsigned long maxpid;

diff --git a/src/mc/mc_smx.hpp b/src/mc/mc_smx.hpp
index ffd0c03..78566f0 100644 (file)
--- a/src/mc/mc_smx.hpp
+++ b/src/mc/mc_smx.hpp
@@ -38,7 +38,6 @@
  *  @param req     the simcall (copied in the local process)
  */
 
-XBT_PRIVATE const char* MC_smx_actor_get_name(smx_actor_t p);
 XBT_PRIVATE unsigned long MC_smx_get_maxpid();
 
 #endif