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
Use a more specific exception.
[simgrid.git]
/
src
/
mc
/
VisitedState.cpp
diff --git
a/src/mc/VisitedState.cpp
b/src/mc/VisitedState.cpp
index
a2348a8
..
cb22a57
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-2017. 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 {
@@
-36,13
+33,10
@@
static int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::Visi
return snapshot_compare(num1, s1, num2, s2);
}
return snapshot_compare(num1, s1, num2, 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());
@@
-50,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) {