X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..b923f24fcb86571011626426f577fe6322094bb3:/src/mc/mc_smx.cpp

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index f725c877f3..c1ea4b3f38 100644
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -96,7 +96,7 @@ void RemoteClient::refresh_simix()
  *  @param process the MCed process
  *  @param req     the simcall (copied in the local process)
  */
-smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
+smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall const* req)
 {
   xbt_assert(mc_model_checker != nullptr);
 
@@ -117,31 +117,13 @@ smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
 const char* MC_smx_actor_get_host_name(smx_actor_t actor)
 {
   if (mc_model_checker == nullptr)
-    return actor->host->getCname();
+    return actor->get_host()->get_cname();
 
   simgrid::mc::RemoteClient* process = &mc_model_checker->process();
 
-  /* HACK, Horrible hack to find the offset of the id in the simgrid::s4u::Host.
-
-     Offsetof is not supported for non-POD types but this should
-     work in practice for the targets currently supported by the MC
-     as long as we do not add funny features to the Host class
-     (such as virtual base).
-
-     We are using a (C++11) unrestricted union in order to avoid
-     any construction/destruction of the simgrid::s4u::Host.
-  */
-  union fake_host {
-    simgrid::s4u::Host host;
-    fake_host() { /* Nothing to do*/}
-    ~fake_host() { /* Nothing to do*/}
-  };
-  fake_host foo;
-  const size_t offset = (char*)&foo.host.getName() - (char*)&foo.host;
-
   // Read the simgrid::xbt::string in the MCed process:
   simgrid::mc::ActorInformation* info     = actor_info_cast(actor);
-  auto remote_string_address              = remote((simgrid::xbt::string_data*)((char*)actor->host + offset));
+  auto remote_string_address              = remote((simgrid::xbt::string_data*)&actor->get_host()->get_name());
   simgrid::xbt::string_data remote_string = process->read(remote_string_address);
   char hostname[remote_string.len];
   process->read_bytes(hostname, remote_string.len + 1, remote(remote_string.data));
@@ -153,11 +135,11 @@ const char* MC_smx_actor_get_name(smx_actor_t actor)
 {
   simgrid::mc::RemoteClient* process = &mc_model_checker->process();
   if (mc_model_checker == nullptr)
-    return actor->name.c_str();
+    return actor->get_cname();
 
   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);
+    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();
@@ -169,8 +151,7 @@ int MC_smpi_process_count()
   if (mc_model_checker == nullptr)
     return smpi_process_count();
   int res;
-  mc_model_checker->process().read_variable("process_count",
-    &res, sizeof(res));
+  mc_model_checker->process().read_variable("process_count", &res, sizeof(res));
   return res;
 }
 #endif