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
Another use of mc_model_checker disapears. In Snapshot.equals.
[simgrid.git]
/
src
/
mc
/
sosp
/
Snapshot.hpp
diff --git
a/src/mc/sosp/Snapshot.hpp
b/src/mc/sosp/Snapshot.hpp
index
7b9fbda
..
d584bdf
100644
(file)
--- a/
src/mc/sosp/Snapshot.hpp
+++ b/
src/mc/sosp/Snapshot.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-202
3
. 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. */
@@
-8,16
+8,15
@@
#include "src/mc/ModelChecker.hpp"
#include "src/mc/inspect/mc_unw.hpp"
#include "src/mc/ModelChecker.hpp"
#include "src/mc/inspect/mc_unw.hpp"
-#include "src/mc/remote/RemoteProcess.hpp"
#include "src/mc/sosp/Region.hpp"
#include "src/mc/sosp/Region.hpp"
+#include "src/mc/sosp/RemoteProcessMemory.hpp"
// ***** MC Snapshot
/** Ignored data
*
// ***** MC Snapshot
/** Ignored data
*
- * Some parts of the snapshot are ignored by zeroing them out: the real
- * values is stored here.
- * */
+ * Some parts of the snapshot are ignored by zeroing them out: the real values is stored here.
+ */
struct s_mc_snapshot_ignored_data_t {
void* start;
std::vector<char> data;
struct s_mc_snapshot_ignored_data_t {
void* start;
std::vector<char> data;
@@
-54,18
+53,21
@@
struct XBT_PRIVATE s_mc_snapshot_stack_t {
using mc_snapshot_stack_t = s_mc_snapshot_stack_t*;
using const_mc_snapshot_stack_t = const s_mc_snapshot_stack_t*;
using mc_snapshot_stack_t = s_mc_snapshot_stack_t*;
using const_mc_snapshot_stack_t = const s_mc_snapshot_stack_t*;
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
+
+using hash_type = std::uint64_t;
class XBT_PRIVATE Snapshot final : public AddressSpace {
class XBT_PRIVATE Snapshot final : public AddressSpace {
+ PageStore& page_store_;
+
public:
/* Initialization */
public:
/* Initialization */
- Snapshot(
int num_state, RemoteProcess* process = &mc_model_checker->get_remote_process()
);
+ Snapshot(
long num_state, PageStore& store, RemoteProcessMemory& memory
);
/* Regular use */
bool on_heap(const void* address) const
{
/* Regular use */
bool on_heap(const void* address) const
{
- const s_xbt_mheap_t* heap = get_remote_process()->get_heap();
+ const s_xbt_mheap_t* heap = get_remote_process
_memory
()->get_heap();
return address >= heap->heapbase && address < heap->breakval;
}
return address >= heap->heapbase && address < heap->breakval;
}
@@
-73,13
+75,14
@@
public:
ReadOptions options = ReadOptions::none()) const override;
Region* get_region(const void* addr) const;
Region* get_region(const void* addr, Region* hinted_region) const;
ReadOptions options = ReadOptions::none()) const override;
Region* get_region(const void* addr) const;
Region* get_region(const void* addr, Region* hinted_region) const;
- void restore(RemoteProcess* process) const;
+ void restore(RemoteProcessMemory& memory) const;
+
+ bool equals_to(const Snapshot& other, RemoteProcessMemory& memory);
// To be private
// To be private
-
int
num_state_;
+
long
num_state_;
std::size_t heap_bytes_used_ = 0;
std::vector<std::unique_ptr<Region>> snapshot_regions_;
std::size_t heap_bytes_used_ = 0;
std::vector<std::unique_ptr<Region>> snapshot_regions_;
- std::set<pid_t> enabled_processes_;
std::vector<std::size_t> stack_sizes_;
std::vector<s_mc_snapshot_stack_t> stacks_;
std::vector<simgrid::mc::IgnoredHeapRegion> to_ignore_;
std::vector<std::size_t> stack_sizes_;
std::vector<s_mc_snapshot_stack_t> stacks_;
std::vector<simgrid::mc::IgnoredHeapRegion> to_ignore_;
@@
-88,10
+91,12
@@
public:
private:
void add_region(RegionType type, ObjectInformation* object_info, void* start_addr, std::size_t size);
private:
void add_region(RegionType type, ObjectInformation* object_info, void* start_addr, std::size_t size);
- void snapshot_regions(RemoteProcess* process);
- void snapshot_stacks(RemoteProcess* process);
+ void snapshot_regions(RemoteProcessMemory& process_memory);
+ void snapshot_stacks(RemoteProcessMemory& process_memory);
+ void handle_ignore();
+ void ignore_restore() const;
+ hash_type do_hash() const;
};
};
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
#endif
#endif