MC: chop chop chop

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

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index b477078..da0d06b 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -27,6 +27,7 @@
 #endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Facade APIs ");
+XBT_LOG_EXTERNAL_CATEGORY(mc_global);
 
 using Simcall = simgrid::simix::Simcall;
 
@@ -588,7 +589,14 @@ unsigned long Api::mc_get_executed_trans() const
 void Api::mc_check_deadlock() const
 {
   if (mc_model_checker->checkDeadlock()) {
-    MC_show_deadlock();
+    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());
+    simgrid::mc::dumpRecordPath();
+    simgrid::mc::session_singleton->log_state();
     throw DeadlockError();
   }
 }
@@ -620,11 +628,6 @@ smx_actor_t Api::simcall_get_issuer(s_smx_simcall const* req) const
   xbt_die("Issuer not found");
 }
 
-long Api::simcall_get_actor_id(s_smx_simcall const* req) const
-{
-  return simcall_get_issuer(req)->get_pid();
-}
-
 RemotePtr<kernel::activity::MailboxImpl> Api::get_mbox_remote_addr(smx_simcall_t const req) const
 {
   if (req->call_ == Simcall::COMM_ISEND)
@@ -643,17 +646,6 @@ RemotePtr<kernel::activity::ActivityImpl> Api::get_comm_remote_addr(smx_simcall_
   THROW_IMPOSSIBLE;
 }
 
-bool Api::mc_is_null() const
-{
-  auto is_null = (mc_model_checker == nullptr) ? true : false;
-  return is_null;
-}
-
-Checker* Api::mc_get_checker() const
-{
-  return mc_model_checker->getChecker();
-}
-
 void Api::handle_simcall(Transition const& transition) const
 {
   mc_model_checker->handle_simcall(transition);