Fix MC

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

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index ef15f63..85039bf 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -5,57 +5,61 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <cassert>
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <cassert>

+#include <cstddef>

 #include <cstdlib>
 
 #include <cstdlib>
 

+#include <memory>
+#include <type_traits>
+#include <utility>
+#include <vector>
+

 #include <xbt/log.h>
 #include <xbt/log.h>

-#include <xbt/dynar.h>

 #include <xbt/str.h>
 #include <xbt/swag.h>
 
 #include <xbt/str.h>
 #include <xbt/swag.h>
 

-#include "src/simix/smx_private.h"
+#include <simgrid/s4u/host.hpp>

 
 

+#include "src/simix/smx_private.h"

 #include "src/mc/mc_smx.h"
 #include "src/mc/ModelChecker.hpp"
 
 using simgrid::mc::remote;
 
 #include "src/mc/mc_smx.h"
 #include "src/mc/ModelChecker.hpp"
 
 using simgrid::mc::remote;
 

-extern "C" {
-
+/** HACK, 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
 static inline

-bool is_in_vector(smx_process_t p, std::vector<simgrid::mc::SimixProcessInformation>& ps)
+simgrid::mc::SimixProcessInformation* process_info_cast(smx_process_t p)

 {
 {

-  return (uintptr_t) p >= (uintptr_t) &ps[0]
-    && (uintptr_t) p < (uintptr_t) &ps[ps.size()];
-}
+  simgrid::mc::SimixProcessInformation temp;
+  std::size_t offset = (char*) temp.copy.getBuffer() - (char*)&temp;

 
 

-static inline
-simgrid::mc::SimixProcessInformation* MC_smx_process_get_info(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* process_info =

-    (simgrid::mc::SimixProcessInformation*)
-      ((char*) p - offsetof(simgrid::mc::SimixProcessInformation, copy));
+    (simgrid::mc::SimixProcessInformation*) ((char*) p - offset);

   return process_info;
 }
 
   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 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(
   simgrid::mc::Process* process,
  *  @param remote_swag Address of the process SWAG in the remote list
  */
 static void MC_process_refresh_simix_process_list(
   simgrid::mc::Process* process,

-  std::vector<simgrid::mc::SimixProcessInformation>& target, xbt_swag_t remote_swag)
+  std::vector<simgrid::mc::SimixProcessInformation>& target,
+  simgrid::mc::RemotePtr<s_xbt_swag_t> remote_swag)

 {
   target.clear();
 
   // swag = REMOTE(*simix_global->process_list)
   s_xbt_swag_t swag;
 {
   target.clear();
 
   // swag = REMOTE(*simix_global->process_list)
   s_xbt_swag_t swag;

-  process->read_bytes(&swag, sizeof(swag), remote(remote_swag));
+  process->read_bytes(&swag, sizeof(swag), 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) {
 
   int i = 0;
   for (smx_process_t p = (smx_process_t) swag.head; p; ++i) {
 


@@ -71,29 +75,42 @@ static void MC_process_refresh_simix_process_list(
   assert(i == swag.count);
 }
 
   assert(i == swag.count);
 }
 

-void MC_process_smx_refresh(simgrid::mc::Process* process)
+namespace simgrid {
+namespace mc {
+
+void Process::refresh_simix()

 {
 {

-  xbt_assert(mc_mode == MC_MODE_SERVER);
-  if (process->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
+  if (this->cache_flags_ & Process::cache_simix_processes)

     return;
 
   // TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
 
     return;
 
   // TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
 

-  // simix_global_p = REMOTE(simix_global);
-  smx_global_t simix_global_p;
-  process->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p));
+  static_assert(std::is_same<
+      std::unique_ptr<simgrid::simix::Global>,
+      decltype(simix_global)
+    >::value, "Unexpected type for simix_global");
+  static_assert(sizeof(simix_global) == sizeof(simgrid::simix::Global*),
+    "Bad size for simix_global");
+
+  // simix_global_p = REMOTE(simix_global.get());
+  RemotePtr<simgrid::simix::Global> simix_global_p =
+    this->read_variable<simgrid::simix::Global*>("simix_global");

 
   // simix_global = REMOTE(*simix_global)
 
   // simix_global = REMOTE(*simix_global)

-  s_smx_global_t simix_global;
-  process->read_bytes(&simix_global, sizeof(simix_global),
-    remote(simix_global_p));
+  Remote<simgrid::simix::Global> simix_global =
+    this->read<simgrid::simix::Global>(simix_global_p);

 
   MC_process_refresh_simix_process_list(
 
   MC_process_refresh_simix_process_list(

-    process, process->smx_process_infos, simix_global.process_list);
+    this, this->smx_process_infos,
+    remote(simix_global.getBuffer()->process_list));

   MC_process_refresh_simix_process_list(
   MC_process_refresh_simix_process_list(

-    process, process->smx_old_process_infos, simix_global.process_to_destroy);
+    this, this->smx_old_process_infos,
+    remote(simix_global.getBuffer()->process_to_destroy));

 
 

-  process->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES;
+  this->cache_flags_ |= Process::cache_simix_processes;
+}
+
+}

 }
 
 /** Get the issuer of a simcall (`req->issuer`)
 }
 
 /** Get the issuer of a simcall (`req->issuer`)


@@ -105,65 +122,35 @@ void MC_process_smx_refresh(simgrid::mc::Process* process)
  *  @param process the MCed process
  *  @param req     the simcall (copied in the local process)
  */
  *  @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;
-
-  MC_process_smx_refresh(&mc_model_checker->process());
+  xbt_assert(mc_model_checker != nullptr);

 
   // This is the address of the smx_process in the MCed process:
 
   // 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:
 
   // Lookup by address:

-  for (auto& p : mc_model_checker->process().smx_process_infos)
+  for (auto& p : mc_model_checker->process().simix_processes())

     if (p.address == address)
     if (p.address == address)

-      return &p.copy;
-  for (auto& p : mc_model_checker->process().smx_old_process_infos)
+      return p.copy.getBuffer();
+  for (auto& p : mc_model_checker->process().old_simix_processes())

     if (p.address == address)
     if (p.address == address)

-      return &p.copy;
+      return p.copy.getBuffer();

 
   xbt_die("Issuer not found");
 }
 
 
   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)
 {
 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();
 
     return sg_host_get_name(p->host);
 
   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
 
      Offsetof is not supported for non-POD types but this should

-     work in pratice for the targets currently supported by the MC
+     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).
 
      as long as we do not add funny features to the Host class
      (such as virtual base).
 


@@ -179,11 +166,10 @@ 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:
   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::xbt::string_data remote_string;
+  simgrid::mc::SimixProcessInformation* info = process_info_cast(p);

   auto remote_string_address = remote(
     (simgrid::xbt::string_data*) ((char*) p->host + offset));
   auto remote_string_address = remote(
     (simgrid::xbt::string_data*) ((char*) p->host + offset));

-  process->read_bytes(&remote_string, sizeof(remote_string), remote_string_address);
+  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));
   info->hostname = mc_model_checker->get_host_name(hostname);
   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);


@@ -193,16 +179,13 @@ 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();
 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)
-    return p->name;
-  if (!p->name)
-    return nullptr;
+  if (mc_model_checker == nullptr)
+    return p->name.c_str();

 
 

-  simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
+  simgrid::mc::SimixProcessInformation* info = process_info_cast(p);

   if (info->name.empty()) {
   if (info->name.empty()) {

-    char* name = process->read_string(p->name);
-    info->name = name;
-    free(name);
+    simgrid::xbt::string_data string_data = (simgrid::xbt::string_data&)p->name;
+    info->name = process->read_string(remote(string_data.data), string_data.len);

   }
   return info->name.c_str();
 }
   }
   return info->name.c_str();
 }


@@ -210,7 +193,7 @@ const char* MC_smx_process_get_name(smx_process_t p)
 #if HAVE_SMPI
 int MC_smpi_process_count(void)
 {
 #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",
     return smpi_process_count();
   int res;
   mc_model_checker->process().read_variable("process_count",


@@ -226,5 +209,3 @@ unsigned long MC_smx_get_maxpid(void)
     &maxpid, sizeof(maxpid));
   return maxpid;
 }
     &maxpid, sizeof(maxpid));
   return maxpid;
 }

-
-}