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
yes another attempt
[simgrid.git]
/
src
/
mc
/
Session.cpp
diff --git
a/src/mc/Session.cpp
b/src/mc/Session.cpp
index
a01cf12
..
da8c02b
100644
(file)
--- a/
src/mc/Session.cpp
+++ b/
src/mc/Session.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2015-201
7
. The SimGrid Team.
+/* Copyright (c) 2015-201
8
. 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
@@
-13,7
+13,7
@@
#include "xbt/system_error.hpp"
#include <mc/mc.h>
#include <simgrid/modelchecker.h>
#include "xbt/system_error.hpp"
#include <mc/mc.h>
#include <simgrid/modelchecker.h>
-#include <simgrid/sg_config.h>
+#include <simgrid/sg_config.h
pp
>
#include "src/mc/Session.hpp"
#include "src/mc/checker/Checker.hpp"
#include "src/mc/Session.hpp"
#include "src/mc/checker/Checker.hpp"
@@
-23,7
+23,6
@@
#include "src/smpi/include/private.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session");
#include "src/smpi/include/private.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session");
-extern std::string _sg_mc_dot_output_file;
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-88,7
+87,7
@@
Session::Session(pid_t pid, int socket)
{
std::unique_ptr<simgrid::mc::RemoteClient> process(new simgrid::mc::RemoteClient(pid, socket));
// TODO, automatic detection of the config from the process
{
std::unique_ptr<simgrid::mc::RemoteClient> process(new simgrid::mc::RemoteClient(pid, socket));
// TODO, automatic detection of the config from the process
- process->privatized(smpi_privatize_global_variables != S
MPI_PRIVATIZE_
NONE);
+ process->privatized(smpi_privatize_global_variables != S
mpiPrivStrategies::
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);
@@
-123,7
+122,7
@@
void Session::logState()
{
mc_model_checker->getChecker()->logState();
{
mc_model_checker->getChecker()->logState();
- if (not _sg_mc_dot_output_file.empty()) {
+ if (not _sg_mc_dot_output_file.
get().
empty()) {
fprintf(dot_output, "}\n");
fclose(dot_output);
}
fprintf(dot_output, "}\n");
fclose(dot_output);
}