X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d20f024dba9ff1e9c8822237caaf963b9e913889..f7f70d5b16f2dee72574a36146a11598e5907e34:/src/mc/checker/Checker.hpp diff --git a/src/mc/checker/Checker.hpp b/src/mc/checker/Checker.hpp index 4de42ae0b5..c71f17e1d1 100644 --- a/src/mc/checker/Checker.hpp +++ b/src/mc/checker/Checker.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2017. The SimGrid Team. +/* Copyright (c) 2016-2019. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,11 +7,7 @@ #ifndef SIMGRID_MC_CHECKER_HPP #define SIMGRID_MC_CHECKER_HPP -#include -#include -#include - -#include "src/mc/Session.hpp" +//#include "src/mc/Session.hpp" #include "src/mc/mc_forward.hpp" #include "src/mc/mc_record.hpp" @@ -40,7 +36,7 @@ public: Checker(Checker const&) = delete; Checker& operator=(Checker const&) = delete; - virtual ~Checker(); + virtual ~Checker() = default; /** Main function of this algorithm */ virtual void run() = 0; @@ -52,22 +48,22 @@ public: /** Show the current trace/stack * * Could this be handled in the Session/ModelChecker instead? */ - virtual RecordTrace getRecordTrace(); + virtual RecordTrace get_record_trace() = 0; /** Generate a textual execution trace of the simulated application */ - virtual std::vector getTextualTrace(); + virtual std::vector get_textual_trace() = 0; /** Log additional information about the state of the model-checker */ - virtual void logState(); + virtual void log_state() = 0; protected: - Session& getSession() { return *session_; } + Session& get_session() { return *session_; } }; -XBT_PUBLIC() Checker* createLivenessChecker(Session& session); -XBT_PUBLIC() Checker* createSafetyChecker(Session& session); -XBT_PUBLIC() Checker* createCommunicationDeterminismChecker(Session& session); - +// External constructors so that the types (and the types of their content) remain hidden +XBT_PUBLIC Checker* createLivenessChecker(Session& session); +XBT_PUBLIC Checker* createSafetyChecker(Session& session); +XBT_PUBLIC Checker* createCommunicationDeterminismChecker(Session& session); } }