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
MC/compare: compare_heap_area_without_type becomes heap_area_equal_without_type.
[simgrid.git]
/
src
/
mc
/
ModelChecker.hpp
diff --git
a/src/mc/ModelChecker.hpp
b/src/mc/ModelChecker.hpp
index
e7b7e90
..
d5016d3
100644
(file)
--- a/
src/mc/ModelChecker.hpp
+++ b/
src/mc/ModelChecker.hpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2007-2017. 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. */
/* 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. */
@@
-7,7
+6,8
@@
#ifndef SIMGRID_MC_MODEL_CHECKER_HPP
#define SIMGRID_MC_MODEL_CHECKER_HPP
#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 <memory>
#include <set>
@@
-15,15
+15,6
@@
#include <event2/event.h>
#include <event2/event.h>
-#include "xbt/base.h"
-#include <sys/types.h>
-
-#include "src/mc/PageStore.hpp"
-#include "src/mc/Transition.hpp"
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
-#include "src/mc/remote/mc_protocol.h"
-
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-41,7
+32,6
@@
class ModelChecker {
std::unique_ptr<RemoteClient> process_;
Checker* checker_ = nullptr;
public:
std::unique_ptr<RemoteClient> process_;
Checker* checker_ = nullptr;
public:
- std::shared_ptr<simgrid::mc::Snapshot> parent_snapshot_;
ModelChecker(ModelChecker const&) = delete;
ModelChecker& operator=(ModelChecker const&) = delete;
ModelChecker(ModelChecker const&) = delete;
ModelChecker& operator=(ModelChecker const&) = delete;
@@
-54,10
+44,6
@@
public:
return 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;
std::string const& get_host_name(std::string const& hostname)
{
return *this->hostnames_.insert(hostname).first;
@@
-70,7
+56,7
@@
public:
void handle_events(int fd, short events);
void wait_for_requests();
void handle_simcall(Transition const& transition);
void handle_events(int fd, short events);
void wait_for_requests();
void handle_simcall(Transition const& transition);
- void exit(int status);
+
XBT_ATTRIB_NORETURN
void exit(int status);
bool checkDeadlock();
bool checkDeadlock();