From 923c96522e059639b7722b35d033d79d9b0b5590 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 21 Jul 2017 13:25:46 +0200 Subject: [PATCH] please sonar (initialization lists) + reindent --- src/mc/PageStore.cpp | 24 ++--- src/mc/VisitedState.cpp | 7 +- src/mc/VisitedState.hpp | 2 +- src/mc/checker/LivenessChecker.cpp | 14 +-- src/mc/checker/LivenessChecker.hpp | 4 +- src/mc/mc_state.cpp | 143 +++++++++++++---------------- 6 files changed, 82 insertions(+), 112 deletions(-) diff --git a/src/mc/PageStore.cpp b/src/mc/PageStore.cpp index 56c33d47f9..29d624c055 100644 --- a/src/mc/PageStore.cpp +++ b/src/mc/PageStore.cpp @@ -22,8 +22,7 @@ #include "src/mc/mc_mmu.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_page_snapshot, mc, - "Logging specific to mc_page_snapshot"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_page_snapshot, mc, "Logging specific to mc_page_snapshot"); namespace simgrid { namespace mc { @@ -50,18 +49,14 @@ static XBT_ALWAYS_INLINE PageStore::hash_type mc_hash_page(const void* data) // ***** snapshot_page_manager -PageStore::PageStore(size_t size) : - memory_(nullptr), capacity_(0), top_index_(0) +PageStore::PageStore(size_t size) : memory_(nullptr), capacity_(size), top_index_(0) { - // Using mmap in order to be able to expand the region - // by relocating it somewhere else in the virtual memory - // space: + // Using mmap in order to be able to expand the region by relocating it somewhere else in the virtual memory space: void* memory = ::mmap(nullptr, size << xbt_pagebits, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_POPULATE, -1, 0); if (memory == MAP_FAILED) xbt_die("Could not mmap initial snapshot pages."); this->top_index_ = 0; - this->capacity_ = size; this->memory_ = memory; this->page_counts_.resize(size); } @@ -143,7 +138,6 @@ std::size_t PageStore::alloc_page() size_t res = this->free_pages_[this->free_pages_.size() - 1]; this->free_pages_.pop_back(); return res; - } } @@ -160,8 +154,7 @@ std::size_t PageStore::store_page(void* page) { xbt_assert(top_index_ <= this->capacity_, "top_index is not consistent"); - // First, we check if a page with the same content is already in the page - // store: + // First, we check if a page with the same content is already in the page store: // 1. compute the hash of the page; // 2. find pages with the same hash using `hash_index_`; // 3. find a page with the same content. @@ -173,16 +166,14 @@ std::size_t PageStore::store_page(void* page) const void* snapshot_page = this->get_page(pageno); if (memcmp(page, snapshot_page, xbt_pagesize) == 0) { - // If a page with the same content is already in the page store it is - // reused and its reference count is incremented. + // If a page with the same content is already in the page store it's reused and its refcount is incremented. page_counts_[pageno]++; return pageno; } } - // Otherwise, a new page is allocated in the page store and the content - // of the page is `memcpy()`-ed to this new page. + // Otherwise, a new page is allocated in the page store and the content of the page is `memcpy()`-ed to this new page. std::size_t pageno = alloc_page(); xbt_assert(this->page_counts_[pageno]==0, "Allocated page is already used"); void* snapshot_page = (void*) this->get_page(pageno); @@ -227,8 +218,7 @@ XBT_TEST_UNIT("base", test_mc_page_store, "Test adding/removing pages in the sto xbt_test_add("Init"); std::size_t pagesize = (size_t) getpagesize(); - std::unique_ptr store - = std::unique_ptr(new simgrid::mc::PageStore(500)); + std::unique_ptr store = std::unique_ptr(new simgrid::mc::PageStore(500)); void* data = getpage(); xbt_test_assert(store->size()==0, "Bad size"); diff --git a/src/mc/VisitedState.cpp b/src/mc/VisitedState.cpp index 308a5845f6..a85f2828fa 100644 --- a/src/mc/VisitedState.cpp +++ b/src/mc/VisitedState.cpp @@ -34,7 +34,7 @@ static int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::Visi } /** @brief Save the current state */ -VisitedState::VisitedState(unsigned long state_number) +VisitedState::VisitedState(unsigned long state_number) : num(state_number) { simgrid::mc::RemoteClient* process = &(mc_model_checker->process()); this->heap_bytes_used = mmalloc_get_bytes_used_remote( @@ -44,14 +44,9 @@ VisitedState::VisitedState(unsigned long state_number) this->actors_count = mc_model_checker->process().actors().size(); this->system_state = simgrid::mc::take_snapshot(state_number); - this->num = state_number; this->original_num = -1; } -VisitedState::~VisitedState() -{ -} - void VisitedStates::prune() { while (states_.size() > (std::size_t)_sg_mc_max_visited_states) { diff --git a/src/mc/VisitedState.hpp b/src/mc/VisitedState.hpp index 3665060744..7028f4d644 100644 --- a/src/mc/VisitedState.hpp +++ b/src/mc/VisitedState.hpp @@ -25,7 +25,7 @@ struct XBT_PRIVATE VisitedState { int original_num = 0; // num field of the VisitedState to which I was declared equal to (used for dot_output) explicit VisitedState(unsigned long state_number); - ~VisitedState(); + ~VisitedState() = default; }; class XBT_PRIVATE VisitedStates { diff --git a/src/mc/checker/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp index 01ab0accd8..7cc2f8b683 100644 --- a/src/mc/checker/LivenessChecker.cpp +++ b/src/mc/checker/LivenessChecker.cpp @@ -39,24 +39,20 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms namespace simgrid { namespace mc { -VisitedPair::VisitedPair( - int pair_num, xbt_automaton_state_t automaton_state, - std::shared_ptr> atomic_propositions, - std::shared_ptr graph_state) +VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, + std::shared_ptr> atomic_propositions, + std::shared_ptr graph_state) + : num(pair_num), automaton_state(automaton_state) { simgrid::mc::RemoteClient* process = &(mc_model_checker->process()); this->graph_state = std::move(graph_state); if(this->graph_state->system_state == nullptr) this->graph_state->system_state = simgrid::mc::take_snapshot(pair_num); - this->heap_bytes_used = mmalloc_get_bytes_used_remote( - process->get_heap()->heaplimit, - process->get_malloc_info()); + this->heap_bytes_used = mmalloc_get_bytes_used_remote(process->get_heap()->heaplimit, process->get_malloc_info()); this->actors_count = mc_model_checker->process().actors().size(); - this->automaton_state = automaton_state; - this->num = pair_num; this->other_num = -1; this->atomic_propositions = std::move(atomic_propositions); } diff --git a/src/mc/checker/LivenessChecker.hpp b/src/mc/checker/LivenessChecker.hpp index 2722fc5a37..16bfff72a8 100644 --- a/src/mc/checker/LivenessChecker.hpp +++ b/src/mc/checker/LivenessChecker.hpp @@ -45,10 +45,10 @@ struct XBT_PRIVATE Pair { }; struct XBT_PRIVATE VisitedPair { - int num = 0; + int num; int other_num = 0; /* Dot output for */ std::shared_ptr graph_state = nullptr; /* System state included */ - xbt_automaton_state_t automaton_state = nullptr; + xbt_automaton_state_t automaton_state; std::shared_ptr> atomic_propositions; std::size_t heap_bytes_used = 0; int actors_count = 0; diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index 94ef18847c..1a36d31dd4 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -26,14 +26,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC (state)"); namespace simgrid { namespace mc { -State::State(unsigned long state_number) +State::State(unsigned long state_number) : num(state_number) { this->internal_comm.clear(); std::memset(&this->internal_req, 0, sizeof(this->internal_req)); std::memset(&this->executed_req, 0, sizeof(this->executed_req)); actorStates.resize(MC_smx_get_maxpid()); - num = state_number; /* Stateful model checking */ if ((_sg_mc_checkpoint > 0 && (state_number % _sg_mc_checkpoint == 0)) || _sg_mc_termination) { system_state = simgrid::mc::take_snapshot(num); @@ -46,8 +45,7 @@ State::State(unsigned long state_number) std::size_t State::interleaveSize() const { - return boost::range::count_if(this->actorStates, - [](simgrid::mc::ProcessState const& p) { return p.isTodo(); }); + return boost::range::count_if(this->actorStates, [](simgrid::mc::ProcessState const& p) { return p.isTodo(); }); } Transition State::getTransition() const @@ -67,12 +65,10 @@ Transition State::getTransition() const * - which simcall can currently be executed (like a comm where the other partner is already known) * Once we returned the last enabled transition of a process, it is marked done. * - * Things can get muddled with the WAITANY and TESTANY simcalls, that are rewritten - * on the fly to a bunch of WAIT (resp TEST) transitions using the transition.argument - * field to remember what was the last returned sub-transition. + * Things can get muddled with the WAITANY and TESTANY simcalls, that are rewritten on the fly to a bunch of WAIT + * (resp TEST) transitions using the transition.argument field to remember what was the last returned sub-transition. */ -static inline smx_simcall_t MC_state_get_request_for_process( - simgrid::mc::State* state, smx_actor_t actor) +static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* state, smx_actor_t actor) { /* reset the outgoing transition */ simgrid::mc::ProcessState* procstate = &state->actorStates[actor->pid]; @@ -85,80 +81,74 @@ static inline smx_simcall_t MC_state_get_request_for_process( smx_simcall_t req = nullptr; switch (actor->simcall.call) { - case SIMCALL_COMM_WAITANY: - state->transition.argument = -1; - while (procstate->times_considered < - read_length(mc_model_checker->process(), - remote(simcall_comm_waitany__get__comms(&actor->simcall)))) { - if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, - procstate->times_considered++)) { - state->transition.argument = procstate->times_considered - 1; - break; - } + case SIMCALL_COMM_WAITANY: + state->transition.argument = -1; + while (procstate->times_considered < + read_length(mc_model_checker->process(), remote(simcall_comm_waitany__get__comms(&actor->simcall)))) { + if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered++)) { + state->transition.argument = procstate->times_considered - 1; + break; } - - if (procstate->times_considered >= - simgrid::mc::read_length(mc_model_checker->process(), - simgrid::mc::remote(simcall_comm_waitany__get__comms(&actor->simcall)))) - procstate->setDone(); - if (state->transition.argument != -1) - req = &actor->simcall; - break; - - case SIMCALL_COMM_TESTANY: { - unsigned start_count = procstate->times_considered; - state->transition.argument = -1; - while (procstate->times_considered < - simcall_comm_testany__get__count(&actor->simcall)) - if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, - procstate->times_considered++)) { - state->transition.argument = procstate->times_considered - 1; - break; - } - - if (procstate->times_considered >= - simcall_comm_testany__get__count(&actor->simcall)) - procstate->setDone(); - - if (state->transition.argument != -1 || start_count == 0) - req = &actor->simcall; - - break; } - case SIMCALL_COMM_WAIT: { - simgrid::mc::RemotePtr remote_act = - remote(static_cast(simcall_comm_wait__getraw__comm(&actor->simcall))); - simgrid::mc::Remote temp_act; - mc_model_checker->process().read(temp_act, remote_act); - simgrid::kernel::activity::CommImpl* act = temp_act.getBuffer(); - if (act->src_proc && act->dst_proc) - state->transition.argument = 0; - else if (act->src_proc == nullptr && act->type == SIMIX_COMM_READY - && act->detached == 1) - state->transition.argument = 0; - else - state->transition.argument = -1; + if (procstate->times_considered >= + simgrid::mc::read_length(mc_model_checker->process(), + simgrid::mc::remote(simcall_comm_waitany__get__comms(&actor->simcall)))) procstate->setDone(); + if (state->transition.argument != -1) req = &actor->simcall; - break; - } + break; + + case SIMCALL_COMM_TESTANY: { + unsigned start_count = procstate->times_considered; + state->transition.argument = -1; + while (procstate->times_considered < simcall_comm_testany__get__count(&actor->simcall)) + if (simgrid::mc::request_is_enabled_by_idx(&actor->simcall, procstate->times_considered++)) { + state->transition.argument = procstate->times_considered - 1; + break; + } + + if (procstate->times_considered >= simcall_comm_testany__get__count(&actor->simcall)) + procstate->setDone(); - case SIMCALL_MC_RANDOM: { - int min_value = simcall_mc_random__get__min(&actor->simcall); - state->transition.argument = procstate->times_considered + min_value; - procstate->times_considered++; - if (state->transition.argument == simcall_mc_random__get__max(&actor->simcall)) - procstate->setDone(); + if (state->transition.argument != -1 || start_count == 0) req = &actor->simcall; - break; - } - default: - procstate->setDone(); + break; + } + + case SIMCALL_COMM_WAIT: { + simgrid::mc::RemotePtr remote_act = + remote(static_cast(simcall_comm_wait__getraw__comm(&actor->simcall))); + simgrid::mc::Remote temp_act; + mc_model_checker->process().read(temp_act, remote_act); + simgrid::kernel::activity::CommImpl* act = temp_act.getBuffer(); + if (act->src_proc && act->dst_proc) state->transition.argument = 0; - req = &actor->simcall; - break; + else if (act->src_proc == nullptr && act->type == SIMIX_COMM_READY && act->detached == 1) + state->transition.argument = 0; + else + state->transition.argument = -1; + procstate->setDone(); + req = &actor->simcall; + break; + } + + case SIMCALL_MC_RANDOM: { + int min_value = simcall_mc_random__get__min(&actor->simcall); + state->transition.argument = procstate->times_considered + min_value; + procstate->times_considered++; + if (state->transition.argument == simcall_mc_random__get__max(&actor->simcall)) + procstate->setDone(); + req = &actor->simcall; + break; + } + + default: + procstate->setDone(); + state->transition.argument = 0; + req = &actor->simcall; + break; } if (not req) return nullptr; @@ -168,9 +158,8 @@ static inline smx_simcall_t MC_state_get_request_for_process( // Fetch the data of the request and translate it: state->internal_req = *req; - /* The waitany and testany request are transformed into a wait or test request - * over the corresponding communication action so it can be treated later by - * the dependence function. */ + /* The waitany and testany request are transformed into a wait or test request over the corresponding communication + * action so it can be treated later by the dependence function. */ switch (req->call) { case SIMCALL_COMM_WAITANY: { state->internal_req.call = SIMCALL_COMM_WAIT; -- 2.20.1