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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
Session.hpp
diff --git
a/src/mc/Session.hpp
b/src/mc/Session.hpp
index
caccae0
..
39ab91a
100644
(file)
--- a/
src/mc/Session.hpp
+++ b/
src/mc/Session.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2016. The SimGrid Team.
+/* Copyright (c) 2016
-2018
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-11,14
+11,14
@@
#include <sys/prctl.h>
#endif
#include <sys/prctl.h>
#endif
-#include <sys/types.h>
+#include "xbt/sysdep.h"
+#include "xbt/system_error.hpp"
#include <sys/socket.h>
#include <sys/socket.h>
-#include <xbt/sysdep.h>
-#include <xbt/system_error.hpp>
+#include <sys/types.h>
#include <functional>
#include <functional>
-#include
<xbt/log.h>
+#include
"xbt/log.h"
#include "src/mc/mc_forward.hpp"
#include "src/mc/ModelChecker.hpp"
#include "src/mc/mc_forward.hpp"
#include "src/mc/ModelChecker.hpp"
@@
-39,7
+39,6
@@
private:
std::unique_ptr<ModelChecker> modelChecker_;
std::shared_ptr<simgrid::mc::Snapshot> initialSnapshot_;
std::unique_ptr<ModelChecker> modelChecker_;
std::shared_ptr<simgrid::mc::Snapshot> initialSnapshot_;
-private:
Session(pid_t pid, int socket);
// No copy:
Session(pid_t pid, int socket);
// No copy:
@@
-50,14
+49,13
@@
public:
~Session();
void close();
~Session();
void close();
-public:
void initialize();
void execute(Transition const& transition);
void logState();
void restoreInitialState();
void initialize();
void execute(Transition const& transition);
void logState();
void restoreInitialState();
-
public:
// static constructors
+
// static constructors
/** Create a new session by forking
*
/** Create a new session by forking
*