From fb7ae778e5908c72ae16db143a1eb98ec3930db3 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 13 Oct 2017 12:07:49 +0200 Subject: [PATCH] Cosmetics: remove redundant access specifier. --- src/mc/ModelChecker.hpp | 1 - src/mc/PageStore.hpp | 15 +++++++++------ src/mc/RegionSnapshot.hpp | 2 +- src/mc/Session.hpp | 6 ++---- src/mc/checker/LivenessChecker.hpp | 2 +- src/mc/checker/SafetyChecker.hpp | 2 +- src/mc/remote/RemoteClient.hpp | 28 ++++++++++++++-------------- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp index fc33672b55..e7b7e9022c 100644 --- a/src/mc/ModelChecker.hpp +++ b/src/mc/ModelChecker.hpp @@ -43,7 +43,6 @@ class ModelChecker { public: std::shared_ptr parent_snapshot_; -public: ModelChecker(ModelChecker const&) = delete; ModelChecker& operator=(ModelChecker const&) = delete; explicit ModelChecker(std::unique_ptr process); diff --git a/src/mc/PageStore.hpp b/src/mc/PageStore.hpp index 4ae359f90b..3d1d15e929 100644 --- a/src/mc/PageStore.hpp +++ b/src/mc/PageStore.hpp @@ -75,14 +75,16 @@ namespace mc { class PageStore { public: // Types typedef std::uint64_t hash_type; -private: // Types + +private: + // Types // We are using a cheap hash to index a page. // We should expect collision and we need to associate multiple page indices // to the same hash. typedef std::unordered_set page_set_type; typedef std::unordered_map pages_map_type; -private: // Fields: + // Fields: /** First page */ void* memory_; /** Number of available pages in virtual memory */ @@ -96,18 +98,19 @@ private: // Fields: /** Index from page hash to page index */ pages_map_type hash_index_; -private: // Methods + // Methods void resize(std::size_t size); std::size_t alloc_page(); void remove_page(std::size_t pageno); -public: // Constructors +public: + // Constructors PageStore(PageStore const&) = delete; PageStore& operator=(PageStore const&) = delete; explicit PageStore(std::size_t size); ~PageStore(); -public: // Methods + // Methods /** @brief Decrement the reference count for a given page * @@ -141,7 +144,7 @@ public: // Methods */ const void* get_page(std::size_t pageno) const; -public: // Debug/test methods + // Debug/test methods /** @brief Get the number of references for a page */ std::size_t get_ref(std::size_t pageno); diff --git a/src/mc/RegionSnapshot.hpp b/src/mc/RegionSnapshot.hpp index cb941273cd..07baf1d836 100644 --- a/src/mc/RegionSnapshot.hpp +++ b/src/mc/RegionSnapshot.hpp @@ -44,7 +44,7 @@ private: void* data_ = nullptr; std::size_t size_; Type type_ = Type::Malloc; -private: + Buffer(std::size_t size, Type type = Type::Malloc); Buffer(void* data, std::size_t size, Type type = Type::Malloc) : data_(data), size_(size), type_(type) {} diff --git a/src/mc/Session.hpp b/src/mc/Session.hpp index 8bc9f04a7f..9eab46b8f7 100644 --- a/src/mc/Session.hpp +++ b/src/mc/Session.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016. The SimGrid Team. +/* Copyright (c) 2016-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -39,7 +39,6 @@ private: std::unique_ptr modelChecker_; std::shared_ptr initialSnapshot_; -private: Session(pid_t pid, int socket); // No copy: @@ -50,14 +49,13 @@ public: ~Session(); void close(); -public: void initialize(); void execute(Transition const& transition); void logState(); void restoreInitialState(); -public: // static constructors + // static constructors /** Create a new session by forking * diff --git a/src/mc/checker/LivenessChecker.hpp b/src/mc/checker/LivenessChecker.hpp index 160b77cb88..1f9be7f6d5 100644 --- a/src/mc/checker/LivenessChecker.hpp +++ b/src/mc/checker/LivenessChecker.hpp @@ -77,7 +77,7 @@ private: void purgeVisitedPairs(); void backtrack(); std::shared_ptr newPair(Pair* pair, xbt_automaton_state_t state, std::shared_ptr> propositions); -private: + // A stack of (application_state, automaton_state) pairs for DFS exploration: std::list> explorationStack_; std::list> acceptancePairs_; diff --git a/src/mc/checker/SafetyChecker.hpp b/src/mc/checker/SafetyChecker.hpp index f299d9b19c..0a45e48a13 100644 --- a/src/mc/checker/SafetyChecker.hpp +++ b/src/mc/checker/SafetyChecker.hpp @@ -33,7 +33,7 @@ private: void checkNonTermination(simgrid::mc::State* current_state); void backtrack(); void restoreState(); -private: + /** Stack representing the position in the exploration graph */ std::list> stack_; simgrid::mc::VisitedStates visitedStates_; diff --git a/src/mc/remote/RemoteClient.hpp b/src/mc/remote/RemoteClient.hpp index c0d6ec7dc9..3f99f0e10c 100644 --- a/src/mc/remote/RemoteClient.hpp +++ b/src/mc/remote/RemoteClient.hpp @@ -226,7 +226,6 @@ private: void refresh_malloc_info(); void refresh_simix(); -private: pid_t pid_ = -1; Channel channel_; bool running_ = false; @@ -239,17 +238,18 @@ private: std::vector stack_areas_; std::vector ignored_heap_; -public: // object info +public: + // object info // TODO, make private (first, objectify simgrid::mc::ObjectInformation*) std::vector> object_infos; std::shared_ptr libsimgrid_info; std::shared_ptr binary_info; -public: // Copies of MCed SMX data structures - /** Copy of `simix_global->process_list` - * - * See mc_smx.c. - */ + // Copies of MCed SMX data structures + /** Copy of `simix_global->process_list` + * + * See mc_smx.c. + */ std::vector smx_actors_infos; /** Copy of `simix_global->process_to_destroy` @@ -282,13 +282,13 @@ public: */ std::vector heap_info; -public: // Libunwind-data - /** Full-featured MC-aware libunwind address space for the process - * - * This address space is using a simgrid::mc::UnwindContext* - * (with simgrid::mc::Process* / simgrid::mc::AddressSpace* - * and unw_context_t). - */ + // Libunwind-data + /** Full-featured MC-aware libunwind address space for the process + * + * This address space is using a simgrid::mc::UnwindContext* + * (with simgrid::mc::Process* / simgrid::mc::AddressSpace* + * and unw_context_t). + */ unw_addr_space_t unw_addr_space; /** Underlying libunwind address-space -- 2.20.1