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
useless cosmetics around NS3 long routes
[simgrid.git]
/
src
/
mc
/
mc_checkpoint.cpp
diff --git
a/src/mc/mc_checkpoint.cpp
b/src/mc/mc_checkpoint.cpp
index
29afd75
..
84cdfd8
100644
(file)
--- a/
src/mc/mc_checkpoint.cpp
+++ b/
src/mc/mc_checkpoint.cpp
@@
-17,10
+17,9
@@
#include "src/internal_config.h"
#include "src/mc/mc_private.h"
#include "src/internal_config.h"
#include "src/mc/mc_private.h"
-#include "xbt/module.h"
-#include <xbt/mmalloc.h>
-#include <xbt/memory.hpp>
#include "src/smpi/private.h"
#include "src/smpi/private.h"
+#include "xbt/mmalloc.h"
+#include "xbt/module.h"
#include "src/xbt/mmalloc/mmprivate.h"
#include "src/xbt/mmalloc/mmprivate.h"
@@
-32,12
+31,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"
@@
-46,8
+45,7
@@
using simgrid::mc::remote;
using simgrid::mc::remote;
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc,
- "Logging specific to mc_checkpoint");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_checkpoint");
namespace simgrid {
namespace mc {
namespace simgrid {
namespace mc {
@@
-57,7
+55,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
+268,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
* */
@@
-367,7
+365,8
@@
static std::vector<s_mc_stack_frame_t> unwind_stack_frames(simgrid::mc::UnwindCo
stack_frame.unw_cursor = c;
stack_frame.unw_cursor = c;
- unw_word_t ip, sp;
+ unw_word_t ip;
+ unw_word_t sp;
unw_get_reg(&c, UNW_REG_IP, &ip);
unw_get_reg(&c, UNW_REG_SP, &sp);
unw_get_reg(&c, UNW_REG_IP, &ip);
unw_get_reg(&c, UNW_REG_SP, &sp);
@@
-563,12
+562,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
+577,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);