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 'klement/simgrid-klement' into master
[simgrid.git]
/
src
/
mc
/
Session.hpp
diff --git
a/src/mc/Session.hpp
b/src/mc/Session.hpp
index
f53d948
..
7934ec0
100644
(file)
--- a/
src/mc/Session.hpp
+++ b/
src/mc/Session.hpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2016-2020. 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,22
+6,11
@@
#ifndef SIMGRID_MC_SESSION_HPP
#define SIMGRID_MC_SESSION_HPP
#ifndef SIMGRID_MC_SESSION_HPP
#define SIMGRID_MC_SESSION_HPP
-#ifdef __linux__
-#include <sys/prctl.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <xbt/sysdep.h>
-#include <xbt/system_error.hpp>
+#include "simgrid/forward.h"
+#include "src/mc/ModelChecker.hpp"
#include <functional>
#include <functional>
-#include <xbt/log.h>
-
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/ModelChecker.hpp"
-
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-34,37
+22,37
@@
namespace mc {
* algorithms should be able to be written in high-level languages
* (e.g. Python) using bindings on this interface.
*/
* algorithms should be able to be written in high-level languages
* (e.g. Python) using bindings on this interface.
*/
-class Session {
+class
XBT_PUBLIC
Session {
private:
private:
- std::unique_ptr<ModelChecker> modelChecker_;
-
-private: //
- Session(pid_t pid, int socket);
+ std::unique_ptr<ModelChecker> model_checker_;
+ std::shared_ptr<simgrid::mc::Snapshot> initial_snapshot_;
// No copy:
Session(Session const&) = delete;
Session& operator=(Session const&) = delete;
public:
// No copy:
Session(Session const&) = delete;
Session& operator=(Session const&) = delete;
public:
- ~Session();
- void close();
-
-public: // static constructors
-
- /** Create a new session by forking
+ /** Create a new session by executing the provided code in a fork()
+ *
+ * This sets up the environment for the model-checked process
+ * (environment variables, sockets, etc.).
*
*
- * The code is expected to `exec` the model-checke
r program
.
+ * The code is expected to `exec` the model-checke
d application
.
*/
*/
- static Session* fork(std::function<void(void)> code);
+ explicit Session(const std::function<void()>& code);
+
+ ~Session();
+ void close();
- /** Create a session using `execv` */
- static Session* spawnv(const char *path, char *const argv[]);
+ void initialize();
+ void execute(Transition const& transition) const;
+ void log_state() const;
- /** Create a session using `execvp` */
-
static Session* spawnvp(const char *path, char *const argv[])
;
+ void restore_initial_state() const;
+
bool actor_is_enabled(aid_t pid) const
;
};
};
-// Temporary
+// Temporary
:)
extern simgrid::mc::Session* session;
}
extern simgrid::mc::Session* session;
}