size_t size;
void* src;
void* dstn;
- RegionSnapshot region0;
- RegionSnapshot region;
+ RegionSnapshot* region0;
+ RegionSnapshot* region;
} prologue_return;
static prologue_return prologue(int n); // common to the below 5 fxs
static void read_whole_region();
REQUIRE(xbt_pagesize == getpagesize());
REQUIRE(1 << xbt_pagebits == xbt_pagesize);
- process = std::unique_ptr<simgrid::mc::RemoteClient>(new simgrid::mc::RemoteClient(getpid(), -1));
+ process.reset(new simgrid::mc::RemoteClient(getpid(), -1));
process->init();
mc_model_checker = new ::simgrid::mc::ModelChecker(std::move(process));
}
// Init memory and take snapshots:
init_memory(source, byte_size);
- simgrid::mc::RegionSnapshot region0 =
- simgrid::mc::sparse_region(simgrid::mc::RegionType::Unknown, source, source, byte_size);
+ simgrid::mc::RegionSnapshot* region0 =
+ new simgrid::mc::RegionSparse(simgrid::mc::RegionType::Unknown, source, source, byte_size);
for (int i = 0; i < n; i += 2) {
init_memory((char*)source + i * xbt_pagesize, xbt_pagesize);
}
- simgrid::mc::RegionSnapshot region =
- simgrid::mc::sparse_region(simgrid::mc::RegionType::Unknown, source, source, byte_size);
+ simgrid::mc::RegionSnapshot* region =
+ new simgrid::mc::RegionSparse(simgrid::mc::RegionType::Unknown, source, source, byte_size);
void* destination = mmap(nullptr, byte_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
INFO("Could not allocate destination memory");
for (int n = 1; n != 32; ++n) {
prologue_return ret = prologue(n);
- const void* read = MC_region_read(&(ret.region), ret.dstn, ret.src, ret.size);
+ const void* read = MC_region_read(ret.region, ret.dstn, ret.src, ret.size);
INFO("Mismatch in MC_region_read()");
REQUIRE(not memcmp(ret.src, read, ret.size));
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
+ delete ret.region0;
+ delete ret.region;
}
}
for (int j = 0; j != 100; ++j) {
size_t offset = rnd_engine() % ret.size;
size_t size = rnd_engine() % (ret.size - offset);
- const void* read = MC_region_read(&(ret.region), ret.dstn, (const char*)ret.src + offset, size);
+ const void* read = MC_region_read(ret.region, ret.dstn, (const char*)ret.src + offset, size);
INFO("Mismatch in MC_region_read()");
REQUIRE(not memcmp((char*)ret.src + offset, read, size));
}
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
+ delete ret.region0;
+ delete ret.region;
}
}
prologue_return ret = prologue(n);
INFO("Unexpected match in MC_snapshot_region_memcmp() with previous snapshot");
- REQUIRE(MC_snapshot_region_memcmp(ret.src, &(ret.region0), ret.src, &(ret.region), ret.size));
+ REQUIRE(MC_snapshot_region_memcmp(ret.src, ret.region0, ret.src, ret.region, ret.size));
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
+ delete ret.region0;
+ delete ret.region;
}
}
size_t size = rnd_engine() % (ret.size - offset);
INFO("Mismatch in MC_snapshot_region_memcmp()");
- REQUIRE(not MC_snapshot_region_memcmp((char*)ret.src + offset, &(ret.region), (char*)ret.src + offset,
- &(ret.region), size));
+ REQUIRE(not MC_snapshot_region_memcmp((char*)ret.src + offset, ret.region, (char*)ret.src + offset, ret.region,
+ size));
}
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
+ delete ret.region0;
+ delete ret.region;
}
}
prologue_return ret = prologue(1);
memcpy(ret.src, &mc_model_checker, sizeof(void*));
- simgrid::mc::RegionSnapshot region2 =
- simgrid::mc::sparse_region(simgrid::mc::RegionType::Unknown, ret.src, ret.src, ret.size);
+ simgrid::mc::RegionSnapshot* region2 =
+ new simgrid::mc::RegionSparse(simgrid::mc::RegionType::Unknown, ret.src, ret.src, ret.size);
INFO("Mismtach in MC_region_read_pointer()");
- REQUIRE(MC_region_read_pointer(®ion2, ret.src) == mc_model_checker);
+ REQUIRE(MC_region_read_pointer(region2, ret.src) == mc_model_checker);
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
+ delete ret.region0;
+ delete ret.region;
+ delete region2;
}
/*************** End: class snap_test_helper *****************************/