-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2019. 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/sosp/PageStore.hpp"
+#include "xbt/base.h"
#include <memory>
#include <set>
#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 {
std::set<std::string> hostnames_;
// 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_;
-public:
ModelChecker(ModelChecker const&) = delete;
ModelChecker& operator=(ModelChecker const&) = delete;
- explicit ModelChecker(std::unique_ptr<Process> process);
+ explicit ModelChecker(std::unique_ptr<RemoteClient> process);
~ModelChecker();
- Process& process()
- {
- return *process_;
- }
+ RemoteClient& process() { return *process_; }
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 resume(simgrid::mc::RemoteClient& process);
void loop();
void handle_events(int fd, short events);
- void wait_client(simgrid::mc::Process& process);
+ 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();