From 593c432c9b3f4c9476851d83b167afc9b38f27b5 Mon Sep 17 00:00:00 2001 From: Gabriel Corona Date: Wed, 23 Mar 2016 16:30:04 +0100 Subject: [PATCH] [mc] Remove unused argument in MC_show_deadlock() --- src/mc/SafetyChecker.cpp | 2 +- src/mc/mc_comm_determinism.cpp | 2 +- src/mc/mc_global.cpp | 7 +------ src/mc/mc_private.h | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/mc/SafetyChecker.cpp b/src/mc/SafetyChecker.cpp index cccde0d8c0..3989b9272f 100644 --- a/src/mc/SafetyChecker.cpp +++ b/src/mc/SafetyChecker.cpp @@ -150,7 +150,7 @@ int SafetyChecker::run() /* Check for deadlocks */ if (mc_model_checker->checkDeadlock()) { - MC_show_deadlock(nullptr); + MC_show_deadlock(); return SIMGRID_MC_EXIT_DEADLOCK; } diff --git a/src/mc/mc_comm_determinism.cpp b/src/mc/mc_comm_determinism.cpp index 54fe76e0f8..3870c388c6 100644 --- a/src/mc/mc_comm_determinism.cpp +++ b/src/mc/mc_comm_determinism.cpp @@ -453,7 +453,7 @@ static int MC_modelcheck_comm_determinism_main(void) /* Check for deadlocks */ if (mc_model_checker->checkDeadlock()) { - MC_show_deadlock(nullptr); + MC_show_deadlock(); return SIMGRID_MC_EXIT_DEADLOCK; } diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 14c3b2a976..4cd9edde11 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -237,16 +237,11 @@ void MC_show_stack_safety(xbt_fifo_t stack) } } -void MC_show_deadlock(smx_simcall_t req) +void MC_show_deadlock(void) { - /*char *req_str = nullptr; */ XBT_INFO("**************************"); XBT_INFO("*** DEAD-LOCK DETECTED ***"); XBT_INFO("**************************"); - XBT_INFO("Locked request:"); - /*req_str = simgrid::mc::request_to_string(req); - XBT_INFO("%s", req_str); - xbt_free(req_str); */ XBT_INFO("Counter-example execution trace:"); MC_dump_stack_safety(mc_stack); MC_print_statistics(mc_stats); diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h index e41f8c0ad7..57f674658a 100644 --- a/src/mc/mc_private.h +++ b/src/mc/mc_private.h @@ -65,7 +65,7 @@ XBT_PRIVATE extern FILE *dot_output; XBT_PRIVATE extern int user_max_depth_reached; XBT_PRIVATE void MC_replay(xbt_fifo_t stack); -XBT_PRIVATE void MC_show_deadlock(smx_simcall_t req); +XBT_PRIVATE void MC_show_deadlock(void); XBT_PRIVATE void MC_show_stack_safety(xbt_fifo_t stack); XBT_PRIVATE void MC_dump_stack_safety(xbt_fifo_t stack); XBT_PRIVATE void MC_show_non_termination(void); -- 2.20.1