From 67ccc3846b39d92013765366e197a59a76068422 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 15 Jan 2017 21:51:20 +0100 Subject: [PATCH] cosmetics --- .../checker/CommunicationDeterminismChecker.cpp | 17 +++-------------- .../checker/CommunicationDeterminismChecker.hpp | 6 +++--- src/surf/HostImpl.hpp | 2 +- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index 03a2f4f447..ec9ff9e955 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -307,10 +307,7 @@ CommunicationDeterminismChecker::CommunicationDeterminismChecker(Session& sessio } -CommunicationDeterminismChecker::~CommunicationDeterminismChecker() -{ - -} +CommunicationDeterminismChecker::~CommunicationDeterminismChecker() = default; RecordTrace CommunicationDeterminismChecker::getRecordTrace() // override { @@ -361,20 +358,18 @@ void CommunicationDeterminismChecker::logState() // override void CommunicationDeterminismChecker::prepare() { - - int i; const int maxpid = MC_smx_get_maxpid(); // Create initial_communications_pattern elements: initial_communications_pattern = simgrid::xbt::newDeleteDynar(); - for (i=0; i < maxpid; i++){ + for (int i = 0; i < maxpid; i++) { simgrid::mc::PatternCommunicationList* process_list_pattern = new simgrid::mc::PatternCommunicationList(); xbt_dynar_insert_at(initial_communications_pattern, i, &process_list_pattern); } // Create incomplete_communications_pattern elements: incomplete_communications_pattern = xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp); - for (i=0; i < maxpid; i++){ + for (int i = 0; i < maxpid; i++) { xbt_dynar_t process_pattern = xbt_dynar_new(sizeof(simgrid::mc::PatternCommunication*), nullptr); xbt_dynar_insert_at(incomplete_communications_pattern, i, &process_pattern); } @@ -597,12 +592,6 @@ void CommunicationDeterminismChecker::run() this->prepare(); - this->initial_communications_pattern_done = 0; - this->recv_deterministic = 1; - this->send_deterministic = 1; - this->recv_diff = nullptr; - this->send_diff = nullptr; - this->main(); } diff --git a/src/mc/checker/CommunicationDeterminismChecker.hpp b/src/mc/checker/CommunicationDeterminismChecker.hpp index a901732749..88b1fdb9c8 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.hpp +++ b/src/mc/checker/CommunicationDeterminismChecker.hpp @@ -44,9 +44,9 @@ private: simgrid::mc::VisitedStates visitedStates_; unsigned long expandedStatesCount_ = 0; - int initial_communications_pattern_done = 0; - int recv_deterministic = 0; - int send_deterministic = 0; + bool initial_communications_pattern_done = false; + bool recv_deterministic = true; + bool send_deterministic = true; char *send_diff = nullptr; char *recv_diff = nullptr; }; diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index 13c19a96f7..1bc9ff9cea 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -63,7 +63,7 @@ public: class HostImpl : public simgrid::surf::PropertyHolder { public: - HostImpl(s4u::Host* host); + explicit HostImpl(s4u::Host* host); virtual ~HostImpl(); public: -- 2.20.1