-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2021. 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. */
#ifndef SIMGRID_MC_MODEL_CHECKER_HPP
#define SIMGRID_MC_MODEL_CHECKER_HPP
-#include <sys/types.h>
+#include "src/mc/remote/CheckerSide.hpp"
+#include "src/mc/sosp/PageStore.hpp"
+#include "xbt/base.h"
#include <memory>
#include <set>
#include <string>
-#include <event2/event.h>
-
-#include <xbt/base.h>
-#include <sys/types.h>
-
-#include "src/mc/PageStore.hpp"
-#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 event_base *base_;
- struct event* socket_event_;
- struct event* signal_event_;
+ CheckerSide checker_side_;
/** String pool for host names */
- // TODO, use std::set with heterogeneous comparison lookup (C++14)?
- std::set<std::string> hostnames_;
+ std::set<std::string, std::less<>> hostnames_;
// This is the parent snapshot of the current state:
- PageStore page_store_;
- std::unique_ptr<Process> process_;
+ PageStore page_store_{500};
+ std::unique_ptr<RemoteSimulation> remote_simulation_;
Checker* checker_ = nullptr;
-public:
- std::shared_ptr<simgrid::mc::Snapshot> parent_snapshot_;
public:
ModelChecker(ModelChecker const&) = delete;
ModelChecker& operator=(ModelChecker const&) = delete;
- explicit ModelChecker(std::unique_ptr<Process> process);
- ~ModelChecker();
+ explicit ModelChecker(std::unique_ptr<RemoteSimulation> remote_simulation, int sockfd);
- Process& process()
- {
- return *process_;
- }
+ RemoteSimulation& get_remote_simulation() { return *remote_simulation_; }
+ Channel& channel() { return checker_side_.get_channel(); }
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;
void start();
void shutdown();
- void resume(simgrid::mc::Process& process);
- void loop();
- void handle_events(int fd, short events);
- void wait_client(simgrid::mc::Process& process);
+ void resume(simgrid::mc::RemoteSimulation& get_remote_simulation);
+ void wait_for_requests();
void handle_simcall(Transition const& transition);
- void wait_for_requests()
- {
- mc_model_checker->wait_client(mc_model_checker->process());
- }
- void exit(int status);
+
+ XBT_ATTRIB_NORETURN void exit(int status);
bool checkDeadlock();
private:
void setup_ignore();
- bool handle_message(char* buffer, ssize_t size);
+ bool handle_message(const char* buffer, ssize_t size);
void handle_waitpid();
- void on_signal(int signo);
public:
unsigned long visited_states = 0;