From a4b9c2131bcbd81e935a03d9f3bb0b7d0ae48c31 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 3 May 2019 17:37:02 +0200 Subject: [PATCH] More Sonar smells around "noreturn". Missing attribute, and remove dead code. --- src/include/mc/mc.h | 2 +- src/mc/ModelChecker.cpp | 1 - src/mc/mc_global.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h index b96e69acec..b502542fb8 100644 --- a/src/include/mc/mc.h +++ b/src/include/mc/mc.h @@ -25,7 +25,7 @@ SG_BEGIN_DECL() /********************************* Global *************************************/ -XBT_PUBLIC void MC_run(); +XBT_ATTRIB_NORETURN XBT_PUBLIC void MC_run(); XBT_PUBLIC void MC_process_clock_add(smx_actor_t, double); XBT_PUBLIC double MC_process_clock_get(smx_actor_t); XBT_PRIVATE void MC_automaton_load(const char *file); diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp index 439e6770ca..2d6a04b526 100644 --- a/src/mc/ModelChecker.cpp +++ b/src/mc/ModelChecker.cpp @@ -265,7 +265,6 @@ bool ModelChecker::handle_message(char* buffer, ssize_t size) case MC_MESSAGE_ASSERTION_FAILED: MC_report_assertion_error(); this->exit(SIMGRID_MC_EXIT_SAFETY); - break; default: xbt_die("Unexpected message from model-checked application"); diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index c9b5ba6593..0a48a28b20 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -97,7 +97,6 @@ void MC_run() MC_ignore_heap(simgrid::mc::processes_time.data(), simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0])); simgrid::mc::Client::get()->mainLoop(); - simgrid::mc::processes_time.clear(); } void MC_show_deadlock() -- 2.20.1