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
nope sonar, that's not some commented code
[simgrid.git]
/
src
/
mc
/
VisitedState.cpp
diff --git
a/src/mc/VisitedState.cpp
b/src/mc/VisitedState.cpp
index
5d547bf
..
a17dbb4
100644
(file)
--- a/
src/mc/VisitedState.cpp
+++ b/
src/mc/VisitedState.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2011-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2011-2019. 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. */
@@
-11,18
+10,16
@@
#include <boost/range/algorithm.hpp>
#include <boost/range/algorithm.hpp>
-#include
<xbt/log.h>
-#include
<xbt/sysdep.h>
+#include
"xbt/log.h"
+#include
"xbt/sysdep.h"
-#include "src/mc/mc_comm_pattern.h"
-#include "src/mc/mc_safety.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/Process.hpp"
-#include "src/mc/mc_smx.h"
#include "src/mc/VisitedState.hpp"
#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 equaity detection mechanisms");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_VisitedState, mc, "Logging specific to state equality detection mechanisms");
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-31,37
+28,26
@@
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
- * \return Snapshot of the current state.
- */
-VisitedState::VisitedState(unsigned long state_number)
+/** @brief Save the current state */
+VisitedState::VisitedState(unsigned long state_number) : num(state_number)
{
{
- simgrid::mc::
Process
* process = &(mc_model_checker->process());
+ simgrid::mc::
RemoteClient
* process = &(mc_model_checker->process());
this->heap_bytes_used = mmalloc_get_bytes_used_remote(
process->get_heap()->heaplimit,
process->get_malloc_info());
this->heap_bytes_used = mmalloc_get_bytes_used_remote(
process->get_heap()->heaplimit,
process->get_malloc_info());
- this->nb_processes =
- mc_model_checker->process().simix_processes().size();
+ this->actors_count = mc_model_checker->process().actors().size();
this->system_state = simgrid::mc::take_snapshot(state_number);
this->system_state = simgrid::mc::take_snapshot(state_number);
- this->num = state_number;
- this->other_num = -1;
-}
-
-VisitedState::~VisitedState()
-{
+ this->original_num = -1;
}
void VisitedStates::prune()
{
}
void VisitedStates::prune()
{
- while (states_.size() > (std::size_t)
_sg_mc_visited
) {
+ while (states_.size() > (std::size_t)
_sg_mc_max_visited_states
) {
XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)");
auto min_element = boost::range::min_element(states_,
[](std::unique_ptr<simgrid::mc::VisitedState>& a, std::unique_ptr<simgrid::mc::VisitedState>& b) {
XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)");
auto min_element = boost::range::min_element(states_,
[](std::unique_ptr<simgrid::mc::VisitedState>& a, std::unique_ptr<simgrid::mc::VisitedState>& b) {
@@
-74,9
+60,7
@@
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(
unsigned long state_number, 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)
{
@@
-86,8
+70,8
@@
std::unique_ptr<simgrid::mc::VisitedState> VisitedStates::addVisitedState(
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 =
boost::range::equal_range(states_,
-
new_state.get(), simgrid::mc::DerefAndCompareByNbProcesses
AndUsedHeap());
+ auto range =
+
boost::range::equal_range(states_, new_state.get(), simgrid::mc::DerefAndCompareByActorsCount
AndUsedHeap());
if (compare_snpashots)
for (auto i = range.first; i != range.second; ++i) {
if (compare_snpashots)
for (auto i = range.first; i != range.second; ++i) {
@@
-98,18
+82,17
@@
std::unique_ptr<simgrid::mc::VisitedState> VisitedStates::addVisitedState(
std::unique_ptr<simgrid::mc::VisitedState> old_state =
std::move(visited_state);
std::unique_ptr<simgrid::mc::VisitedState> old_state =
std::move(visited_state);
- if (old_state->o
ther_num == -1)
- new_state->o
ther
_num = old_state->num;
- else
- new_state->o
ther_num = old_state->other
_num;
+ if (old_state->o
riginal_num == -1) // I'm the copy of an original process
+ new_state->o
riginal
_num = old_state->num;
+ else
// I'm the copy of a copy
+ new_state->o
riginal_num = old_state->original
_num;
if (dot_output == nullptr)
XBT_DEBUG("State %d already visited ! (equal to state %d)",
if (dot_output == nullptr)
XBT_DEBUG("State %d already visited ! (equal to state %d)",
- new_state->num, old_state->num);
+
new_state->num, old_state->num);
else
else
- XBT_DEBUG(
- "State %d already visited ! (equal to state %d (state %d in dot_output))",
- new_state->num, old_state->num, new_state->other_num);
+ XBT_DEBUG("State %d already visited ! (equal to state %d (state %d in dot_output))",
+ new_state->num, old_state->num, new_state->original_num);
/* Replace the old state with the new one (with a bigger num)
(when the max number of visited states is reached, the oldest
/* Replace the old state with the new one (with a bigger num)
(when the max number of visited states is reached, the oldest