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' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
VisitedState.cpp
diff --git
a/src/mc/VisitedState.cpp
b/src/mc/VisitedState.cpp
index
a59df31
..
85bf68f
100644
(file)
--- a/
src/mc/VisitedState.cpp
+++ b/
src/mc/VisitedState.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2011-201
7
. 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. */
@@
-13,11
+13,11
@@
#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_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 equality detection mechanisms");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_VisitedState, mc, "Logging specific to state equality detection mechanisms");
@@
-34,9
+34,9
@@
static int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::Visi
}
/** @brief Save the current state */
}
/** @brief Save the current state */
-VisitedState::VisitedState(unsigned long state_number)
+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());
@@
-44,14
+44,9
@@
VisitedState::VisitedState(unsigned long state_number)
this->actors_count = mc_model_checker->process().actors().size();
this->system_state = simgrid::mc::take_snapshot(state_number);
this->actors_count = mc_model_checker->process().actors().size();
this->system_state = simgrid::mc::take_snapshot(state_number);
- this->num = state_number;
this->original_num = -1;
}
this->original_num = -1;
}
-VisitedState::~VisitedState()
-{
-}
-
void VisitedStates::prune()
{
while (states_.size() > (std::size_t)_sg_mc_max_visited_states) {
void VisitedStates::prune()
{
while (states_.size() > (std::size_t)_sg_mc_max_visited_states) {
@@
-67,8
+62,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)
{