#define MAP_POPULATE MAP_PREFAULT_READ
#endif
-#include "mc/mc.h"
+#include "src/mc/ModelChecker.hpp"
#include "src/mc/mc_config.hpp"
-#include "src/mc/sosp/mc_snapshot.hpp"
+#include "src/mc/mc_forward.hpp"
#include "src/mc/mc_smx.hpp"
-#include "src/mc/sosp/ChunkedData.hpp"
#include "src/mc/sosp/RegionSnapshot.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_RegionSnaphot, mc, "Logging specific to region snapshots");
namespace simgrid {
namespace mc {
-RegionDense::RegionDense(RegionType region_type, void* start_addr, void* permanent_addr, size_t size)
- : RegionSnapshot(region_type, start_addr, permanent_addr, size)
-{
- flat_data_ = Buffer::malloc(size);
-
- mc_model_checker->process().read_bytes(flat_data_.get(), size, remote(permanent_addr),
- simgrid::mc::ProcessIndexDisabled);
-
- storage_type_ = StorageType::Flat;
- page_numbers_.clear();
- privatized_regions_.clear();
-
- XBT_DEBUG("New region : type : %s, data : %p (real addr %p), size : %zu",
- (region_type == RegionType::Heap ? "Heap" : (region_type == RegionType::Data ? "Data" : "?")),
- flat_data().get(), permanent_addr, size);
-}
-
/** @brief Take a snapshot of a given region
*
* @param type
*/
RegionSnapshot* region(RegionType type, void* start_addr, void* permanent_addr, size_t size)
{
- if (_sg_mc_sparse_checkpoint)
- return new RegionSparse(type, start_addr, permanent_addr, size);
- else
- return new RegionDense(type, start_addr, permanent_addr, size);
+ return new RegionSnapshot(type, start_addr, permanent_addr, size);
}
-RegionSparse::RegionSparse(RegionType region_type, void* start_addr, void* permanent_addr, size_t size)
- : RegionSnapshot(region_type, start_addr, permanent_addr, size)
+RegionSnapshot::RegionSnapshot(RegionType region_type, void* start_addr, void* permanent_addr, size_t size)
+ : region_type_(region_type), start_addr_(start_addr), size_(size), permanent_addr_(permanent_addr)
{
simgrid::mc::RemoteClient* process = &mc_model_checker->process();
- assert(process != nullptr);
xbt_assert((((uintptr_t)start_addr) & (xbt_pagesize - 1)) == 0, "Start address not at the beginning of a page");
xbt_assert((((uintptr_t)permanent_addr) & (xbt_pagesize - 1)) == 0,
"Permanent address not at the beginning of a page");
- storage_type_ = StorageType::Chunked;
- flat_data_.clear();
- privatized_regions_.clear();
-
page_numbers_ =
ChunkedData(mc_model_checker->page_store(), *process, RemotePtr<void>(permanent_addr), mmu::chunk_count(size));
}
-#if HAVE_SMPI
-RegionPrivatized::RegionPrivatized(RegionType region_type, void* start_addr, void* permanent_addr, std::size_t size)
- : RegionSnapshot(region_type, start_addr, permanent_addr, size)
+/** @brief Restore a region from a snapshot
+ *
+ * @param region Target region
+ */
+void RegionSnapshot::restore()
{
- storage_type_ = StorageType::Privatized;
-
- size_t process_count = MC_smpi_process_count();
-
- // Read smpi_privatization_regions from MCed:
- smpi_privatization_region_t remote_smpi_privatization_regions;
- mc_model_checker->process().read_variable("smpi_privatization_regions", &remote_smpi_privatization_regions,
- sizeof(remote_smpi_privatization_regions));
- s_smpi_privatization_region_t privatization_regions[process_count];
- mc_model_checker->process().read_bytes(&privatization_regions, sizeof(privatization_regions),
- remote(remote_smpi_privatization_regions));
-
- privatized_regions_.reserve(process_count);
- for (size_t i = 0; i < process_count; i++)
- privatized_regions_.push_back(std::unique_ptr<simgrid::mc::RegionSnapshot>(
- region(region_type, start_addr, privatization_regions[i].address, size)));
-
- flat_data_.clear();
- page_numbers_.clear();
+ xbt_assert(((permanent_address().address()) & (xbt_pagesize - 1)) == 0, "Not at the beginning of a page");
+ xbt_assert(simgrid::mc::mmu::chunk_count(size()) == page_data().page_count());
+
+ for (size_t i = 0; i != page_data().page_count(); ++i) {
+ void* target_page = (void*)simgrid::mc::mmu::join(i, (std::uintptr_t)(void*)permanent_address().address());
+ const void* source_page = page_data().page(i);
+ mc_model_checker->process().write_bytes(source_page, xbt_pagesize, remote(target_page));
+ }
}
-#endif
} // namespace mc
} // namespace simgrid
