X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..8b0d5ae29ebd13e69a23991b8adfb67c5c5d79d3:/src/mc/Session.hpp diff --git a/src/mc/Session.hpp b/src/mc/Session.hpp index 7af4c43229..6806c0c6cb 100644 --- a/src/mc/Session.hpp +++ b/src/mc/Session.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2016. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2016-2019. 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. */ @@ -7,22 +6,10 @@ #ifndef SIMGRID_MC_SESSION_HPP #define SIMGRID_MC_SESSION_HPP -#ifdef __linux__ -#include -#endif - -#include -#include -#include -#include +#include "src/mc/ModelChecker.hpp" #include -#include - -#include "src/mc/mc_forward.hpp" -#include "src/mc/ModelChecker.hpp" - namespace simgrid { namespace mc { @@ -39,7 +26,6 @@ private: std::unique_ptr modelChecker_; std::shared_ptr initialSnapshot_; -private: Session(pid_t pid, int socket); // No copy: @@ -50,23 +36,22 @@ 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 * * This sets up the environment for the model-checked process - * (environoment variables, sockets, etc.). + * (environment variables, sockets, etc.). * * The code is expected to `exec` the model-checker program. */ - static Session* fork(std::function code); + static Session* fork(const std::function& code); /** Spawn a model-checked process * @@ -83,7 +68,7 @@ public: // static constructors static Session* spawnvp(const char *file, char *const argv[]); }; -// Temporary +// Temporary :) extern simgrid::mc::Session* session; }