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: Further renamings
[simgrid.git]
/
src
/
mc
/
ModelChecker.hpp
diff --git
a/src/mc/ModelChecker.hpp
b/src/mc/ModelChecker.hpp
index
2a07560
..
cf5c3c6
100644
(file)
--- a/
src/mc/ModelChecker.hpp
+++ b/
src/mc/ModelChecker.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
20
. 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. */
@@
-6,6
+6,7
@@
#ifndef SIMGRID_MC_MODEL_CHECKER_HPP
#define SIMGRID_MC_MODEL_CHECKER_HPP
#ifndef SIMGRID_MC_MODEL_CHECKER_HPP
#define SIMGRID_MC_MODEL_CHECKER_HPP
+#include "src/mc/remote/CheckerSide.hpp"
#include "src/mc/sosp/PageStore.hpp"
#include "xbt/base.h"
#include "src/mc/sosp/PageStore.hpp"
#include "xbt/base.h"
@@
-13,41
+14,32
@@
#include <set>
#include <string>
#include <set>
#include <string>
-#include <event2/event.h>
-
namespace simgrid {
namespace mc {
/** State of the model-checker (global variables for the model checker)
*/
class ModelChecker {
namespace simgrid {
namespace mc {
/** State of the model-checker (global variables for the model checker)
*/
class ModelChecker {
- struct event_base *base_;
- struct event* socket_event_;
- struct event* signal_event_;
+ CheckerSide checker_side_;
/** String pool for host names */
/** String pool for host names */
- // TODO, use std::set with heterogeneous comparison lookup (C++14)?
std::set<std::string> hostnames_;
// This is the parent snapshot of the current state:
std::set<std::string> hostnames_;
// This is the parent snapshot of the current state:
- PageStore page_store_;
- std::unique_ptr<Remote
Client> process
_;
+ PageStore page_store_
{500}
;
+ std::unique_ptr<Remote
Simulation> remote_simulation
_;
Checker* checker_ = nullptr;
Checker* checker_ = nullptr;
-public:
+public:
ModelChecker(ModelChecker const&) = delete;
ModelChecker& operator=(ModelChecker const&) = delete;
ModelChecker(ModelChecker const&) = delete;
ModelChecker& operator=(ModelChecker const&) = delete;
- explicit ModelChecker(std::unique_ptr<RemoteClient> process);
- ~ModelChecker();
+ explicit ModelChecker(std::unique_ptr<RemoteSimulation> remote_simulation, int sockfd);
- RemoteClient& process() { return *process_; }
+ RemoteSimulation& get_remote_simulation() { return *remote_simulation_; }
+ Channel& channel() { return checker_side_.get_channel(); }
PageStore& page_store()
{
return page_store_;
}
PageStore& page_store()
{
return page_store_;
}
- std::string const& get_host_name(const char* hostname)
- {
- return *this->hostnames_.insert(hostname).first;
- }
std::string const& get_host_name(std::string const& hostname)
{
return *this->hostnames_.insert(hostname).first;
std::string const& get_host_name(std::string const& hostname)
{
return *this->hostnames_.insert(hostname).first;
@@
-55,11
+47,11
@@
public:
void start();
void shutdown();
void start();
void shutdown();
- void resume(simgrid::mc::RemoteClient& process);
- void loop();
+ void resume(simgrid::mc::RemoteSimulation& get_remote_simulation);
void handle_events(int fd, short events);
void wait_for_requests();
void handle_simcall(Transition const& transition);
void handle_events(int fd, short events);
void wait_for_requests();
void handle_simcall(Transition const& transition);
+
XBT_ATTRIB_NORETURN void exit(int status);
bool checkDeadlock();
XBT_ATTRIB_NORETURN void exit(int status);
bool checkDeadlock();
@@
-69,9
+61,8
@@
public:
private:
void setup_ignore();
private:
void setup_ignore();
- bool handle_message(char* buffer, ssize_t size);
+ bool handle_message(c
onst c
har* buffer, ssize_t size);
void handle_waitpid();
void handle_waitpid();
- void on_signal(int signo);
public:
unsigned long visited_states = 0;
public:
unsigned long visited_states = 0;