Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Kill two more unused functions in mc::api
[simgrid.git] / src / mc / api.cpp
index 8b5dc8fd596ae092e4f068554764495f53e78931..3aa9b9dc4a5d1ebb142ba23cf88b47cdce984ce2 100644 (file)
@@ -11,7 +11,6 @@
 #include "src/mc/Session.hpp"
 #include "src/mc/checker/Checker.hpp"
 #include "src/mc/mc_base.hpp"
-#include "src/mc/mc_comm_pattern.hpp"
 #include "src/mc/mc_exit.hpp"
 #include "src/mc/mc_pattern.hpp"
 #include "src/mc/mc_private.hpp"
@@ -34,31 +33,13 @@ using Simcall = simgrid::simix::Simcall;
 namespace simgrid {
 namespace mc {
 
-static inline const char* get_color(int id)
-{
-  static constexpr std::array<const char*, 13> colors{{"blue", "red", "green3", "goldenrod", "brown", "purple",
-                                                       "magenta", "turquoise4", "gray25", "forestgreen", "hotpink",
-                                                       "lightblue", "tan"}};
-  return colors[id % colors.size()];
-}
-
-static std::string pointer_to_string(void* pointer)
-{
-  return XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose) ? xbt::string_printf("%p", pointer) : "(verbose only)";
-}
-
-static std::string buff_size_to_string(size_t buff_size)
-{
-  return XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose) ? std::to_string(buff_size) : "(verbose only)";
-}
-
 /** 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.
  */
-simgrid::mc::ActorInformation* Api::actor_info_cast(smx_actor_t actor) const
+static 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;
@@ -104,28 +85,6 @@ xbt::string const& Api::get_actor_name(smx_actor_t actor) const
   return info->name;
 }
 
-std::string Api::get_actor_string(smx_actor_t actor) const
-{
-  std::string res;
-  if (actor) {
-    res = "(" + std::to_string(actor->get_pid()) + ")";
-    if (actor->get_host())
-      res += std::string(get_actor_host_name(actor)) + " (" + std::string(get_actor_name(actor)) + ")";
-    else
-      res += get_actor_name(actor);
-  } else
-    res = "(0) ()";
-  return res;
-}
-
-std::string Api::get_actor_dot_label(smx_actor_t actor) const
-{
-  std::string res = "(" + std::to_string(actor->get_pid()) + ")";
-  if (actor->get_host())
-    res += get_actor_host_name(actor);
-  return res;
-}
-
 simgrid::mc::Checker* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm algo) const
 {
   auto session = new simgrid::mc::Session([argv] {
@@ -176,99 +135,6 @@ unsigned long Api::get_maxpid() const
   return mc_model_checker->get_remote_process().get_maxpid();
 }
 
-int Api::get_actors_size() const
-{
-  return mc_model_checker->get_remote_process().actors().size();
-}
-
-RemotePtr<kernel::activity::CommImpl> Api::get_comm_isend_raw_addr(smx_simcall_t request) const
-{
-  return remote(static_cast<kernel::activity::CommImpl*>(simcall_comm_isend__getraw__result(request)));
-}
-
-RemotePtr<kernel::activity::CommImpl> Api::get_comm_waitany_raw_addr(smx_simcall_t request, int value) const
-{
-  auto addr      = simcall_comm_waitany__getraw__comms(request) + value;
-  auto comm_addr = mc_model_checker->get_remote_process().read(remote(addr));
-  return RemotePtr<kernel::activity::CommImpl>(static_cast<kernel::activity::CommImpl*>(comm_addr));
-}
-
-std::string Api::get_pattern_comm_rdv(RemotePtr<kernel::activity::CommImpl> const& addr) const
-{
-  Remote<kernel::activity::CommImpl> temp_activity;
-  mc_model_checker->get_remote_process().read(temp_activity, addr);
-  const kernel::activity::CommImpl* activity = temp_activity.get_buffer();
-
-  char* remote_name = mc_model_checker->get_remote_process().read<char*>(RemotePtr<char*>(
-      (uint64_t)(activity->get_mailbox() ? &activity->get_mailbox()->get_name() : &activity->mbox_cpy->get_name())));
-  auto rdv          = mc_model_checker->get_remote_process().read_string(RemotePtr<char>(remote_name));
-  return rdv;
-}
-
-unsigned long Api::get_pattern_comm_src_proc(RemotePtr<kernel::activity::CommImpl> const& addr) const
-{
-  Remote<kernel::activity::CommImpl> temp_activity;
-  mc_model_checker->get_remote_process().read(temp_activity, addr);
-  const kernel::activity::CommImpl* activity = temp_activity.get_buffer();
-  auto src_proc =
-      mc_model_checker->get_remote_process().resolve_actor(mc::remote(activity->src_actor_.get()))->get_pid();
-  return src_proc;
-}
-
-unsigned long Api::get_pattern_comm_dst_proc(RemotePtr<kernel::activity::CommImpl> const& addr) const
-{
-  Remote<kernel::activity::CommImpl> temp_activity;
-  mc_model_checker->get_remote_process().read(temp_activity, addr);
-  const kernel::activity::CommImpl* activity = temp_activity.get_buffer();
-  auto src_proc =
-      mc_model_checker->get_remote_process().resolve_actor(mc::remote(activity->dst_actor_.get()))->get_pid();
-  return src_proc;
-}
-
-std::vector<char> Api::get_pattern_comm_data(RemotePtr<kernel::activity::CommImpl> const& addr) const
-{
-  simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
-  mc_model_checker->get_remote_process().read(temp_comm, addr);
-  const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
-
-  std::vector<char> buffer{};
-  if (comm->src_buff_ != nullptr) {
-    buffer.resize(comm->src_buff_size_);
-    mc_model_checker->get_remote_process().read_bytes(buffer.data(), buffer.size(), remote(comm->src_buff_));
-  }
-  return buffer;
-}
-
-#if HAVE_SMPI
-bool Api::check_send_request_detached(smx_simcall_t const& simcall) const
-{
-  Remote<simgrid::smpi::Request> mpi_request;
-  mc_model_checker->get_remote_process().read(
-      mpi_request, remote(static_cast<smpi::Request*>(simcall_comm_isend__get__data(simcall))));
-  return mpi_request.get_buffer()->detached();
-}
-#endif
-
-smx_actor_t Api::get_src_actor(RemotePtr<kernel::activity::CommImpl> const& comm_addr) const
-{
-  simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
-  mc_model_checker->get_remote_process().read(temp_comm, comm_addr);
-  const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
-
-  auto src_proc = mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(comm->src_actor_.get()));
-  return src_proc;
-}
-
-smx_actor_t Api::get_dst_actor(RemotePtr<kernel::activity::CommImpl> const& comm_addr) const
-{
-  simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
-  mc_model_checker->get_remote_process().read(temp_comm, comm_addr);
-  const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
-
-  auto dst_proc = mc_model_checker->get_remote_process().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get()));
-  return dst_proc;
-}
-
 std::size_t Api::get_remote_heap_bytes() const
 {
   RemoteProcess& process    = mc_model_checker->get_remote_process();
@@ -286,108 +152,32 @@ unsigned long Api::mc_get_visited_states() const
   return mc_model_checker->visited_states;
 }
 
-void Api::mc_check_deadlock() const
-{
-  if (mc_model_checker->checkDeadlock()) {
-    XBT_CINFO(mc_global, "**************************");
-    XBT_CINFO(mc_global, "*** DEADLOCK DETECTED ***");
-    XBT_CINFO(mc_global, "**************************");
-    XBT_CINFO(mc_global, "Counter-example execution trace:");
-    for (auto const& s : mc_model_checker->getChecker()->get_textual_trace())
-      XBT_CINFO(mc_global, "  %s", s.c_str());
-    XBT_INFO("Path = %s", mc_model_checker->getChecker()->get_record_trace().to_string().c_str());
-    simgrid::mc::session_singleton->log_state();
-    throw DeadlockError();
-  }
-}
-
-/** 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 Api::simcall_get_issuer(s_smx_simcall const* req) const
-{
-  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_process().actors())
-    if (actor.address == address)
-      return actor.copy.get_buffer();
-  for (auto& actor : mc_model_checker->get_remote_process().dead_actors())
-    if (actor.address == address)
-      return actor.copy.get_buffer();
-
-  xbt_die("Issuer not found");
-}
-
-RemotePtr<kernel::activity::MailboxImpl> Api::get_mbox_remote_addr(smx_simcall_t const req) const
-{
-  if (req->call_ == Simcall::COMM_ISEND)
-    return remote(simcall_comm_isend__get__mbox(req));
-  if (req->call_ == Simcall::COMM_IRECV)
-    return remote(simcall_comm_irecv__get__mbox(req));
-  THROW_IMPOSSIBLE;
-}
-
-RemotePtr<kernel::activity::ActivityImpl> Api::get_comm_remote_addr(smx_simcall_t const req) const
-{
-  if (req->call_ == Simcall::COMM_ISEND)
-    return remote(simcall_comm_isend__getraw__result(req));
-  if (req->call_ == Simcall::COMM_IRECV)
-    return remote(simcall_comm_irecv__getraw__result(req));
-  THROW_IMPOSSIBLE;
-}
-
 void Api::mc_exit(int status) const
 {
   mc_model_checker->exit(status);
 }
 
-std::string Api::request_get_dot_output(aid_t aid, int value) const
+std::string Api::request_get_dot_output(const Transition* t) const
 {
-  const char* color = get_color(aid - 1);
-  return "label = \"" + mc_model_checker->simcall_dot_label(aid, value) + "\", color = " + color +
-         ", fontcolor = " + color;
-}
+  static constexpr std::array<const char*, 13> colors{{"blue", "red", "green3", "goldenrod", "brown", "purple",
+                                                       "magenta", "turquoise4", "gray25", "forestgreen", "hotpink",
+                                                       "lightblue", "tan"}};
+  const char* color = colors[(t->aid_ - 1) % colors.size()];
 
-#if HAVE_SMPI
-int Api::get_smpi_request_tag(smx_simcall_t const& simcall, simgrid::simix::Simcall type) const
-{
-  void* simcall_data = nullptr;
-  if (type == Simcall::COMM_ISEND)
-    simcall_data = simcall_comm_isend__get__data(simcall);
-  else if (type == Simcall::COMM_IRECV)
-    simcall_data = simcall_comm_irecv__get__data(simcall);
-  Remote<simgrid::smpi::Request> mpi_request;
-  mc_model_checker->get_remote_process().read(mpi_request, remote(static_cast<smpi::Request*>(simcall_data)));
-  return mpi_request.get_buffer()->tag();
+  return "label = \"" + t->dot_label() + "\", color = " + color + ", fontcolor = " + color;
 }
-#endif
 
 void Api::restore_state(std::shared_ptr<simgrid::mc::Snapshot> system_state) const
 {
   system_state->restore(&mc_model_checker->get_remote_process());
 }
 
-void Api::log_state() const
-{
-  session_singleton->log_state();
-}
-
 bool Api::snapshot_equal(const Snapshot* s1, const Snapshot* s2) const
 {
   return simgrid::mc::snapshot_equal(s1, s2);
 }
 
-simgrid::mc::Snapshot* Api::take_snapshot(int num_state) const
+simgrid::mc::Snapshot* Api::take_snapshot(long num_state) const
 {
   auto snapshot = new simgrid::mc::Snapshot(num_state);
   return snapshot;