Kill a now unused parameter

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

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index afe522d529077378ed76c0cb61eeb9fdb19f519a..0a45d978a8d90f30a6805d386444306155d614fe 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -386,13 +386,14 @@ void Api::dump_record_path() const
 
 /* Search for an enabled transition amongst actors
  *
- * This is the frist actor marked TODO by the checker, and currently enabled in the application.
+ * This is the first actor marked TODO by the checker, and currently enabled in the application.
  *
  * Once we found it, prepare its execution (increase the times_considered of its observer and remove it as done on need)
- *  - marked "to be interleaved" in their ActorState (controlled by the checker algorithm).
+ *
+ * If we can't find any actor, return false
  */
 
-smx_simcall_t Api::mc_state_choose_request(simgrid::mc::State* state) const
+bool Api::mc_state_choose_request(simgrid::mc::State* state) const
 {
   RemoteProcess& process = mc_model_checker->get_remote_process();
   XBT_DEBUG("Search for an actor to run. %zu actors to consider", process.actors().size());
@@ -419,32 +420,23 @@ smx_simcall_t Api::mc_state_choose_request(simgrid::mc::State* state) const
 
     XBT_DEBUG("Let's run actor %ld, going for transition %s", actor->get_pid(),
               SIMIX_simcall_name(state->executed_req_));
-    return &state->executed_req_;
+    return true;
   }
-  return nullptr;
+  return false;
 }
 
-std::string Api::request_to_string(smx_simcall_t req, int value) const
+std::string Api::request_to_string(aid_t aid, int value) const
 {
   xbt_assert(mc_model_checker != nullptr, "Must be called from MCer");
 
-  smx_actor_t issuer = simcall_get_issuer(req);
-
-  if (issuer->simcall_.observer_ != nullptr)
-    return mc_model_checker->simcall_to_string(issuer->get_pid(), value);
-  else
-    return "[" + get_actor_string(issuer) + "] " + SIMIX_simcall_name(*req) + "(unknown?)";
+  return mc_model_checker->simcall_to_string(aid, value);
 }
 
-std::string Api::request_get_dot_output(smx_simcall_t req, int value) const
+std::string Api::request_get_dot_output(aid_t aid, int value) const
 {
-  if (req->observer_ != nullptr) {
-    const smx_actor_t issuer = simcall_get_issuer(req);
-    const char* color        = get_color(issuer->get_pid() - 1);
-    return "label = \"" + mc_model_checker->simcall_dot_label(issuer->get_pid(), value) + "\", color = " + color +
-           ", fontcolor = " + color;
-  } else
-    return "UNIMPLEMENTED";
+  const char* color = get_color(aid - 1);
+  return "label = \"" + mc_model_checker->simcall_dot_label(aid, value) + "\", color = " + color +
+         ", fontcolor = " + color;
 }
 
 #if HAVE_SMPI
@@ -487,10 +479,10 @@ void Api::s_close() const
   session_singleton->close();
 }
 
-RemotePtr<simgrid::kernel::actor::SimcallObserver> Api::execute(Transition& transition, smx_simcall_t simcall) const
+RemotePtr<simgrid::kernel::actor::SimcallObserver> Api::execute(Transition& transition) const
 {
   /* FIXME: once all simcalls have observers, kill the simcall parameter and use mc_model_checker->simcall_to_string() */
-  transition.textual = request_to_string(simcall, transition.times_considered_);
+  transition.textual = request_to_string(transition.aid_, transition.times_considered_);
   return session_singleton->execute(transition);
 }