#include <sys/types.h>
-#include <poll.h>
-
#include <memory>
#include <set>
#include <string>
-#include <simgrid_config.h>
-#include <xbt/base.h>
+#include <event2/event.h>
+
+#include "xbt/base.h"
#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/Process.hpp"
#include "src/mc/Transition.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/remote/mc_protocol.h"
namespace simgrid {
namespace mc {
/** 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)?
std::set<std::string> hostnames_;
public:
ModelChecker(ModelChecker const&) = delete;
ModelChecker& operator=(ModelChecker const&) = delete;
- ModelChecker(std::unique_ptr<Process> process);
+ explicit ModelChecker(std::unique_ptr<Process> process);
~ModelChecker();
Process& process()
void shutdown();
void resume(simgrid::mc::Process& process);
void loop();
- bool handle_events();
+ void handle_events(int fd, short events);
void wait_client(simgrid::mc::Process& process);
void handle_simcall(Transition const& transition);
void wait_for_requests()
private:
void setup_ignore();
bool handle_message(char* buffer, ssize_t size);
- void handle_signals();
void handle_waitpid();
- void on_signal(const struct signalfd_siginfo* info);
+ void on_signal(int signo);
public:
unsigned long visited_states = 0;