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
useless cosmetics around NS3 long routes
[simgrid.git]
/
src
/
mc
/
Session.cpp
diff --git
a/src/mc/Session.cpp
b/src/mc/Session.cpp
index
095d4b0
..
8195c5c
100644
(file)
--- a/
src/mc/Session.cpp
+++ b/
src/mc/Session.cpp
@@
-18,7
+18,7
@@
#include "src/mc/Session.hpp"
#include "src/mc/mc_state.h"
#include "src/mc/mc_private.h"
#include "src/mc/Session.hpp"
#include "src/mc/mc_state.h"
#include "src/mc/mc_private.h"
-#include "src/mc/Checker.hpp"
+#include "src/mc/
checker/
Checker.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session");
@@
-85,8
+85,7
@@
Session::Session(pid_t pid, int socket)
{
std::unique_ptr<simgrid::mc::Process> process(new simgrid::mc::Process(pid, socket));
// TODO, automatic detection of the config from the process
{
std::unique_ptr<simgrid::mc::Process> process(new simgrid::mc::Process(pid, socket));
// TODO, automatic detection of the config from the process
- process->privatized(
- xbt_cfg_get_boolean("smpi/privatize_global_variables"));
+ process->privatized(smpi_privatize_global_variables != SMPI_PRIVATIZE_NONE);
modelChecker_ = std::unique_ptr<ModelChecker>(
new simgrid::mc::ModelChecker(std::move(process)));
xbt_assert(mc_model_checker == nullptr);
modelChecker_ = std::unique_ptr<ModelChecker>(
new simgrid::mc::ModelChecker(std::move(process)));
xbt_assert(mc_model_checker == nullptr);
@@
-143,7
+142,7
@@
Session* Session::fork(std::function<void(void)> code)
if (res == -1)
throw simgrid::xbt::errno_error("Could not create socketpair");
if (res == -1)
throw simgrid::xbt::errno_error("Could not create socketpair");
- pid_t pid = do_fork([
&
] {
+ pid_t pid = do_fork([
sockets, &code
] {
::close(sockets[1]);
setup_child_environment(sockets[0]);
code();
::close(sockets[1]);
setup_child_environment(sockets[0]);
code();
@@
-159,16
+158,16
@@
Session* Session::fork(std::function<void(void)> code)
// static
Session* Session::spawnv(const char *path, char *const argv[])
{
// static
Session* Session::spawnv(const char *path, char *const argv[])
{
- return Session::fork([
&
] {
+ return Session::fork([
path, argv
] {
execv(path, argv);
});
}
// static
execv(path, argv);
});
}
// static
-Session* Session::spawnvp(const char *
path
, char *const argv[])
+Session* Session::spawnvp(const char *
file
, char *const argv[])
{
{
- return Session::fork([
&
] {
- execvp(
path
, argv);
+ return Session::fork([
file, argv
] {
+ execvp(
file
, argv);
});
}
});
}