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
bugs, smells and cosmetics of the day
[simgrid.git]
/
src
/
mc
/
mc_checkpoint.cpp
diff --git
a/src/mc/mc_checkpoint.cpp
b/src/mc/mc_checkpoint.cpp
index
d6e234c
..
3716919
100644
(file)
--- a/
src/mc/mc_checkpoint.cpp
+++ b/
src/mc/mc_checkpoint.cpp
@@
-32,12
+32,12
@@
#include "src/mc/mc_private.h"
#include <mc/mc.h>
#include "src/mc/mc_private.h"
#include <mc/mc.h>
-#include "src/mc/mc_
snapshot.h
"
+#include "src/mc/mc_
hash.hpp
"
#include "src/mc/mc_mmu.h"
#include "src/mc/mc_mmu.h"
-#include "src/mc/mc_unw.h"
-#include "src/mc/mc_protocol.h"
#include "src/mc/mc_smx.h"
#include "src/mc/mc_smx.h"
-#include "mc_hash.hpp"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_unw.h"
+#include "src/mc/remote/mc_protocol.h"
#include "src/mc/RegionSnapshot.hpp"
#include "src/mc/ObjectInformation.hpp"
#include "src/mc/RegionSnapshot.hpp"
#include "src/mc/ObjectInformation.hpp"
@@
-57,7
+57,7
@@
namespace mc {
/** @brief Restore a region from a snapshot
*
/** @brief Restore a region from a snapshot
*
- * @param reg Target region
+ * @param reg
ion
Target region
*/
static void restore(mc_mem_region_t region)
{
*/
static void restore(mc_mem_region_t region)
{
@@
-270,7
+270,7
@@
void find_object_address(
* A variable may be defined only from a given value of IP.
*
* \param var Variable description
* A variable may be defined only from a given value of IP.
*
* \param var Variable description
- * \param
fram
e Scope description
+ * \param
scop
e Scope description
* \param ip Instruction pointer
* \return true if the variable is valid
* */
* \param ip Instruction pointer
* \return true if the variable is valid
* */
@@
-292,7
+292,7
@@
static void fill_local_variables_values(mc_stack_frame_t stack_frame,
{
simgrid::mc::Process* process = &mc_model_checker->process();
{
simgrid::mc::Process* process = &mc_model_checker->process();
- if (!scope->range.contain(stack_frame->ip))
+ if (!scope
|| !scope
->range.contain(stack_frame->ip))
return;
for(simgrid::mc::Variable& current_variable :
return;
for(simgrid::mc::Variable& current_variable :
@@
-563,12
+563,9
@@
std::shared_ptr<simgrid::mc::Snapshot> take_snapshot(int num_state)
simgrid::mc::Process* mc_process = &mc_model_checker->process();
simgrid::mc::Process* mc_process = &mc_model_checker->process();
- std::shared_ptr<simgrid::mc::Snapshot> snapshot =
- std::make_shared<simgrid::mc::Snapshot>(mc_process);
-
- snapshot->num_state = num_state;
+ std::shared_ptr<simgrid::mc::Snapshot> snapshot = std::make_shared<simgrid::mc::Snapshot>(mc_process, num_state);
- for (auto& p : mc_model_checker->process().
simix_processe
s())
+ for (auto& p : mc_model_checker->process().
actor
s())
snapshot->enabled_processes.insert(p.copy.getBuffer()->pid);
snapshot_handle_ignore(snapshot.get());
snapshot->enabled_processes.insert(p.copy.getBuffer()->pid);
snapshot_handle_ignore(snapshot.get());
@@
-581,7
+578,7
@@
std::shared_ptr<simgrid::mc::Snapshot> take_snapshot(int num_state)
snapshot->to_ignore = mc_model_checker->process().ignored_heap();
snapshot->to_ignore = mc_model_checker->process().ignored_heap();
- if (_sg_mc_
visited
> 0 || strcmp(_sg_mc_property_file, "")) {
+ if (_sg_mc_
max_visited_states
> 0 || strcmp(_sg_mc_property_file, "")) {
snapshot->stacks = take_snapshot_stacks(snapshot.get());
if (_sg_mc_hash)
snapshot->hash = simgrid::mc::hash(*snapshot);
snapshot->stacks = take_snapshot_stacks(snapshot.get());
if (_sg_mc_hash)
snapshot->hash = simgrid::mc::hash(*snapshot);