woopsy, adapt MC to the previous change

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

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 7b76077..c24b2ac 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -7,10 +7,11 @@
 #include <assert.h>
 
 #include <xbt/log.h>
+#include <xbt/string.hpp>
 
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
 
-#include "mc_smx.h"
+#include "src/mc/mc_smx.h"
 #include "ModelChecker.hpp"
 
 using simgrid::mc::remote;
@@ -87,7 +88,6 @@ static void MC_process_refresh_simix_process_list(
 void MC_process_smx_refresh(simgrid::mc::Process* process)
 {
   xbt_assert(mc_mode == MC_MODE_SERVER);
-  xbt_assert(!process->is_self());
   if (process->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
     return;
 
@@ -176,24 +176,37 @@ mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_a
 const char* MC_smx_process_get_host_name(smx_process_t p)
 {
   if (mc_mode == MC_MODE_CLIENT)
-    return SIMIX_host_get_name(p->host);
+    return sg_host_get_name(p->host);
 
   simgrid::mc::Process* process = &mc_model_checker->process();
 
-  // Currently, smx_host_t = xbt_dictelm_t.
-  // TODO, add an static_assert on this if switching to C++
-  // The host name is host->key and the host->key_len==strlen(host->key).
-  s_xbt_dictelm_t host_copy;
+  /* 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 pratice 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() {}
+    ~fake_host() {}
+  };
+  fake_host foo;
+  const size_t offset = (char*) &foo.host.name() - (char*) &foo.host;
+
+  // Read the simgrid::xbt::string in the MCed process:
   mc_smx_process_info_t info = MC_smx_process_get_info(p);
-  if (!info->hostname) {
-
-    // Read the hostname from the MCed process:
-    process->read_bytes(&host_copy, sizeof(host_copy), remote(p->host));
-    int len = host_copy.key_len + 1;
-    char hostname[len];
-    process->read_bytes(hostname, len, remote(host_copy.key));
-    info->hostname = mc_model_checker->get_host_name(hostname);
-  }
+  simgrid::xbt::string_data remote_string;
+  auto remote_string_address = remote(
+    (simgrid::xbt::string_data*) ((char*) p->host + offset));
+  process->read_bytes(&remote_string, sizeof(remote_string), remote_string_address);
+  char hostname[remote_string.len];
+  process->read_bytes(hostname, remote_string.len + 1, remote(remote_string.data));
+  info->hostname = mc_model_checker->get_host_name(hostname);
   return info->hostname;
 }