Start to replace old simdag tests of the ptask_L07 model

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

diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 14b8048..3079827 100644 (file)
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2021. 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. */
@@ -10,21 +10,6 @@
 
 using simgrid::mc::remote;
 
-/** HACK, Statically "upcast" a s_smx_actor_t into an ActorInformation
- *
- *  This gets 'actorInfo' from '&actorInfo->copy'. It upcasts in the
- *  sense that we could achieve the same thing by having ActorInformation
- *  inherit from s_smx_actor_t but we don't really want to do that.
- */
-static inline simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor)
-{
-  simgrid::mc::ActorInformation temp;
-  std::size_t offset = (char*)temp.copy.get_buffer() - (char*)&temp;
-
-  auto* process_info = reinterpret_cast<simgrid::mc::ActorInformation*>((char*)actor - offset);
-  return process_info;
-}
-
 /** Load the remote list of processes into a vector
  *
  *  @param process      MCed process
@@ -87,65 +72,6 @@ void RemoteSimulation::refresh_simix()
 }
 }
 
-/** Get the issuer of a simcall (`req->issuer`)
- *
- *  In split-process mode, it does the black magic necessary to get an address
- *  of a (shallow) copy of the data structure the issuer SIMIX actor in the local
- *  address space.
- *
- *  @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 const* req)
-{
-  xbt_assert(mc_model_checker != nullptr);
-
-  // This is the address of the smx_actor in the MCed process:
-  auto address = simgrid::mc::remote(req->issuer_);
-
-  // Lookup by address:
-  for (auto& actor : mc_model_checker->get_remote_simulation().actors())
-    if (actor.address == address)
-      return actor.copy.get_buffer();
-  for (auto& actor : mc_model_checker->get_remote_simulation().dead_actors())
-    if (actor.address == address)
-      return actor.copy.get_buffer();
-
-  xbt_die("Issuer not found");
-}
-
-const char* MC_smx_actor_get_host_name(smx_actor_t actor)
-{
-  if (mc_model_checker == nullptr)
-    return actor->get_host()->get_cname();
-
-  const simgrid::mc::RemoteSimulation* process = &mc_model_checker->get_remote_simulation();
-
-  // Read the simgrid::xbt::string in the MCed process:
-  simgrid::mc::ActorInformation* info     = actor_info_cast(actor);
-  auto remote_string_address =
-      remote(reinterpret_cast<const 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));
-  info->hostname = mc_model_checker->get_host_name(hostname).c_str();
-  return info->hostname;
-}
-
-const char* MC_smx_actor_get_name(smx_actor_t actor)
-{
-  const simgrid::mc::RemoteSimulation* process = &mc_model_checker->get_remote_simulation();
-  if (mc_model_checker == nullptr)
-    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_);
-    info->name = process->read_string(remote(string_data.data), string_data.len);
-  }
-  return info->name.c_str();
-}
-
 unsigned long MC_smx_get_maxpid()
 {
   unsigned long maxpid;