}
-namespace simgrid {
-namespace mc {
-
-RegionSnapshot::~RegionSnapshot() {}
-
-simgrid::mc::RegionSnapshot dense_region(
- mc_region_type_t region_type,
- void *start_addr, void* permanent_addr, size_t size)
-{
- std::vector<char> data(size);
- mc_model_checker->process().read_bytes(data.data(), size,
- remote(permanent_addr),
- simgrid::mc::ProcessIndexDisabled);
-
- simgrid::mc::RegionSnapshot region(
- region_type, start_addr, permanent_addr, size);
- region.flat_data(std::move(data));
-
- XBT_DEBUG("New region : type : %d, data : %p (real addr %p), size : %zu",
- region_type, region.flat_data().data(), permanent_addr, size);
- return std::move(region);
-}
-
-/** @brief Take a snapshot of a given region
- *
- * @param type
- * @param start_addr Address of the region in the simulated process
- * @param permanent_addr Permanent address of this data (for privatized variables, this is the virtual address of the privatized mapping)
- * @param size Size of the data*
- */
-static simgrid::mc::RegionSnapshot region(
- mc_region_type_t type, void *start_addr, void* permanent_addr, size_t size)
-{
- if (_sg_mc_sparse_checkpoint) {
- return sparse_region(type, start_addr, permanent_addr, size);
- } else {
- return dense_region(type, start_addr, permanent_addr, size);
- }
-}
-
-simgrid::mc::RegionSnapshot sparse_region(mc_region_type_t region_type,
- void *start_addr, void* permanent_addr, size_t size)
-{
- mc_process_t process = &mc_model_checker->process();
-
- xbt_assert((((uintptr_t)start_addr) & (xbt_pagesize-1)) == 0,
- "Not at the beginning of a page");
- xbt_assert((((uintptr_t)permanent_addr) & (xbt_pagesize-1)) == 0,
- "Not at the beginning of a page");
- size_t page_count = mc_page_count(size);
-
- simgrid::mc::PerPageCopy page_data(mc_model_checker->page_store(), *process,
- permanent_addr, page_count);
-
- simgrid::mc::RegionSnapshot region(
- region_type, start_addr, permanent_addr, size);
- region.page_data(std::move(page_data));
- return std::move(region);
-}
-
-}
-}
-
extern "C" {
/** @brief Restore a region from a snapshot
static void MC_region_restore(mc_mem_region_t region)
{
switch(region->storage_type()) {
- case MC_REGION_STORAGE_TYPE_NONE:
+ case simgrid::mc::StorageType::NoData:
default:
xbt_die("Storage type not supported");
break;
- case MC_REGION_STORAGE_TYPE_FLAT:
+ case simgrid::mc::StorageType::Flat:
mc_model_checker->process().write_bytes(region->flat_data().data(),
region->size(), region->permanent_address());
break;
- case MC_REGION_STORAGE_TYPE_CHUNKED:
+ case simgrid::mc::StorageType::Chunked:
mc_region_restore_sparse(&mc_model_checker->process(), region);
break;
- case MC_REGION_STORAGE_TYPE_PRIVATIZED:
+ case simgrid::mc::StorageType::Privatized:
for (auto& p : region->privatized_data())
MC_region_restore(&p);
break;
namespace mc {
simgrid::mc::RegionSnapshot privatized_region(
- mc_region_type_t region_type, void *start_addr, void* permanent_addr, size_t size
+ RegionType region_type, void *start_addr, void* permanent_addr, size_t size
)
{
size_t process_count = MC_smpi_process_count();
extern "C" {
-static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, mc_region_type_t type,
+static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot,
+ simgrid::mc::RegionType type,
mc_object_info_t object_info,
void *start_addr, void* permanent_addr, size_t size)
{
- if (type == MC_REGION_TYPE_DATA)
+ if (type == simgrid::mc::RegionType::Data)
xbt_assert(object_info, "Missing object info for object.");
- else if (type == MC_REGION_TYPE_HEAP)
+ else if (type == simgrid::mc::RegionType::Heap)
xbt_assert(!object_info, "Unexpected object info for heap region.");
const bool privatization_aware = MC_object_info_is_privatized(object_info);
simgrid::mc::RegionSnapshot region;
if (privatization_aware && MC_smpi_process_count())
- region = MC_region_privatized(type, start_addr, permanent_addr, size);
+ region = simgrid::mc::privatized_region(type, start_addr, permanent_addr, size);
else
region = simgrid::mc::region(type, start_addr, permanent_addr, size);
for (size_t i = 0; i!=n; ++i) {
mc_object_info_t object_info = process->object_infos[i];
- MC_snapshot_add_region(i, snapshot, MC_REGION_TYPE_DATA, object_info,
+ MC_snapshot_add_region(i, snapshot, simgrid::mc::RegionType::Data, object_info,
object_info->start_rw, object_info->start_rw,
object_info->end_rw - object_info->start_rw);
}
void *start_heap = heap->base;
void *end_heap = heap->breakval;
- MC_snapshot_add_region(n, snapshot, MC_REGION_TYPE_HEAP, NULL,
+ MC_snapshot_add_region(n, snapshot, simgrid::mc::RegionType::Heap, NULL,
start_heap, start_heap,
(char *) end_heap - (char *) start_heap);
snapshot->heap_bytes_used = mmalloc_get_bytes_used_remote(
unw_word_t sp = xbt_dynar_get_as(st->stack_frames, 0, mc_stack_frame_t)->sp;
xbt_dynar_push(res, &st);
- (*snapshot)->stack_sizes = (size_t*)
- xbt_realloc((*snapshot)->stack_sizes, (cursor + 1) * sizeof(size_t));
- (*snapshot)->stack_sizes[cursor] =
+ size_t stack_size =
(char*) current_stack->address + current_stack->size - (char*) sp;
+ (*snapshot)->stack_sizes.push_back(stack_size);
}
return res;
}
}
-static void MC_get_current_fd(mc_snapshot_t snapshot)
+static std::vector<s_fd_infos_t> MC_get_current_fds(pid_t pid)
{
- snapshot->total_fd = 0;
-
const size_t fd_dir_path_size = 20;
char fd_dir_path[fd_dir_path_size];
int res = snprintf(fd_dir_path, fd_dir_path_size,
- "/proc/%lli/fd", (long long int) snapshot->process->pid());
+ "/proc/%lli/fd", (long long int) pid);
xbt_assert(res >= 0);
if ((size_t) res > fd_dir_path_size)
xbt_die("Unexpected buffer is too small for fd_dir_path");
if (fd_dir == NULL)
xbt_die("Cannot open directory '/proc/self/fd'\n");
- size_t total_fd = 0;
+ std::vector<s_fd_infos_t> fds;
+
struct dirent* fd_number;
while ((fd_number = readdir(fd_dir))) {
const size_t source_size = 25;
char source[25];
int res = snprintf(source, source_size, "/proc/%lli/fd/%s",
- (long long int) snapshot->process->pid(), fd_number->d_name);
+ (long long int) pid, fd_number->d_name);
xbt_assert(res >= 0);
if ((size_t) res > source_size)
xbt_die("Unexpected buffer is too small for fd %s", fd_number->d_name);
continue;
// Add an entry for this FD in the snapshot:
- fd_infos_t fd = xbt_new0(s_fd_infos_t, 1);
- fd->filename = strdup(link);
- fd->number = fd_value;
- fd->flags = fcntl(fd_value, F_GETFL) | fcntl(fd_value, F_GETFD) ;
- fd->current_position = lseek(fd_value, 0, SEEK_CUR);
- snapshot->current_fd = (fd_infos_t*) xbt_realloc(snapshot->current_fd, (total_fd + 1) * sizeof(fd_infos_t));
- snapshot->current_fd[total_fd] = fd;
- total_fd++;
+ s_fd_infos_t fd;
+ fd.filename = std::string(link);
+ fd.number = fd_value;
+ fd.flags = fcntl(fd_value, F_GETFL) | fcntl(fd_value, F_GETFD) ;
+ fd.current_position = lseek(fd_value, 0, SEEK_CUR);
+ fds.push_back(std::move(fd));
}
- snapshot->total_fd = total_fd;
closedir (fd_dir);
+ return std::move(fds);
}
mc_snapshot_t MC_take_snapshot(int num_state)
snapshot->process = mc_process;
snapshot->num_state = num_state;
- snapshot->enabled_processes = xbt_dynar_new(sizeof(int), NULL);
-
smx_process_t process;
MC_EACH_SIMIX_PROCESS(process,
- xbt_dynar_push_as(snapshot->enabled_processes, int, (int)process->pid));
+ snapshot->enabled_processes.insert(process->pid));
MC_snapshot_handle_ignore(snapshot);
if (_sg_mc_snapshot_fds)
- MC_get_current_fd(snapshot);
+ snapshot->current_fds = MC_get_current_fds(process->pid);
/* Save the std heap and the writable mapped pages of libsimgrid and binary */
MC_get_memory_regions(mc_process, snapshot);
if (mc_mode == MC_MODE_SERVER)
xbt_die("FD snapshot not implemented in client/server mode.");
- int new_fd;
- for (int i=0; i < snapshot->total_fd; i++) {
+ for (auto const& fd : snapshot->current_fds) {
- new_fd = open(snapshot->current_fd[i]->filename, snapshot->current_fd[i]->flags);
- if (new_fd <0) {
+ int new_fd = open(fd.filename.c_str(), fd.flags);
+ if (new_fd < 0) {
xbt_die("Could not reopen the file %s fo restoring the file descriptor",
- snapshot->current_fd[i]->filename);
+ fd.filename.c_str());
}
- if(new_fd != -1 && new_fd != snapshot->current_fd[i]->number){
- dup2(new_fd, snapshot->current_fd[i]->number);
- //fprintf(stderr, "%p\n", fdopen(snapshot->current_fd[i]->number, "rw"));
+ if (new_fd != fd.number) {
+ dup2(new_fd, fd.number);
close(new_fd);
};
- lseek(snapshot->current_fd[i]->number, snapshot->current_fd[i]->current_position, SEEK_SET);
+ lseek(fd.number, fd.current_position, SEEK_SET);
}
}