X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8468bc54da69c09b898b86e37bd5515edc7fdb3f..9104957deccc59e0e804215d5db498fabfd40d29:/src/mc/checker/CommunicationDeterminismChecker.hpp?ds=sidebyside diff --git a/src/mc/checker/CommunicationDeterminismChecker.hpp b/src/mc/checker/CommunicationDeterminismChecker.hpp index 72b4931e7c..1701a284ab 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.hpp +++ b/src/mc/checker/CommunicationDeterminismChecker.hpp @@ -1,17 +1,14 @@ -/* Copyright (c) 2016-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include -#include -#include -#include - #include "src/mc/VisitedState.hpp" #include "src/mc/checker/Checker.hpp" #include "src/mc/mc_comm_pattern.hpp" -#include "src/mc/mc_forward.hpp" + +#include +#include #ifndef SIMGRID_MC_COMMUNICATION_DETERMINISM_CHECKER_HPP #define SIMGRID_MC_COMMUNICATION_DETERMINISM_CHECKER_HPP @@ -24,14 +21,16 @@ public: explicit CommunicationDeterminismChecker(Session& session); ~CommunicationDeterminismChecker(); void run() override; - RecordTrace getRecordTrace() override; - std::vector getTextualTrace() override; + RecordTrace get_record_trace() override; + std::vector get_textual_trace() override; + private: void prepare(); void real_run(); - void logState() override; - void deterministic_comm_pattern(int process, simgrid::mc::PatternCommunication* comm, int backtracking); + void log_state() override; + void deterministic_comm_pattern(int process, const simgrid::mc::PatternCommunication* comm, int backtracking); void restoreState(); + public: // These are used by functions which should be moved in CommunicationDeterminismChecker: void get_comm_pattern(smx_simcall_t request, e_mc_call_type_t call_type, int backtracking); @@ -41,8 +40,8 @@ public: private: /** Stack representing the position in the exploration graph */ std::list> stack_; - simgrid::mc::VisitedStates visitedStates_; - unsigned long expandedStatesCount_ = 0; + simgrid::mc::VisitedStates visited_states_; + unsigned long expanded_states_count_ = 0; bool initial_communications_pattern_done = false; bool recv_deterministic = true;