X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d918db3ca7152c00113f2e072deca4614f97bb58..992bc1ec57d376cf14b124ea21b58b30f1e162f9:/src/mc/sosp/Snapshot.hpp diff --git a/src/mc/sosp/Snapshot.hpp b/src/mc/sosp/Snapshot.hpp index 11bc6d222c..dec7ffe7d7 100644 --- a/src/mc/sosp/Snapshot.hpp +++ b/src/mc/sosp/Snapshot.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2022. 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. */ @@ -8,7 +8,7 @@ #include "src/mc/ModelChecker.hpp" #include "src/mc/inspect/mc_unw.hpp" -#include "src/mc/remote/RemoteSimulation.hpp" +#include "src/mc/remote/RemoteProcess.hpp" #include "src/mc/sosp/Region.hpp" // ***** MC Snapshot @@ -54,19 +54,17 @@ 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*; -namespace simgrid { -namespace mc { +namespace simgrid::mc { class XBT_PRIVATE Snapshot final : public AddressSpace { public: /* Initialization */ - Snapshot(int num_state, RemoteSimulation* get_remote_simulation = &mc_model_checker->get_remote_simulation()); - ~Snapshot() override = default; + Snapshot(long num_state, RemoteProcess* process = &mc_model_checker->get_remote_process()); /* Regular use */ bool on_heap(const void* address) const { - const s_xbt_mheap_t* heap = get_remote_simulation()->get_heap(); + const s_xbt_mheap_t* heap = get_remote_process()->get_heap(); return address >= heap->heapbase && address < heap->breakval; } @@ -74,13 +72,12 @@ public: 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(RemoteSimulation* get_remote_simulation) const; + void restore(RemoteProcess* process) const; // To be private - int num_state_; + long num_state_; std::size_t heap_bytes_used_ = 0; std::vector> snapshot_regions_; - std::set enabled_processes_; std::vector stack_sizes_; std::vector stacks_; std::vector to_ignore_; @@ -89,10 +86,9 @@ public: private: void add_region(RegionType type, ObjectInformation* object_info, void* start_addr, std::size_t size); - void snapshot_regions(RemoteSimulation* get_remote_simulation); - void snapshot_stacks(RemoteSimulation* get_remote_simulation); + void snapshot_regions(RemoteProcess* process); + void snapshot_stacks(RemoteProcess* process); }; -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc #endif