X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7af0e65bacbcf6d3f9f74988eb87bd04df001f68..802418321318961884ccc1078edc780129649455:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index c07f6661df..897ff8fe59 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -5,10 +5,15 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #define _GNU_SOURCE -#define UNW_LOCAL_ONLY + +#include #include #include +#include + +#include "internal_config.h" +#include "mc_memory_map.h" #include "mc_private.h" #include "xbt/module.h" #include @@ -25,13 +30,16 @@ #include "mc_private.h" #include +#include "mc_snapshot.h" +#include "mc_object_info.h" #include "mc_mmu.h" +#include "mc_unw.h" +#include "mc_protocol.h" +#include "mc_smx.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_checkpoint"); -char *libsimgrid_path; - /************************************ Free functions **************************************/ /*****************************************************************************************/ @@ -40,13 +48,16 @@ static void MC_snapshot_stack_free(mc_snapshot_stack_t s) if (s) { xbt_dynar_free(&(s->local_variables)); xbt_dynar_free(&(s->stack_frames)); + mc_unw_destroy_context(s->context); + xbt_free(s->context); xbt_free(s); } } static void MC_snapshot_stack_free_voidp(void *s) { - MC_snapshot_stack_free((mc_snapshot_stack_t) * (void **) s); + mc_snapshot_stack_t stack = (mc_snapshot_stack_t) * (void **) s; + MC_snapshot_stack_free(stack); } static void local_variable_free(local_variable_t v) @@ -60,55 +71,83 @@ static void local_variable_free_voidp(void *v) local_variable_free((local_variable_t) * (void **) v); } -static void MC_region_destroy(mc_mem_region_t reg) +void MC_region_destroy(mc_mem_region_t region) { - //munmap(reg->data, reg->size); - xbt_free(reg->data); - xbt_free(reg); + if (!region) + return; + switch(region->storage_type) { + case MC_REGION_STORAGE_TYPE_NONE: + break; + case MC_REGION_STORAGE_TYPE_FLAT: + xbt_free(region->flat.data); + break; + case MC_REGION_STORAGE_TYPE_CHUNKED: + mc_free_page_snapshot_region(region->chunked.page_numbers, mc_page_count(region->size)); + xbt_free(region->chunked.page_numbers); + break; + case MC_REGION_STORAGE_TYPE_PRIVATIZED: + { + size_t regions_count = region->privatized.regions_count; + for (size_t i=0; i!=regions_count; ++i) { + MC_region_destroy(region->privatized.regions[i]); + } + free(region->privatized.regions); + break; + } + } + xbt_free(region); } void MC_free_snapshot(mc_snapshot_t snapshot) { - unsigned int i; - for (i = 0; i < NB_REGIONS; i++) - MC_region_destroy(snapshot->regions[i]); - + for (size_t i = 0; i < snapshot->snapshot_regions_count; i++) { + MC_region_destroy(snapshot->snapshot_regions[i]); + } + xbt_free(snapshot->snapshot_regions); xbt_free(snapshot->stack_sizes); xbt_dynar_free(&(snapshot->stacks)); xbt_dynar_free(&(snapshot->to_ignore)); xbt_dynar_free(&snapshot->ignored_data); - - if (snapshot->privatization_regions) { - size_t n = xbt_dynar_length(snapshot->enabled_processes); - for (i = 0; i != n; ++i) { - MC_region_destroy(snapshot->privatization_regions[i]); - } - xbt_free(snapshot->privatization_regions); - } - xbt_free(snapshot); } /******************************* Snapshot regions ********************************/ /*********************************************************************************/ -static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size, mc_mem_region_t ref_reg) +static mc_mem_region_t mc_region_new_dense( + mc_region_type_t region_type, + void *start_addr, void* permanent_addr, size_t size, mc_mem_region_t ref_reg) { - if (_sg_mc_sparse_checkpoint) { - return mc_region_new_sparse(type, start_addr, size, ref_reg); - } - - mc_mem_region_t new_reg = xbt_new(s_mc_mem_region_t, 1); - new_reg->start_addr = start_addr; - new_reg->data = NULL; - new_reg->size = size; - new_reg->page_numbers = NULL; - new_reg->data = xbt_malloc(size); - memcpy(new_reg->data, start_addr, size); + mc_mem_region_t region = xbt_new(s_mc_mem_region_t, 1); + region->region_type = region_type; + region->storage_type = MC_REGION_STORAGE_TYPE_FLAT; + region->start_addr = start_addr; + region->permanent_addr = permanent_addr; + region->size = size; + region->flat.data = xbt_malloc(size); + MC_process_read(&mc_model_checker->process, MC_ADDRESS_SPACE_READ_FLAGS_NONE, + region->flat.data, permanent_addr, size, + MC_PROCESS_INDEX_DISABLED); XBT_DEBUG("New region : type : %d, data : %p (real addr %p), size : %zu", - type, new_reg->data, start_addr, size); - return new_reg; + region_type, region->flat.data, permanent_addr, size); + return 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* + * @param ref_reg Reference corresponding region + */ +static mc_mem_region_t MC_region_new(mc_region_type_t type, void *start_addr, void* permanent_addr, size_t size, mc_mem_region_t ref_reg) +{ + if (_sg_mc_sparse_checkpoint) { + return mc_region_new_sparse(type, start_addr, permanent_addr, size, ref_reg); + } else { + return mc_region_new_dense(type, start_addr, permanent_addr, size, ref_reg); + } } /** @brief Restore a region from a snapshot @@ -121,147 +160,141 @@ static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size, mc * @param reg Target region * @param reg_reg Current region (if not NULL), used for lazy per page restoration */ -static void MC_region_restore(mc_mem_region_t reg, mc_mem_region_t ref_reg) -{ - /*FIXME: check if start_addr is still mapped, if it is not, then map it - before copying the data */ - if (!reg->page_numbers) { - memcpy(reg->start_addr, reg->data, reg->size); - } else { - mc_region_restore_sparse(reg, ref_reg); - } - return; -} - -static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, - void *start_addr, size_t size) - -{ - mc_mem_region_t ref_reg = - mc_model_checker->parent_snapshot ? mc_model_checker->parent_snapshot->regions[type] : NULL; - mc_mem_region_t new_reg = MC_region_new(type, start_addr, size, ref_reg); - snapshot->regions[type] = new_reg; - return; -} - -static void MC_get_memory_regions(mc_snapshot_t snapshot) +static void MC_region_restore(mc_mem_region_t region, mc_mem_region_t ref_region) { - size_t i; - - void *start_heap = ((xbt_mheap_t) std_heap)->base; - void *end_heap = ((xbt_mheap_t) std_heap)->breakval; - MC_snapshot_add_region(snapshot, 0, start_heap, - (char *) end_heap - (char *) start_heap); - snapshot->heap_bytes_used = mmalloc_get_bytes_used(std_heap); - - MC_snapshot_add_region(snapshot, 1, mc_libsimgrid_info->start_rw, - mc_libsimgrid_info->end_rw - - mc_libsimgrid_info->start_rw); - if (!smpi_privatize_global_variables) { - MC_snapshot_add_region(snapshot, 2, mc_binary_info->start_rw, - mc_binary_info->end_rw - mc_binary_info->start_rw); - snapshot->privatization_regions = NULL; - snapshot->privatization_index = -1; - } else { - snapshot->privatization_regions = - xbt_new(mc_mem_region_t, SIMIX_process_count()); - for (i = 0; i < SIMIX_process_count(); i++) { - // TODO, add support for sparse snapshot - snapshot->privatization_regions[i] = - MC_region_new(-1, mappings[i], size_data_exe, NULL); + switch(region->storage_type) { + case MC_REGION_STORAGE_TYPE_NONE: + default: + xbt_die("Storage type not supported"); + break; + + case MC_REGION_STORAGE_TYPE_FLAT: + MC_process_write(&mc_model_checker->process, region->flat.data, + region->permanent_addr, region->size); + break; + + case MC_REGION_STORAGE_TYPE_CHUNKED: + mc_region_restore_sparse(&mc_model_checker->process, region, ref_region); + break; + + case MC_REGION_STORAGE_TYPE_PRIVATIZED: + { + bool has_ref_regions = ref_region && + ref_region->storage_type == MC_REGION_STORAGE_TYPE_PRIVATIZED; + size_t process_count = region->privatized.regions_count; + for (size_t i = 0; i < process_count; i++) { + MC_region_restore(region->privatized.regions[i], + has_ref_regions ? ref_region->privatized.regions[i] : NULL); + } + break; } - snapshot->privatization_index = loaded_page; } } -/** @brief Finds the range of the different memory segments and binary paths */ -void MC_init_memory_map_info() +static mc_mem_region_t MC_region_new_privatized( + mc_region_type_t region_type, void *start_addr, void* permanent_addr, size_t size, + mc_mem_region_t ref_reg) { - - unsigned int i = 0; - s_map_region_t reg; - memory_map_t maps = MC_get_memory_map(); - - maestro_stack_start = NULL; - maestro_stack_end = NULL; - libsimgrid_path = NULL; - - while (i < maps->mapsize) { - reg = maps->regions[i]; - if (maps->regions[i].pathname == NULL) { - // Nothing to do - } else if ((reg.prot & PROT_WRITE) - && !memcmp(maps->regions[i].pathname, "[stack]", 7)) { - maestro_stack_start = reg.start_addr; - maestro_stack_end = reg.end_addr; - } else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC) - && !memcmp(basename(maps->regions[i].pathname), "libsimgrid", - 10)) { - if (libsimgrid_path == NULL) - libsimgrid_path = strdup(maps->regions[i].pathname); - } - i++; + size_t process_count = MC_smpi_process_count(); + mc_mem_region_t region = xbt_new(s_mc_mem_region_t, 1); + region->region_type = region_type; + region->storage_type = MC_REGION_STORAGE_TYPE_PRIVATIZED; + region->start_addr = start_addr; + region->permanent_addr = permanent_addr; + region->size = size; + region->privatized.regions_count = process_count; + region->privatized.regions = xbt_new(mc_mem_region_t, process_count); + + // Read smpi_privatisation_regions from MCed: + smpi_privatisation_region_t remote_smpi_privatisation_regions; + MC_process_read_variable(&mc_model_checker->process, + "smpi_privatisation_regions", + &remote_smpi_privatisation_regions, sizeof(remote_smpi_privatisation_regions)); + s_smpi_privatisation_region_t privatisation_regions[process_count]; + MC_process_read_simple(&mc_model_checker->process, &privatisation_regions, + remote_smpi_privatisation_regions, sizeof(privatisation_regions)); + + for (size_t i = 0; i < process_count; i++) { + mc_mem_region_t ref_subreg = NULL; + if (ref_reg && ref_reg->storage_type == MC_REGION_STORAGE_TYPE_PRIVATIZED) + ref_subreg = ref_reg->privatized.regions[i]; + region->privatized.regions[i] = + MC_region_new(region_type, start_addr, + privatisation_regions[i].address, size, + ref_subreg); } - xbt_assert(maestro_stack_start, "maestro_stack_start"); - xbt_assert(maestro_stack_end, "maestro_stack_end"); - xbt_assert(libsimgrid_path, "libsimgrid_path&"); - - MC_free_memory_map(maps); - + return region; } -/** \brief Fill/lookup the "subtype" field. - */ -static void MC_resolve_subtype(mc_object_info_t info, dw_type_t type) +static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, mc_region_type_t type, + mc_object_info_t object_info, + void *start_addr, void* permanent_addr, size_t size) { + if (type == MC_REGION_TYPE_DATA) + xbt_assert(object_info, "Missing object info for object."); + else if (type == MC_REGION_TYPE_HEAP) + xbt_assert(!object_info, "Unexpected object info for heap region."); + + mc_mem_region_t ref_reg = NULL; + if (mc_model_checker->parent_snapshot) + ref_reg = mc_model_checker->parent_snapshot->snapshot_regions[index]; + + mc_mem_region_t region; + const bool privatization_aware = MC_object_info_is_privatized(object_info); + if (privatization_aware && MC_smpi_process_count()) + region = MC_region_new_privatized(type, start_addr, permanent_addr, size, ref_reg); + else + region = MC_region_new(type, start_addr, permanent_addr, size, ref_reg); - if (type->dw_type_id == NULL) - return; - type->subtype = xbt_dict_get_or_null(info->types, type->dw_type_id); - if (type->subtype == NULL) - return; - if (type->subtype->byte_size != 0) - return; - if (type->subtype->name == NULL) - return; - // Try to find a more complete description of the type: - // We need to fix in order to support C++. - - dw_type_t subtype = - xbt_dict_get_or_null(info->full_types_by_name, type->subtype->name); - if (subtype != NULL) { - type->subtype = subtype; - } - + region->object_info = object_info; + snapshot->snapshot_regions[index] = region; + return; } -void MC_post_process_types(mc_object_info_t info) +static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot) { - xbt_dict_cursor_t cursor = NULL; - char *origin; - dw_type_t type; - - // Lookup "subtype" field: - xbt_dict_foreach(info->types, cursor, origin, type) { - MC_resolve_subtype(info, type); - - dw_type_t member; - unsigned int i = 0; - if (type->members != NULL) - xbt_dynar_foreach(type->members, i, member) { - MC_resolve_subtype(info, member); - } + const size_t n = process->object_infos_size; + snapshot->snapshot_regions_count = n + 1; + snapshot->snapshot_regions = xbt_new0(mc_mem_region_t, n + 1); + + 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, + object_info->start_rw, object_info->start_rw, + object_info->end_rw - object_info->start_rw); + } + + xbt_mheap_t heap = MC_process_get_heap(process); + void *start_heap = heap->base; + void *end_heap = heap->breakval; + + MC_snapshot_add_region(n, snapshot, MC_REGION_TYPE_HEAP, NULL, + start_heap, start_heap, + (char *) end_heap - (char *) start_heap); + snapshot->heap_bytes_used = mmalloc_get_bytes_used_remote( + heap->heaplimit, + MC_process_get_malloc_info(process)); + +#ifdef HAVE_SMPI + if (smpi_privatize_global_variables && MC_smpi_process_count()) { + // snapshot->privatization_index = smpi_loaded_page + MC_process_read_variable(&mc_model_checker->process, + "smpi_loaded_page", &snapshot->privatization_index, + sizeof(snapshot->privatization_index)); + } else +#endif + { + snapshot->privatization_index = MC_PROCESS_INDEX_MISSING; } } /** \brief Fills the position of the segments (executable, read-only, read/write). * - * TODO, use dl_iterate_phdr to be more robust + * `dl_iterate_phdr` would be more robust but would not work in cross-process. * */ void MC_find_object_address(memory_map_t maps, mc_object_info_t result) { - unsigned int i = 0; s_map_region_t reg; const char *name = basename(result->file_name); @@ -298,6 +331,18 @@ void MC_find_object_address(memory_map_t maps, mc_object_info_t result) i++; } + result->start = result->start_rw; + if ((const void*) result->start_ro > result->start) + result->start = result->start_ro; + if ((const void*) result->start_exec > result->start) + result->start = result->start_exec; + + result->end = result->end_rw; + if (result->end_ro && (const void*) result->end_ro < result->end) + result->end = result->end_ro; + if (result->end_exec && (const void*) result->end_exec > result->end) + result->end = result->end_exec; + xbt_assert(result->file_name); xbt_assert(result->start_rw); xbt_assert(result->start_exec); @@ -326,8 +371,10 @@ static bool mc_valid_variable(dw_variable_t var, dw_frame_t scope, } static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, - dw_frame_t scope, xbt_dynar_t result) + dw_frame_t scope, int process_index, xbt_dynar_t result) { + mc_process_t process = &mc_model_checker->process; + void *ip = (void *) stack_frame->ip; if (ip < scope->low_pc || ip >= scope->high_pc) return; @@ -340,7 +387,8 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, continue; int region_type; - if ((long) stack_frame->ip > (long) mc_libsimgrid_info->start_exec) + // FIXME, get rid of `region_type` + if ((long) stack_frame->ip > (long) process->libsimgrid_info->start_exec) region_type = 1; else region_type = 2; @@ -355,12 +403,23 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, if (current_variable->address != NULL) { new_var->address = current_variable->address; } else if (current_variable->locations.size != 0) { - new_var->address = - (void *) mc_dwarf_resolve_locations(¤t_variable->locations, + s_mc_location_t location; + // FIXME, cross-process support + mc_dwarf_resolve_locations(&location, ¤t_variable->locations, current_variable->object_info, &(stack_frame->unw_cursor), (void *) stack_frame->frame_base, - NULL); + NULL, process_index); + + switch(mc_get_location_type(&location)) { + case MC_LOCATION_TYPE_ADDRESS: + new_var->address = location.memory_location; + break; + case MC_LOCATION_TYPE_REGISTER: + default: + xbt_die("Cannot handle non-address variable"); + } + } else { xbt_die("No address"); } @@ -371,11 +430,11 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, // Recursive processing of nested scopes: dw_frame_t nested_scope = NULL; xbt_dynar_foreach(scope->scopes, cursor, nested_scope) { - mc_fill_local_variables_values(stack_frame, nested_scope, result); + mc_fill_local_variables_values(stack_frame, nested_scope, process_index, result); } } -static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames) +static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames, int process_index) { unsigned cursor1 = 0; @@ -384,7 +443,7 @@ static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames) xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp); xbt_dynar_foreach(stack_frames, cursor1, stack_frame) { - mc_fill_local_variables_values(stack_frame, stack_frame->frame, variables); + mc_fill_local_variables_values(stack_frame, stack_frame->frame, process_index, variables); } return variables; @@ -399,15 +458,16 @@ static void MC_stack_frame_free_voipd(void *s) } } -static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) +static xbt_dynar_t MC_unwind_stack_frames(mc_unw_context_t stack_context) { + mc_process_t process = &mc_model_checker->process; xbt_dynar_t result = xbt_dynar_new(sizeof(mc_stack_frame_t), MC_stack_frame_free_voipd); unw_cursor_t c; // TODO, check condition check (unw_init_local==0 means end of frame) - if (unw_init_local(&c, (unw_context_t *) stack_context) != 0) { + if (mc_unw_init_cursor(&c, stack_context) != 0) { xbt_die("Could not initialize stack unwinding"); @@ -429,7 +489,7 @@ static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) // TODO, use real addresses in frame_t instead of fixing it here - dw_frame_t frame = MC_find_function_by_ip((void *) ip); + dw_frame_t frame = MC_process_find_function(process, (void *) ip); stack_frame->frame = frame; if (frame) { @@ -446,11 +506,11 @@ static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) && !strcmp(frame->name, "smx_ctx_sysv_wrapper")) break; - int ret = ret = unw_step(&c); + int ret = unw_step(&c); if (ret == 0) { xbt_die("Unexpected end of stack."); } else if (ret < 0) { - xbt_die("Error while unwinding stack."); + xbt_die("Error while unwinding stack"); } } @@ -472,10 +532,21 @@ static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t * snapshot) unsigned int cursor = 0; stack_region_t current_stack; + // FIXME, cross-process support (stack_areas) xbt_dynar_foreach(stacks_areas, cursor, current_stack) { mc_snapshot_stack_t st = xbt_new(s_mc_snapshot_stack_t, 1); - st->stack_frames = MC_unwind_stack_frames(current_stack->context); - st->local_variables = MC_get_local_variables_values(st->stack_frames); + + unw_context_t* original_context = (unw_context_t*) current_stack->context; + + st->context = xbt_new0(s_mc_unw_context_t, 1); + if (mc_unw_init_context(st->context, &mc_model_checker->process, + original_context) < 0) { + xbt_die("Could not initialise the libunwind context."); + } + + st->stack_frames = MC_unwind_stack_frames(st->context); + st->local_variables = MC_get_local_variables_values(st->stack_frames, current_stack->process_index); + st->process_index = current_stack->process_index; unw_word_t sp = xbt_dynar_get_as(st->stack_frames, 0, mc_stack_frame_t)->sp; @@ -524,23 +595,27 @@ static void mc_free_snapshot_ignored_data_pvoid(void* 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: unsigned int cursor = 0; mc_checkpoint_ignore_region_t region; - xbt_dynar_foreach (mc_checkpoint_ignore, cursor, region) { + xbt_dynar_foreach (mc_model_checker->process.checkpoint_ignore, cursor, region) { s_mc_snapshot_ignored_data_t ignored_data; ignored_data.start = region->addr; ignored_data.size = region->size; ignored_data.data = malloc(region->size); - memcpy(ignored_data.data, region->addr, region->size); + // TODO, we should do this once per privatization segment: + MC_process_read(snapshot->process, + MC_ADDRESS_SPACE_READ_FLAGS_NONE, + ignored_data.data, region->addr, region->size, MC_PROCESS_INDEX_DISABLED); xbt_dynar_push(snapshot->ignored_data, &ignored_data); } // Zero the memory: - xbt_dynar_foreach (mc_checkpoint_ignore, cursor, region) { - memset(region->addr, 0, region->size); + xbt_dynar_foreach (mc_model_checker->process.checkpoint_ignore, cursor, region) { + MC_process_clear_memory(snapshot->process, region->addr, region->size); } } @@ -550,7 +625,8 @@ 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) { - memcpy(ignored_data.start, ignored_data.data, ignored_data.size); + MC_process_write(snapshot->process, + ignored_data.data, ignored_data.start, ignored_data.size); } } @@ -564,30 +640,122 @@ static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot) int mc_important_snapshot(mc_snapshot_t snapshot) { // We need this snapshot in order to know which - // pages needs to be stored in the next snapshot: - if (_sg_mc_sparse_checkpoint && snapshot == mc_model_checker->parent_snapshot) + // pages needs to be stored in the next snapshot. + // This field is only non-NULL when using soft-dirty + // page tracking. + if (snapshot == mc_model_checker->parent_snapshot) return true; return false; } -mc_snapshot_t MC_take_snapshot(int num_state) +static void MC_get_current_fd(mc_snapshot_t snapshot) { + snapshot->total_fd = 0; + + const size_t fd_dir_path_size = 20; + char fd_dir_path[fd_dir_path_size]; + if (snprintf(fd_dir_path, fd_dir_path_size, + "/proc/%lli/fd", (long long int) snapshot->process->pid) > fd_dir_path_size) + xbt_die("Unexpected buffer is too small for fd_dir_path"); + + DIR* fd_dir = opendir(fd_dir_path); + if (fd_dir == NULL) + xbt_die("Cannot open directory '/proc/self/fd'\n"); + + size_t total_fd = 0; + struct dirent* fd_number; + while ((fd_number = readdir(fd_dir))) { + + int fd_value = atoi(fd_number->d_name); + + if(fd_value < 3) + continue; + + const size_t source_size = 25; + char source[25]; + if (snprintf(source, source_size, "/proc/%lli/fd/%s", + (long long int) snapshot->process->pid, fd_number->d_name) > source_size) + xbt_die("Unexpected buffer is too small for fd %s", fd_number->d_name); + + const size_t link_size = 200; + char link[200]; + int res = readlink(source, link, link_size); + if (res<0) { + xbt_die("Could not read link for %s", source); + } + if (res==200) { + xbt_die("Buffer to small for link of %s", source); + } + link[res] = '\0'; + + if(smpi_is_privatisation_file(link)) + continue; + + // This is (probably) the DIR* we are reading: + // TODO, read all the file entries at once and close the DIR.* + if(strcmp(fd_dir_path, link) == 0) + continue; + + // We don't handle them. + // It does not mean we should silently ignore them however. + if (strncmp(link, "pipe:", 5) == 0 || strncmp(link, "socket:", 7) == 0) + continue; + + // If dot_output enabled, do not handle the corresponding file + if (dot_output != NULL && strcmp(basename(link), _sg_mc_dot_output_file) == 0) + continue; + + // This is probably a shared memory used by lttng-ust: + if(strncmp("/dev/shm/ust-shm-tmp-", link, 21)==0) + 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 = xbt_realloc(snapshot->current_fd, (total_fd + 1) * sizeof(fd_infos_t)); + snapshot->current_fd[total_fd] = fd; + total_fd++; + } + + snapshot->total_fd = total_fd; + closedir (fd_dir); +} + +static s_mc_address_space_class_t mc_snapshot_class = { + .read = (void*) &MC_snapshot_read +}; + +mc_snapshot_t MC_take_snapshot(int num_state) +{ + mc_process_t mc_process = &mc_model_checker->process; mc_snapshot_t snapshot = xbt_new0(s_mc_snapshot_t, 1); + snapshot->process = mc_process; + snapshot->address_space.address_space_class = &mc_snapshot_class; + snapshot->enabled_processes = xbt_dynar_new(sizeof(int), NULL); + smx_process_t process; - xbt_swag_foreach(process, simix_global->process_list) { - xbt_dynar_push_as(snapshot->enabled_processes, int, (int)process->pid); - } + MC_EACH_SIMIX_PROCESS(process, + xbt_dynar_push_as(snapshot->enabled_processes, int, (int)process->pid)); MC_snapshot_handle_ignore(snapshot); + if (_sg_mc_snapshot_fds) + MC_get_current_fd(snapshot); + + const bool use_soft_dirty = _sg_mc_sparse_checkpoint + && _sg_mc_soft_dirty + && MC_process_is_self(mc_process); + /* Save the std heap and the writable mapped pages of libsimgrid and binary */ - MC_get_memory_regions(snapshot); - if (_sg_mc_sparse_checkpoint && _sg_mc_soft_dirty) { + MC_get_memory_regions(mc_process, snapshot); + if (use_soft_dirty) mc_softdirty_reset(); - } snapshot->to_ignore = MC_take_snapshot_ignore(); @@ -604,46 +772,83 @@ mc_snapshot_t MC_take_snapshot(int num_state) } MC_snapshot_ignore_restore(snapshot); - mc_model_checker->parent_snapshot = snapshot; + if (use_soft_dirty) + mc_model_checker->parent_snapshot = snapshot; return snapshot; } -void MC_restore_snapshot(mc_snapshot_t snapshot) +static inline +void MC_restore_snapshot_regions(mc_snapshot_t snapshot) { mc_snapshot_t parent_snapshot = mc_model_checker->parent_snapshot; - unsigned int i; - for (i = 0; i < NB_REGIONS; i++) { + const size_t n = snapshot->snapshot_regions_count; + for (size_t i = 0; i < n; i++) { // For privatized, variables we decided it was not necessary to take the snapshot: - if (snapshot->regions[i]) - MC_region_restore(snapshot->regions[i], - parent_snapshot ? parent_snapshot->regions[i] : NULL); + if (snapshot->snapshot_regions[i]) + MC_region_restore(snapshot->snapshot_regions[i], + parent_snapshot ? parent_snapshot->snapshot_regions[i] : NULL); } - if (snapshot->privatization_regions) { - for (i = 0; i < SIMIX_process_count(); i++) { - if (snapshot->privatization_regions[i]) { - MC_region_restore(snapshot->privatization_regions[i], - parent_snapshot ? parent_snapshot->privatization_regions[i] : NULL); - } +#ifdef HAVE_SMPI + // TODO, send a message to implement this in the MCed process + if(snapshot->privatization_index >= 0) { + // We just rewrote the global variables. + // The privatisation segment SMPI thinks + // is mapped might be inconsistent with the segment which + // is really mapped in memory (kernel state). + // We ask politely SMPI to map the segment anyway, + // even if it thinks it is the current one: + smpi_really_switch_data_segment(snapshot->privatization_index); + } +#endif +} + +static inline +void MC_restore_snapshot_fds(mc_snapshot_t snapshot) +{ + if (mc_mode == MC_MODE_SERVER) + xbt_die("FD snapshot not implemented in client/server mode."); + + int new_fd; + size_t i; + for(i=0; i < snapshot->total_fd; i++){ + + new_fd = open(snapshot->current_fd[i]->filename, snapshot->current_fd[i]->flags); + if (new_fd <0) { + xbt_die("Could not reopen the file %s fo restoring the file descriptor", + snapshot->current_fd[i]->filename); } - switch_data_segment(snapshot->privatization_index); + 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")); + close(new_fd); + }; + lseek(snapshot->current_fd[i]->number, snapshot->current_fd[i]->current_position, SEEK_SET); } +} - if (_sg_mc_sparse_checkpoint && _sg_mc_soft_dirty) { +void MC_restore_snapshot(mc_snapshot_t snapshot) +{ + const bool use_soft_dirty = _sg_mc_sparse_checkpoint + && _sg_mc_soft_dirty + && MC_process_is_self(&mc_model_checker->process); + + MC_restore_snapshot_regions(snapshot); + if (_sg_mc_snapshot_fds) + MC_restore_snapshot_fds(snapshot); + if (use_soft_dirty) { mc_softdirty_reset(); } - MC_snapshot_ignore_restore(snapshot); - mc_model_checker->parent_snapshot = snapshot; -} + if (use_soft_dirty) { + mc_model_checker->parent_snapshot = snapshot; + } -mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall) -{ - return MC_take_snapshot(1); + mc_model_checker->process.cache_flags = 0; } -void *MC_snapshot(void) +mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall) { - return simcall_mc_snapshot(); + return MC_take_snapshot(1); }