From ab92608267358b56adf7a803480fa2ad9608ed1b Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 23 May 2017 23:04:23 +0200 Subject: [PATCH 1/1] a few more smells --- src/mc/checker/LivenessChecker.cpp | 27 ++++------------ src/mc/checker/LivenessChecker.hpp | 6 ++-- src/mc/mc_checkpoint.cpp | 7 ++-- src/mc/mc_dwarf.cpp | 3 +- src/mc/mc_unw.h | 7 ++-- teshsuite/mc/dwarf/dwarf.cpp | 52 ++++++++++++------------------ 6 files changed, 39 insertions(+), 63 deletions(-) diff --git a/src/mc/checker/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp index a505e097e4..3a24b367e5 100644 --- a/src/mc/checker/LivenessChecker.cpp +++ b/src/mc/checker/LivenessChecker.cpp @@ -33,8 +33,7 @@ #include "src/mc/mc_smx.h" #include "src/mc/remote/Client.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, - "Logging specific to algorithms for liveness properties verification"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification"); /********* Static functions *********/ @@ -63,10 +62,7 @@ VisitedPair::VisitedPair( this->atomic_propositions = std::move(atomic_propositions); } -VisitedPair::~VisitedPair() = default; - -static bool evaluate_label( - xbt_automaton_exp_label_t l, std::vector const& values) +static bool evaluate_label(xbt_automaton_exp_label_t l, std::vector const& values) { switch (l->type) { case xbt_automaton_exp_label::AUT_OR: @@ -96,8 +92,6 @@ static bool evaluate_label( Pair::Pair(unsigned long expanded_pairs) : num(expanded_pairs) {} -Pair::~Pair() {} - std::shared_ptr> LivenessChecker::getPropositionValues() { std::vector values; @@ -133,13 +127,11 @@ std::shared_ptr LivenessChecker::insertAcceptancePair(simgrid::mc:: || *(pair_test->atomic_propositions) != *(new_pair->atomic_propositions) || this->compare(pair_test.get(), new_pair.get()) != 0) continue; - XBT_INFO("Pair %d already reached (equal to pair %d) !", - new_pair->num, pair_test->num); + XBT_INFO("Pair %d already reached (equal to pair %d) !", new_pair->num, pair_test->num); explorationStack_.pop_back(); if (dot_output != nullptr) - fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", - this->previousPair_, pair_test->num, - this->previousRequest_.c_str()); + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", this->previousPair_, pair_test->num, + this->previousRequest_.c_str()); return nullptr; } @@ -224,9 +216,8 @@ int LivenessChecker::insertVisitedPair(std::shared_ptr visited_pair return -1; if (visited_pair == nullptr) - visited_pair = std::make_shared( - pair->num, pair->automaton_state, pair->atomic_propositions, - pair->graph_state); + visited_pair = + std::make_shared(pair->num, pair->automaton_state, pair->atomic_propositions, pair->graph_state); auto range = boost::range::equal_range(visitedPairs_, visited_pair.get(), simgrid::mc::DerefAndCompareByActorsCountAndUsedHeap()); @@ -270,10 +261,6 @@ LivenessChecker::LivenessChecker(Session& session) : Checker(session) { } -LivenessChecker::~LivenessChecker() -{ -} - RecordTrace LivenessChecker::getRecordTrace() // override { RecordTrace res; diff --git a/src/mc/checker/LivenessChecker.hpp b/src/mc/checker/LivenessChecker.hpp index 9b095c1d10..e7a6dee272 100644 --- a/src/mc/checker/LivenessChecker.hpp +++ b/src/mc/checker/LivenessChecker.hpp @@ -38,7 +38,7 @@ struct XBT_PRIVATE Pair { bool exploration_started = false; Pair(unsigned long expanded_pairs); - ~Pair(); + ~Pair() = default; Pair(Pair const&) = delete; Pair& operator=(Pair const&) = delete; @@ -57,13 +57,13 @@ struct XBT_PRIVATE VisitedPair { int pair_num, xbt_automaton_state_t automaton_state, std::shared_ptr> atomic_propositions, std::shared_ptr graph_state); - ~VisitedPair(); + ~VisitedPair() = default; }; class XBT_PRIVATE LivenessChecker : public Checker { public: LivenessChecker(Session& session); - ~LivenessChecker(); + ~LivenessChecker() = default; void run() override; RecordTrace getRecordTrace() override; std::vector getTextualTrace() override; diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index 84cdfd820a..17c58722a9 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -408,7 +408,7 @@ static std::vector unwind_stack_frames(simgrid::mc::UnwindCo } return result; -}; +} static std::vector take_snapshot_stacks(simgrid::mc::Snapshot* snapshot) { @@ -620,12 +620,11 @@ void restore_snapshot_fds(simgrid::mc::Snapshot* snapshot) int new_fd = open(fd.filename.c_str(), fd.flags); if (new_fd < 0) - xbt_die("Could not reopen the file %s fo restoring the file descriptor", - fd.filename.c_str()); + xbt_die("Could not reopen the file %s fo restoring the file descriptor", fd.filename.c_str()); if (new_fd != fd.number) { dup2(new_fd, fd.number); close(new_fd); - }; + } lseek(fd.number, fd.current_position, SEEK_SET); } } diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp index 89951e4db1..7ccd1ea5bd 100644 --- a/src/mc/mc_dwarf.cpp +++ b/src/mc/mc_dwarf.cpp @@ -53,8 +53,7 @@ static uint64_t MC_dwarf_default_lower_bound(int lang); * \param die DIE for the DW_TAG_enumeration_type or DW_TAG_subrange_type * \param unit DIE of the DW_TAG_compile_unit */ -static uint64_t MC_dwarf_subrange_element_count(Dwarf_Die * die, - Dwarf_Die * unit); +static uint64_t MC_dwarf_subrange_element_count(Dwarf_Die* die, Dwarf_Die* unit); /** \brief Computes the number of elements of a given DW_TAG_array_type. * diff --git a/src/mc/mc_unw.h b/src/mc/mc_unw.h index 945fb4f657..31dfb9b9da 100644 --- a/src/mc/mc_unw.h +++ b/src/mc/mc_unw.h @@ -47,10 +47,11 @@ namespace mc { class UnwindContext { simgrid::mc::AddressSpace* addressSpace_ = nullptr; - simgrid::mc::Process* process_ = nullptr; - unw_context_t unwindContext_; + simgrid::mc::Process* process_ = nullptr; + unw_context_t unwindContext_; + public: - UnwindContext() {} + UnwindContext() = default; ~UnwindContext() { clear(); } void initialize(simgrid::mc::Process* process, unw_context_t* c); void clear(); diff --git a/teshsuite/mc/dwarf/dwarf.cpp b/teshsuite/mc/dwarf/dwarf.cpp index 09ad40efdd..fca03b1355 100644 --- a/teshsuite/mc/dwarf/dwarf.cpp +++ b/teshsuite/mc/dwarf/dwarf.cpp @@ -22,7 +22,10 @@ #include "src/mc/Variable.hpp" int test_some_array[4][5][6]; -struct some_struct { int first; int second[4][5]; } test_some_struct; +struct some_struct { + int first; + int second[4][5]; +} test_some_struct; static simgrid::mc::Type* find_type_by_name(simgrid::mc::ObjectInformation* info, const char* name) { @@ -70,12 +73,8 @@ static void test_local_variable(simgrid::mc::ObjectInformation* info, const char simgrid::dwarf::Location location = simgrid::dwarf::resolve( var->location_list, info, cursor, frame_base, nullptr, -1); - xbt_assert(location.in_memory(), - "Expected the variable %s of function %s to be in memory", - variable, function); - xbt_assert(location.address() == address, - "Bad resolution of local variable %s of %s", variable, function); - + xbt_assert(location.in_memory(), "Expected the variable %s of function %s to be in memory", variable, function); + xbt_assert(location.address() == address, "Bad resolution of local variable %s of %s", variable, function); } static simgrid::mc::Variable* test_global_variable( @@ -84,12 +83,10 @@ static simgrid::mc::Variable* test_global_variable( { simgrid::mc::Variable* variable = info->find_variable(name); xbt_assert(variable, "Global variable %s was not found", name); - xbt_assert(variable->name == name, - "Name mismatch for %s", name); + xbt_assert(variable->name == name, "Name mismatch for %s", name); xbt_assert(variable->global, "Variable %s is not global", name); - xbt_assert(variable->address == address, - "Address mismatch for %s : %p expected but %p found", - name, address, variable->address); + xbt_assert(variable->address == address, "Address mismatch for %s : %p expected but %p found", name, address, + variable->address); auto i = process.binary_info->types.find(variable->type_id); xbt_assert(i != process.binary_info->types.end(), "Missing type for %s", name); @@ -112,9 +109,7 @@ typedef struct foo {int i;} s_foo; static void test_type_by_name(simgrid::mc::Process& process, s_foo my_foo) { - assert( - process.binary_info->full_types_by_name.find("struct foo") != - process.binary_info->full_types_by_name.end()); + assert(process.binary_info->full_types_by_name.find("struct foo") != process.binary_info->full_types_by_name.end()); } int main(int argc, char** argv) @@ -127,28 +122,26 @@ int main(int argc, char** argv) simgrid::mc::Process process(getpid(), -1); process.init(); - test_global_variable(process, process.binary_info.get(), - "some_local_variable", &some_local_variable, sizeof(int)); + test_global_variable(process, process.binary_info.get(), "some_local_variable", &some_local_variable, sizeof(int)); - var = test_global_variable(process, process.binary_info.get(), - "test_some_array", &test_some_array, sizeof(test_some_array)); + var = test_global_variable(process, process.binary_info.get(), "test_some_array", &test_some_array, + sizeof(test_some_array)); auto i = process.binary_info->types.find(var->type_id); xbt_assert(i != process.binary_info->types.end(), "Missing type"); type = &i->second; - xbt_assert(type->element_count == 6*5*4, - "element_count mismatch in test_some_array : %i / %i", - type->element_count, 6*5*4); + xbt_assert(type->element_count == 6 * 5 * 4, "element_count mismatch in test_some_array : %i / %i", + type->element_count, 6 * 5 * 4); - var = test_global_variable(process, process.binary_info.get(), - "test_some_struct", &test_some_struct, sizeof(test_some_struct)); + var = test_global_variable(process, process.binary_info.get(), "test_some_struct", &test_some_struct, + sizeof(test_some_struct)); i = process.binary_info->types.find(var->type_id); xbt_assert(i != process.binary_info->types.end(), "Missing type"); type = &i->second; assert(type); assert(find_member(*type, "first")->offset() == 0); - assert(find_member(*type, "second")->offset() - == ((const char*)&test_some_struct.second) - (const char*)&test_some_struct); + assert(find_member(*type, "second")->offset() == + ((const char*)&test_some_struct.second) - (const char*)&test_some_struct); unw_context_t context; unw_cursor_t cursor; @@ -157,11 +150,8 @@ int main(int argc, char** argv) test_local_variable(process.binary_info.get(), "main", "argc", &argc, &cursor); - { - int lexical_block_variable = 50; - test_local_variable(process.binary_info.get(), "main", - "lexical_block_variable", &lexical_block_variable, &cursor); - } + int lexical_block_variable = 50; + test_local_variable(process.binary_info.get(), "main", "lexical_block_variable", &lexical_block_variable, &cursor); s_foo my_foo; test_type_by_name(process, my_foo); -- 2.20.1