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
[mc] Use shared_ptr for Pair
[simgrid.git]
/
src
/
mc
/
ModelChecker.hpp
diff --git
a/src/mc/ModelChecker.hpp
b/src/mc/ModelChecker.hpp
index
ee1a955
..
2c1abd2
100644
(file)
--- a/
src/mc/ModelChecker.hpp
+++ b/
src/mc/ModelChecker.hpp
@@
-17,10
+17,10
@@
#include <xbt/base.h>
#include <sys/types.h>
#include <xbt/base.h>
#include <sys/types.h>
-#include "mc_forward.hpp"
+#include "
src/mc/
mc_forward.hpp"
#include "src/mc/Process.hpp"
#include "src/mc/PageStore.hpp"
#include "src/mc/Process.hpp"
#include "src/mc/PageStore.hpp"
-#include "mc_protocol.h"
+#include "
src/mc/
mc_protocol.h"
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-28,22
+28,21
@@
namespace mc {
/** State of the model-checker (global variables for the model checker)
*/
class ModelChecker {
/** State of the model-checker (global variables for the model checker)
*/
class ModelChecker {
- pid_t pid_;
- int socket_;
struct pollfd fds_[2];
/** String pool for host names */
struct pollfd fds_[2];
/** String pool for host names */
- // TODO, use std::
unordered_set with heterogeneous comparison lookup (C++14)
- xbt_dict_t /* <hostname,
NULL
> */ hostnames_;
+ // TODO, use std::
set with heterogeneous comparison lookup (C++14)?
+ xbt_dict_t /* <hostname,
nullptr
> */ hostnames_;
// This is the parent snapshot of the current state:
PageStore page_store_;
std::unique_ptr<Process> process_;
// This is the parent snapshot of the current state:
PageStore page_store_;
std::unique_ptr<Process> process_;
+ Checker* checker_ = nullptr;
public:
public:
-
mc_snapshot_t
parent_snapshot_;
+
std::shared_ptr<simgrid::mc::Snapshot>
parent_snapshot_;
public:
ModelChecker(ModelChecker const&) = delete;
ModelChecker& operator=(ModelChecker const&) = delete;
public:
ModelChecker(ModelChecker const&) = delete;
ModelChecker& operator=(ModelChecker const&) = delete;
- ModelChecker(
pid_t pid, int socket
);
+ ModelChecker(
std::unique_ptr<Process> process
);
~ModelChecker();
Process& process()
~ModelChecker();
Process& process()
@@
-56,11
+55,6
@@
public:
}
const char* get_host_name(const char* name);
}
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);
void start();
void shutdown();
void resume(simgrid::mc::Process& process);
@@
-72,6
+66,13
@@
public:
{
mc_model_checker->wait_client(mc_model_checker->process());
}
{
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);
private:
void setup_ignore();
bool handle_message(char* buffer, ssize_t size);