}
-static void mc_free_snapshot_ignored_data_pvoid(void* data) {
- mc_snapshot_ignored_data_t ignored_data = (mc_snapshot_ignored_data_t) data;
- free(ignored_data->data);
-}
-
static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
{
xbt_assert(snapshot->process);
- snapshot->ignored_data = xbt_dynar_new(sizeof(s_mc_snapshot_ignored_data_t), mc_free_snapshot_ignored_data_pvoid);
-
+
// Copy the memory:
for (auto const& region : mc_model_checker->process().ignored_regions()) {
s_mc_snapshot_ignored_data_t ignored_data;
ignored_data.start = (void*)region.addr;
- ignored_data.size = region.size;
- ignored_data.data = malloc(region.size);
+ ignored_data.data.resize(region.size);
// TODO, we should do this once per privatization segment:
snapshot->process->read_bytes(
- ignored_data.data, region.size, remote(region.addr),
+ ignored_data.data.data(), region.size, remote(region.addr),
simgrid::mc::ProcessIndexDisabled);
- xbt_dynar_push(snapshot->ignored_data, &ignored_data);
+ snapshot->ignored_data.push_back(std::move(ignored_data));
}
// Zero the memory:
static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot)
{
- unsigned int cursor = 0;
- s_mc_snapshot_ignored_data_t ignored_data;
- xbt_dynar_foreach (snapshot->ignored_data, cursor, ignored_data) {
- snapshot->process->write_bytes(ignored_data.data, ignored_data.size,
+ for (auto const& ignored_data : snapshot->ignored_data)
+ snapshot->process->write_bytes(
+ ignored_data.data.data(), ignored_data.data.size(),
remote(ignored_data.start));
- }
}
static std::vector<s_fd_infos_t> MC_get_current_fds(pid_t pid)
stack_sizes(),
stacks(nullptr),
to_ignore(nullptr),
- hash(0),
- ignored_data(nullptr)
+ hash(0)
{
}
+
Snapshot::~Snapshot()
{
for (size_t i = 0; i < this->snapshot_regions_count; i++) {
xbt_free(this->snapshot_regions);
xbt_dynar_free(&(this->stacks));
xbt_dynar_free(&(this->to_ignore));
- xbt_dynar_free(&this->ignored_data);
}
const void* Snapshot::read_bytes(void* buffer, std::size_t size,
* */
typedef struct s_mc_snapshot_ignored_data {
void* start;
- size_t size;
- void* data;
+ std::vector<char> data;
} s_mc_snapshot_ignored_data_t, *mc_snapshot_ignored_data_t;
typedef struct s_fd_infos{
xbt_dynar_t stacks;
xbt_dynar_t to_ignore;
uint64_t hash;
- xbt_dynar_t ignored_data;
+ std::vector<s_mc_snapshot_ignored_data> ignored_data;
std::vector<s_fd_infos_t> current_fds;
};