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
move parts of the kernel to the right subdir
[simgrid.git]
/
src
/
mc
/
VisitedState.cpp
diff --git
a/src/mc/VisitedState.cpp
b/src/mc/VisitedState.cpp
index
4399f82
..
3aa0e5f
100644
(file)
--- a/
src/mc/VisitedState.cpp
+++ b/
src/mc/VisitedState.cpp
@@
-8,13
+8,11
@@
#include <sys/wait.h>
#include <memory>
#include <sys/wait.h>
#include <memory>
-#include <algorithm>
+
+#include <boost/range/algorithm.hpp>
#include <xbt/log.h>
#include <xbt/sysdep.h>
#include <xbt/log.h>
#include <xbt/sysdep.h>
-#include <xbt/dynar.h>
-#include <xbt/dynar.hpp>
-#include <xbt/fifo.h>
#include "src/mc/mc_comm_pattern.h"
#include "src/mc/mc_safety.h"
#include "src/mc/mc_comm_pattern.h"
#include "src/mc/mc_safety.h"
@@
-42,7
+40,7
@@
static int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::Visi
* \brief Save the current state
* \return Snapshot of the current state.
*/
* \brief Save the current state
* \return Snapshot of the current state.
*/
-VisitedState::VisitedState()
+VisitedState::VisitedState(
unsigned long state_number
)
{
simgrid::mc::Process* process = &(mc_model_checker->process());
this->heap_bytes_used = mmalloc_get_bytes_used_remote(
{
simgrid::mc::Process* process = &(mc_model_checker->process());
this->heap_bytes_used = mmalloc_get_bytes_used_remote(
@@
-52,8
+50,8
@@
VisitedState::VisitedState()
this->nb_processes =
mc_model_checker->process().simix_processes().size();
this->nb_processes =
mc_model_checker->process().simix_processes().size();
- this->system_state = simgrid::mc::take_snapshot(
mc_stats->expanded_states
);
- this->num =
mc_stats->expanded_states
;
+ this->system_state = simgrid::mc::take_snapshot(
state_number
);
+ this->num =
state_number
;
this->other_num = -1;
}
this->other_num = -1;
}
@@
-65,7
+63,7
@@
void VisitedStates::prune()
{
while (states_.size() > (std::size_t) _sg_mc_visited) {
XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)");
{
while (states_.size() > (std::size_t) _sg_mc_visited) {
XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)");
- auto min_element =
std::min_element(states_.begin(), states_.end()
,
+ auto min_element =
boost::range::min_element(states_
,
[](std::unique_ptr<simgrid::mc::VisitedState>& a, std::unique_ptr<simgrid::mc::VisitedState>& b) {
return a->num < b->num;
});
[](std::unique_ptr<simgrid::mc::VisitedState>& a, std::unique_ptr<simgrid::mc::VisitedState>& b) {
return a->num < b->num;
});
@@
-79,16
+77,16
@@
void VisitedStates::prune()
/**
* \brief Checks whether a given state has already been visited by the algorithm.
*/
/**
* \brief Checks whether a given state has already been visited by the algorithm.
*/
-std::unique_ptr<simgrid::mc::VisitedState> VisitedStates::addVisitedState(simgrid::mc::State* graph_state, bool compare_snpashots)
+std::unique_ptr<simgrid::mc::VisitedState> VisitedStates::addVisitedState(
+ unsigned long state_number, simgrid::mc::State* graph_state, bool compare_snpashots)
{
std::unique_ptr<simgrid::mc::VisitedState> new_state =
{
std::unique_ptr<simgrid::mc::VisitedState> new_state =
- std::unique_ptr<simgrid::mc::VisitedState>(new VisitedState());
+ std::unique_ptr<simgrid::mc::VisitedState>(new VisitedState(
state_number
));
graph_state->system_state = new_state->system_state;
graph_state->system_state = new_state->system_state;
- graph_state->in_visited_states = 1;
XBT_DEBUG("Snapshot %p of visited state %d (exploration stack state %d)",
new_state->system_state.get(), new_state->num, graph_state->num);
XBT_DEBUG("Snapshot %p of visited state %d (exploration stack state %d)",
new_state->system_state.get(), new_state->num, graph_state->num);
- auto range =
std::equal_range(states_.begin(), states_.end()
,
+ auto range =
boost::range::equal_range(states_
,
new_state.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
if (compare_snpashots)
new_state.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
if (compare_snpashots)