#include <sys/types.h>
-#include <poll.h>
#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>
/** 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_, *signal_event_;
/** 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_;
std::unique_ptr<Process> process_;
{
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 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;