X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ee4145af14401584b3bb2762ea61cb82347fb80..e4e4b7da7f6a6d04b659f0aa9c1de8733939096f:/src/mc/ModelChecker.hpp diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp index ecb376e46a..362ca9b427 100644 --- a/src/mc/ModelChecker.hpp +++ b/src/mc/ModelChecker.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2023. 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. */ @@ -10,29 +10,23 @@ #include "src/mc/remote/RemotePtr.hpp" #include "src/mc/sosp/PageStore.hpp" #include "xbt/base.h" -#include "xbt/string.hpp" #include -#include -namespace simgrid { -namespace mc { +namespace simgrid::mc { /** State of the model-checker (global variables for the model checker) */ class ModelChecker { CheckerSide checker_side_; - /** String pool for host names */ - std::set> hostnames_; // This is the parent snapshot of the current state: PageStore page_store_{500}; std::unique_ptr remote_process_; Exploration* exploration_ = nullptr; - unsigned long visited_states_ = 0; + FILE* dot_output_ = nullptr; - // Expect MessageType::SIMCALL_TO_STRING or MessageType::SIMCALL_DOT_LABEL - std::string simcall_to_string(MessageType type, aid_t aid, int times_considered); + unsigned long visited_states_ = 0; public: ModelChecker(ModelChecker const&) = delete; @@ -43,11 +37,6 @@ public: Channel& channel() { return checker_side_.get_channel(); } PageStore& page_store() { return page_store_; } - xbt::string const& get_host_name(const char* hostname) - { - return *this->hostnames_.insert(xbt::string(hostname)).first; - } - void start(); void shutdown(); void resume(); @@ -67,13 +56,24 @@ public: unsigned long get_visited_states() const { return visited_states_; } void inc_visited_states() { visited_states_++; } + void dot_output(const char* fmt, ...) XBT_ATTRIB_PRINTF(2, 3); + void dot_output_flush() + { + if (dot_output_ != nullptr) + fflush(dot_output_); + } + void dot_output_close() + { + if (dot_output_ != nullptr) + fclose(dot_output_); + } + private: void setup_ignore(); bool handle_message(const char* buffer, ssize_t size); void handle_waitpid(); }; -} -} +} // namespace simgrid::mc #endif