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
setup.py: try to specify that we need pybind11
[simgrid.git]
/
src
/
mc
/
VisitedState.cpp
diff --git
a/src/mc/VisitedState.cpp
b/src/mc/VisitedState.cpp
index 6b833dc2e6a18697a03cff0c91c647f33237ad9d..2d39dedf8eeb046c6fba25d1cb6eba5892fea69a 100644
(file)
--- a/
src/mc/VisitedState.cpp
+++ b/
src/mc/VisitedState.cpp
@@
-1,24
+1,16
@@
-/* Copyright (c) 2011-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2011-201
9
. 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. */
+#include "src/mc/VisitedState.hpp"
+#include "src/mc/mc_private.hpp"
+
#include <unistd.h>
#include <sys/wait.h>
#include <unistd.h>
#include <sys/wait.h>
-
#include <memory>
#include <memory>
-
#include <boost/range/algorithm.hpp>
#include <boost/range/algorithm.hpp>
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
-
-#include "src/mc/VisitedState.hpp"
-#include "src/mc/mc_comm_pattern.hpp"
-#include "src/mc/mc_private.hpp"
-#include "src/mc/mc_smx.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_VisitedState, mc, "Logging specific to state equality detection mechanisms");
namespace simgrid {
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_VisitedState, mc, "Logging specific to state equality detection mechanisms");
namespace simgrid {
@@
-28,9
+20,7
@@
static int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::Visi
{
simgrid::mc::Snapshot* s1 = state1->system_state.get();
simgrid::mc::Snapshot* s2 = state2->system_state.get();
{
simgrid::mc::Snapshot* s1 = state1->system_state.get();
simgrid::mc::Snapshot* s2 = state2->system_state.get();
- int num1 = state1->num;
- int num2 = state2->num;
- return snapshot_compare(num1, s1, num2, s2);
+ return snapshot_compare(s1, s2);
}
/** @brief Save the current state */
}
/** @brief Save the current state */
@@
-43,7
+33,7
@@
VisitedState::VisitedState(unsigned long state_number) : num(state_number)
this->actors_count = mc_model_checker->process().actors().size();
this->actors_count = mc_model_checker->process().actors().size();
- this->system_state = s
imgrid::mc::take_snapshot
(state_number);
+ this->system_state = s
td::make_shared<simgrid::mc::Snapshot>
(state_number);
this->original_num = -1;
}
this->original_num = -1;
}