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' into depencencies
[simgrid.git]
/
src
/
mc
/
Session.cpp
diff --git
a/src/mc/Session.cpp
b/src/mc/Session.cpp
index
c806450
..
8079ed7
100644
(file)
--- a/
src/mc/Session.cpp
+++ b/
src/mc/Session.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2015-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-20
20
. 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. */
@@
-6,7
+6,10
@@
#include "src/mc/Session.hpp"
#include "src/mc/checker/Checker.hpp"
#include "src/mc/mc_config.hpp"
#include "src/mc/Session.hpp"
#include "src/mc/checker/Checker.hpp"
#include "src/mc/mc_config.hpp"
-#include "src/smpi/include/smpi_config.hpp"
+#include "src/internal_config.h" // HAVE_SMPI
+#if HAVE_SMPI
+#include "smpi/smpi.h"
+#endif
#include "src/mc/mc_private.hpp"
#include "src/mc/mc_state.hpp"
#include "xbt/log.h"
#include "src/mc/mc_private.hpp"
#include "src/mc/mc_state.hpp"
#include "xbt/log.h"
@@
-24,6
+27,10
@@
namespace mc {
static void setup_child_environment(int socket)
{
static void setup_child_environment(int socket)
{
+ /* On startup, simix_global_init() calls simgrid::mc::Client::initialize(), which checks whether the MC_ENV_SOCKET_FD
+ * env variable is set. If so, MC mode is assumed, and the client is setup from its side
+ */
+
#ifdef __linux__
// Make sure we do not outlive our parent
sigset_t mask;
#ifdef __linux__
// Make sure we do not outlive our parent
sigset_t mask;
@@
-72,7
+79,7
@@
Session::Session(const std::function<void()>& code)
::close(sockets[1]);
setup_child_environment(sockets[0]);
code();
::close(sockets[1]);
setup_child_environment(sockets[0]);
code();
- xbt_die("The model-checked process failed to exec()
"
);
+ xbt_die("The model-checked process failed to exec()
: %s", strerror(errno)
);
}
// Parent (model-checker):
}
// Parent (model-checker):
@@
-92,6
+99,7
@@
Session::~Session()
this->close();
}
this->close();
}
+/** Take the initial snapshot of the application, that must be stopped. */
void Session::initialize()
{
xbt_assert(initial_snapshot_ == nullptr);
void Session::initialize()
{
xbt_assert(initial_snapshot_ == nullptr);
@@
-120,7
+128,8
@@
void Session::log_state()
}
if (getenv("SIMGRID_MC_SYSTEM_STATISTICS")){
int ret=system("free");
}
if (getenv("SIMGRID_MC_SYSTEM_STATISTICS")){
int ret=system("free");
- if(ret!=0)XBT_WARN("system call did not return 0, but %d",ret);
+ if (ret != 0)
+ XBT_WARN("Call to system(free) did not return 0, but %d", ret);
}
}
}
}