X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20bbf9b0608d4ab29fb25ab4f795001d0cdca5b5..7d9bf5f4e3d00bbeea1aeef15d46a337c671805b:/src/mc/ModelChecker.hpp diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp index 47790fb4ff..2c1abd27df 100644 --- a/src/mc/ModelChecker.hpp +++ b/src/mc/ModelChecker.hpp @@ -30,13 +30,14 @@ namespace mc { class ModelChecker { struct pollfd fds_[2]; /** String pool for host names */ - // TODO, use std::unordered_set with heterogeneous comparison lookup (C++14) + // TODO, use std::set with heterogeneous comparison lookup (C++14)? xbt_dict_t /* */ hostnames_; // This is the parent snapshot of the current state: PageStore page_store_; std::unique_ptr process_; + Checker* checker_ = nullptr; public: - mc_snapshot_t parent_snapshot_; + std::shared_ptr parent_snapshot_; public: ModelChecker(ModelChecker const&) = delete; @@ -54,11 +55,6 @@ public: } const char* get_host_name(const char* name); - bool is_important_snapshot(Snapshot const& snapshot) const - { - return &snapshot == this->parent_snapshot_; - } - void start(); void shutdown(); void resume(simgrid::mc::Process& process); @@ -71,6 +67,12 @@ public: mc_model_checker->wait_client(mc_model_checker->process()); } void exit(int status); + + bool checkDeadlock(); + + Checker* getChecker() const { return checker_; } + void setChecker(Checker* checker) { checker_ = checker; } + private: void setup_ignore(); bool handle_message(char* buffer, ssize_t size);