From 5c5b766d14b240b96c65e45250844b894b4e8afe Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Sun, 4 Oct 2020 22:28:50 +0200 Subject: [PATCH] [sonar] Extract the assignment from sub-expression. --- src/mc/checker/CommunicationDeterminismChecker.cpp | 6 ++++-- src/mc/checker/LivenessChecker.cpp | 5 +++-- src/mc/checker/SafetyChecker.cpp | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index 002b7a2b53..d94b12ad28 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -333,7 +333,8 @@ void CommunicationDeterminismChecker::prepare() initial_communications_pattern.resize(maxpid); incomplete_communications_pattern.resize(maxpid); - auto initial_state = std::make_unique(++expanded_states_count_); + ++expanded_states_count_; + auto initial_state = std::make_unique(expanded_states_count_); XBT_DEBUG("********* Start communication determinism verification *********"); @@ -451,7 +452,8 @@ void CommunicationDeterminismChecker::real_run() mc_model_checker->wait_for_requests(); /* Create the new expanded state */ - auto next_state = std::make_unique(++expanded_states_count_); + ++expanded_states_count_; + auto next_state = std::make_unique(expanded_states_count_); /* If comm determinism verification, we cannot stop the exploration if some communications are not finished (at * least, data are transferred). These communications are incomplete and they cannot be analyzed and compared diff --git a/src/mc/checker/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp index 3a690f4c2c..b586e8cfa2 100644 --- a/src/mc/checker/LivenessChecker.cpp +++ b/src/mc/checker/LivenessChecker.cpp @@ -262,10 +262,11 @@ std::vector LivenessChecker::get_textual_trace() // override std::shared_ptr LivenessChecker::create_pair(const Pair* current_pair, xbt_automaton_state_t state, std::shared_ptr> propositions) { - expanded_pairs_count_++; + ++expanded_pairs_count_; + ++expanded_states_count_; auto next_pair = std::make_shared(expanded_pairs_count_); next_pair->automaton_state = state; - next_pair->graph_state = std::make_shared(++expanded_states_count_); + next_pair->graph_state = std::make_shared(expanded_states_count_); next_pair->atomic_propositions = std::move(propositions); if (current_pair) next_pair->depth = current_pair->depth + 1; diff --git a/src/mc/checker/SafetyChecker.cpp b/src/mc/checker/SafetyChecker.cpp index 48e2ad3983..9f9716fe6f 100644 --- a/src/mc/checker/SafetyChecker.cpp +++ b/src/mc/checker/SafetyChecker.cpp @@ -135,7 +135,8 @@ void SafetyChecker::run() this->get_session().execute(state->transition_); /* Create the new expanded state (copy the state of MCed into our MCer data) */ - auto next_state = std::make_unique(++expanded_states_count_); + ++expanded_states_count_; + auto next_state = std::make_unique(expanded_states_count_); if (_sg_mc_termination) this->check_non_termination(next_state.get()); @@ -282,7 +283,8 @@ SafetyChecker::SafetyChecker(Session& s) : Checker(s) XBT_DEBUG("Starting the safety algorithm"); - auto initial_state = std::make_unique(++expanded_states_count_); + ++expanded_states_count_; + auto initial_state = std::make_unique(expanded_states_count_); XBT_DEBUG("**************************************************"); XBT_DEBUG("Initial state"); -- 2.20.1