[SMPICC] Make call location conditional

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

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 604cdc3..8f821f4 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -20,20 +20,15 @@
 
 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));
@@ -113,7 +108,7 @@ void Process::refresh_simix()
  */
 smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
 {
-  xbt_assert(mc_mode == MC_MODE_SERVER);
+  xbt_assert(mc_model_checker != nullptr);
 
   // This is the address of the smx_process in the MCed process:
   auto address = simgrid::mc::remote(req->issuer);
@@ -131,7 +126,7 @@ smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
 
 const char* MC_smx_process_get_host_name(smx_process_t p)
 {
-  if (mc_mode == MC_MODE_CLIENT)
+  if (mc_model_checker == nullptr)
     return sg_host_get_name(p->host);
 
   simgrid::mc::Process* process = &mc_model_checker->process();
@@ -155,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));
@@ -169,12 +164,12 @@ const char* MC_smx_process_get_host_name(smx_process_t p)
 const char* MC_smx_process_get_name(smx_process_t p)
 {
   simgrid::mc::Process* process = &mc_model_checker->process();
-  if (mc_mode == MC_MODE_CLIENT)
+  if (mc_model_checker == nullptr)
     return p->name;
   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();
@@ -183,7 +178,7 @@ const char* MC_smx_process_get_name(smx_process_t p)
 #if HAVE_SMPI
 int MC_smpi_process_count(void)
 {
-  if (mc_mode == MC_MODE_CLIENT)
+  if (mc_model_checker == nullptr)
     return smpi_process_count();
   int res;
   mc_model_checker->process().read_variable("process_count",
@@ -199,5 +194,3 @@ unsigned long MC_smx_get_maxpid(void)
     &maxpid, sizeof(maxpid));
   return maxpid;
 }
-
-}