[mc] Remove the ugly is_in_vector() hack

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

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 6913890..f1df2aa 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -20,30 +20,25 @@
 
 using simgrid::mc::remote;
 
-extern "C" {
-
-static inline
-bool is_in_vector(smx_process_t p, std::vector<simgrid::mc::SimixProcessInformation>& ps)
-{
-  return (uintptr_t) p >= (uintptr_t) &ps[0]
-    && (uintptr_t) p < (uintptr_t) &ps[ps.size()];
-}
-
+/** Statically "upcast" a s_smx_process_t into a SimixProcessInformation
+ *
+ *  This gets 'processInfo' from '&processInfo->copy'. It upcasts in the
+ *  sense that we could achieve the same thing by having SimixProcessInformation
+ *  inherit from s_smx_process_t but we don't really want to do that.
+ */
 static inline
-simgrid::mc::SimixProcessInformation* MC_smx_process_get_info(smx_process_t p)
+simgrid::mc::SimixProcessInformation* process_info_cast(smx_process_t p)
 {
-  assert(is_in_vector(p, mc_model_checker->process().smx_process_infos)
-    || is_in_vector(p, mc_model_checker->process().smx_old_process_infos));
   simgrid::mc::SimixProcessInformation* process_info =
     (simgrid::mc::SimixProcessInformation*)
       ((char*) p - offsetof(simgrid::mc::SimixProcessInformation, copy));
   return process_info;
 }
 
-/** Load the remote swag of processes into a dynar
+/** Load the remote swag of processes into a vector
  *
  *  @param process     MCed process
- *  @param target      Local dynar (to be filled with copies of `s_smx_process_t`)
+ *  @param target      Local vector (to be filled with copies of `s_smx_process_t`)
  *  @param remote_swag Address of the process SWAG in the remote list
  */
 static void MC_process_refresh_simix_process_list(
@@ -56,7 +51,7 @@ static void MC_process_refresh_simix_process_list(
   s_xbt_swag_t swag;
   process->read_bytes(&swag, sizeof(swag), remote(remote_swag));
 
-  // Load each element of the dynar from the MCed process:
+  // Load each element of the vector from the MCed process:
   int i = 0;
   for (smx_process_t p = (smx_process_t) swag.head; p; ++i) {
 
@@ -111,13 +106,12 @@ void Process::refresh_simix()
  *  @param process the MCed process
  *  @param req     the simcall (copied in the local process)
  */
-smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req)
+smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
 {
-  if (mc_mode == MC_MODE_CLIENT)
-    return req->issuer;
+  xbt_assert(mc_mode == MC_MODE_SERVER);
 
   // This is the address of the smx_process in the MCed process:
-  void* address = req->issuer;
+  auto address = simgrid::mc::remote(req->issuer);
 
   // Lookup by address:
   for (auto& p : mc_model_checker->process().simix_processes())
@@ -130,33 +124,6 @@ smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req)
   xbt_die("Issuer not found");
 }
 
-smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address)
-{
-  if (!process_remote_address)
-    return nullptr;
-  if (mc_mode == MC_MODE_CLIENT)
-    return process_remote_address;
-
-  simgrid::mc::SimixProcessInformation* process_info = MC_smx_resolve_process_info(process_remote_address);
-  if (process_info)
-    return &process_info->copy;
-  else
-    return nullptr;
-}
-
-simgrid::mc::SimixProcessInformation* MC_smx_resolve_process_info(smx_process_t process_remote_address)
-{
-  if (mc_mode == MC_MODE_CLIENT)
-    xbt_die("No process_info for local process is not enabled.");
-  for (auto& process_info : mc_model_checker->process().smx_process_infos)
-    if (process_info.address == process_remote_address)
-      return &process_info;
-  for (auto& process_info : mc_model_checker->process().smx_old_process_infos)
-    if (process_info.address == process_remote_address)
-      return &process_info;
-  xbt_die("Process info not found");
-}
-
 const char* MC_smx_process_get_host_name(smx_process_t p)
 {
   if (mc_mode == MC_MODE_CLIENT)
@@ -164,7 +131,7 @@ const char* MC_smx_process_get_host_name(smx_process_t p)
 
   simgrid::mc::Process* process = &mc_model_checker->process();
 
-  /* Horrible hack to find the offset of the id in the simgrid::s4u::Host.
+  /* 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 pratice for the targets currently supported by the MC
@@ -183,7 +150,7 @@ const char* MC_smx_process_get_host_name(smx_process_t p)
   const size_t offset = (char*) &foo.host.name() - (char*) &foo.host;
 
   // Read the simgrid::xbt::string in the MCed process:
-  simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
+  simgrid::mc::SimixProcessInformation* info = process_info_cast(p);
   simgrid::xbt::string_data remote_string;
   auto remote_string_address = remote(
     (simgrid::xbt::string_data*) ((char*) p->host + offset));
@@ -202,7 +169,7 @@ const char* MC_smx_process_get_name(smx_process_t p)
   if (!p->name)
     return nullptr;
 
-  simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
+  simgrid::mc::SimixProcessInformation* info = process_info_cast(p);
   if (info->name.empty())
     info->name = process->read_string(p->name);
   return info->name.c_str();
@@ -227,5 +194,3 @@ unsigned long MC_smx_get_maxpid(void)
     &maxpid, sizeof(maxpid));
   return maxpid;
 }
-
-}