A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'udpor-phase3' into 'master'
[simgrid.git]
/
src
/
mc
/
ModelChecker.hpp
diff --git
a/src/mc/ModelChecker.hpp
b/src/mc/ModelChecker.hpp
index ecb376e46a13c692cab1d6fbb54cbf573ab7b343..362ca9b4272154351732cdf5070e56d09cfaf856 100644
(file)
--- a/
src/mc/ModelChecker.hpp
+++ b/
src/mc/ModelChecker.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-202
3
. 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. */
/* 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 "src/mc/remote/RemotePtr.hpp"
#include "src/mc/sosp/PageStore.hpp"
#include "xbt/base.h"
-#include "xbt/string.hpp"
#include <memory>
#include <memory>
-#include <set>
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
/** State of the model-checker (global variables for the model checker)
*/
class ModelChecker {
CheckerSide checker_side_;
/** State of the model-checker (global variables for the model checker)
*/
class ModelChecker {
CheckerSide checker_side_;
- /** String pool for host names */
- std::set<xbt::string, std::less<>> hostnames_;
// This is the parent snapshot of the current state:
PageStore page_store_{500};
std::unique_ptr<RemoteProcess> remote_process_;
Exploration* exploration_ = nullptr;
// This is the parent snapshot of the current state:
PageStore page_store_{500};
std::unique_ptr<RemoteProcess> 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;
public:
ModelChecker(ModelChecker const&) = delete;
@@
-43,11
+37,6
@@
public:
Channel& channel() { return checker_side_.get_channel(); }
PageStore& page_store() { return page_store_; }
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();
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_++; }
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();
};
private:
void setup_ignore();
bool handle_message(const char* buffer, ssize_t size);
void handle_waitpid();
};
-}
-}
+} // namespace simgrid::mc
#endif
#endif