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
try to get rid of linking issue
[simgrid.git]
/
src
/
mc
/
ModelChecker.hpp
diff --git
a/src/mc/ModelChecker.hpp
b/src/mc/ModelChecker.hpp
index
394a8c1
..
d3bcbcb
100644
(file)
--- a/
src/mc/ModelChecker.hpp
+++ b/
src/mc/ModelChecker.hpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2018. 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. */
@@
-9,19
+8,17
@@
#include <sys/types.h>
#include <sys/types.h>
-#include <poll.h>
#include <memory>
#include <memory>
+#include <set>
+#include <string>
+
+#include <event2/event.h>
-#include <simgrid_config.h>
-#include <xbt/dict.h>
-#include <xbt/base.h>
#include <sys/types.h>
#include "src/mc/mc_forward.hpp"
#include <sys/types.h>
#include "src/mc/mc_forward.hpp"
-#include "src/mc/Process.hpp"
-#include "src/mc/PageStore.hpp"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/Transition.hpp"
+#include "src/mc/remote/mc_protocol.h"
+#include "src/mc/sosp/PageStore.hpp"
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-29,44
+26,46
@@
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 {
- struct pollfd fds_[2];
+ struct event_base *base_;
+ struct event* socket_event_;
+ struct event* signal_event_;
/** String pool for host names */
// TODO, use std::set with heterogeneous comparison lookup (C++14)?
/** String pool for host names */
// TODO, use std::set with heterogeneous comparison lookup (C++14)?
-
xbt_dict_t /* <hostname, nullptr> */
hostnames_;
+
std::set<std::string>
hostnames_;
// This is the parent snapshot of the current state:
PageStore page_store_;
// This is the parent snapshot of the current state:
PageStore page_store_;
- std::unique_ptr<
Process
> process_;
+ std::unique_ptr<
RemoteClient
> process_;
Checker* checker_ = nullptr;
public:
std::shared_ptr<simgrid::mc::Snapshot> parent_snapshot_;
Checker* checker_ = nullptr;
public:
std::shared_ptr<simgrid::mc::Snapshot> parent_snapshot_;
-public:
ModelChecker(ModelChecker const&) = delete;
ModelChecker& operator=(ModelChecker const&) = delete;
ModelChecker(ModelChecker const&) = delete;
ModelChecker& operator=(ModelChecker const&) = delete;
-
ModelChecker(std::unique_ptr<Process
> process);
+
explicit ModelChecker(std::unique_ptr<RemoteClient
> process);
~ModelChecker();
~ModelChecker();
- Process& process()
- {
- return *process_;
- }
+ RemoteClient& process() { return *process_; }
PageStore& page_store()
{
return page_store_;
}
PageStore& page_store()
{
return page_store_;
}
- const char* get_host_name(const char* name);
+
+ 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;
+ }
void start();
void shutdown();
void start();
void shutdown();
- void resume(simgrid::mc::
Process
& process);
+ void resume(simgrid::mc::
RemoteClient
& process);
void loop();
void loop();
-
bool handle_events(
);
- void wait_
client(simgrid::mc::Process& process
);
+
void handle_events(int fd, short events
);
+ void wait_
for_requests(
);
void handle_simcall(Transition const& transition);
void handle_simcall(Transition const& transition);
- void wait_for_requests()
- {
- mc_model_checker->wait_client(mc_model_checker->process());
- }
void exit(int status);
bool checkDeadlock();
void exit(int status);
bool checkDeadlock();
@@
-77,10
+76,12
@@
public:
private:
void setup_ignore();
bool handle_message(char* buffer, ssize_t size);
private:
void setup_ignore();
bool handle_message(char* buffer, ssize_t size);
- void handle_signals();
void handle_waitpid();
void handle_waitpid();
- void on_signal(
const struct signalfd_siginfo* inf
o);
+ void on_signal(
int sign
o);
+public:
+ unsigned long visited_states = 0;
+ unsigned long executed_transitions = 0;
};
}
};
}