mc: inline a function

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index c32e566..8d6bc81 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();
   }
 }

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 7370a9e..eed3203 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -79,18 +79,6 @@ void MC_run()
   simgrid::mc::AppSide::get()->main_loop();
 }
 
-void MC_show_deadlock()
-{
-  XBT_INFO("**************************");
-  XBT_INFO("*** DEADLOCK DETECTED ***");
-  XBT_INFO("**************************");
-  XBT_INFO("Counter-example execution trace:");
-  for (auto const& s : mc_model_checker->getChecker()->get_textual_trace())
-    XBT_INFO("  %s", s.c_str());
-  simgrid::mc::dumpRecordPath();
-  simgrid::mc::session_singleton->log_state();
-}
-
 void MC_automaton_load(const char *file)
 {
   if (simgrid::mc::property_automaton == nullptr)

diff --git a/src/mc/mc_private.hpp b/src/mc/mc_private.hpp
index 008fe29..08d5ade 100644 (file)
--- a/src/mc/mc_private.hpp
+++ b/src/mc/mc_private.hpp
@@ -18,8 +18,6 @@ XBT_PRIVATE void MC_init_dot_output();
 
 XBT_PRIVATE extern FILE* dot_output;
 
-XBT_PRIVATE void MC_show_deadlock();
-
 /********************************** Miscellaneous **********************************/
 namespace simgrid {
 namespace mc {