X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89d98a56977c70b61c8dba09f5c5136e73784339..802418321318961884ccc1078edc780129649455:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index f6612b7bf4..897ff8fe59 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -1,694 +1,580 @@ -/* Copyright (c) 2008-2013 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2014. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include +#define _GNU_SOURCE + +#include + +#include +#include +#include + +#include "internal_config.h" +#include "mc_memory_map.h" #include "mc_private.h" #include "xbt/module.h" +#include +#include "../smpi/private.h" +#include + +#include "xbt/mmalloc/mmprivate.h" #include "../simix/smx_private.h" #include +#include + +#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"); -void *start_text_libsimgrid; -void *start_plt_libsimgrid, *end_plt_libsimgrid; -void *start_got_plt_libsimgrid, *end_got_plt_libsimgrid; -void *start_plt_binary, *end_plt_binary; -void *start_got_plt_binary, *end_got_plt_binary; -char *libsimgrid_path; -void *start_data_libsimgrid, *start_bss_libsimgrid; -void *start_data_binary, *start_bss_binary; -void *start_text_binary; - /************************************ Free functions **************************************/ /*****************************************************************************************/ -static void MC_snapshot_stack_free(mc_snapshot_stack_t s){ - if(s){ +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); +static void MC_snapshot_stack_free_voidp(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){ - xbt_free(v->frame); +static void local_variable_free(local_variable_t v) +{ xbt_free(v->name); - xbt_free(v->type); xbt_free(v); } -static void local_variable_free_voidp(void *v){ +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) { - 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]); - +void MC_free_snapshot(mc_snapshot_t snapshot) +{ + 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); xbt_free(snapshot); } - /******************************* Snapshot regions ********************************/ /*********************************************************************************/ -static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size) +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) { - mc_mem_region_t new_reg = xbt_new0(s_mc_mem_region_t, 1); - new_reg->start_addr = start_addr; - new_reg->size = size; - new_reg->data = xbt_malloc0(size); - memcpy(new_reg->data, start_addr, size); - - XBT_DEBUG("New region : type : %d, data : %p (real addr %p), size : %zu", type, new_reg->data, start_addr, size); - - return new_reg; + 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", + region_type, region->flat.data, permanent_addr, size); + return region; } -static void MC_region_restore(mc_mem_region_t reg) +/** @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) { - /*FIXME: check if start_addr is still mapped, if it is not, then map it - before copying the data */ - - memcpy(reg->start_addr, reg->data, reg->size); - return; + 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); + } } -static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start_addr, size_t size) +/** @brief Restore a region from a snapshot + * + * If we are using per page snapshots, it is possible to use the reference + * region in order to do an incremental restoration of the region: the + * softclean pages which are shared between the two snapshots do not need + * to be restored. + * + * @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 region, mc_mem_region_t ref_region) { - mc_mem_region_t new_reg = MC_region_new(type, start_addr, size); - snapshot->regions[type] = new_reg; - return; -} - -static void MC_get_memory_regions(mc_snapshot_t snapshot){ - - FILE *fp; - char *line = NULL; - ssize_t read; - size_t n = 0; - - char *lfields[6] = {0}, *tok; - void *start_addr, *start_addr1, *end_addr; - size_t size; - int i; - - fp = fopen("/proc/self/maps", "r"); - - xbt_assert(fp, - "Cannot open /proc/self/maps to investigate the memory map of the process. Please report this bug."); - - setbuf(fp, NULL); - - while((read = xbt_getline(&line, &n, fp)) != -1){ - - /* Wipeout the new line character */ - line[read - 1] = '\0'; + 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; + } + } +} - /* Tokenize the line using spaces as delimiters and store each token */ - lfields[0] = strtok(line, " "); +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) +{ + 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); + } - for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) { - lfields[i] = strtok(NULL, " "); - } + return region; +} - /* First get the permissions flags, need write permission */ - if(lfields[1][1] == 'w'){ +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); + + region->object_info = object_info; + snapshot->snapshot_regions[index] = region; + return; +} - /* Get the start address of the map */ - tok = strtok(lfields[0], "-"); - start_addr = (void *)strtoul(tok, NULL, 16); - - if(start_addr == std_heap){ /* Std_heap ? */ - tok = strtok(NULL, "-"); - end_addr = (void *)strtoul(tok, NULL, 16); - MC_snapshot_add_region(snapshot, 0, start_addr, (char*)end_addr - (char*)start_addr); - snapshot->heap_bytes_used = mmalloc_get_bytes_used(std_heap); - }else{ /* map name == libsimgrid || binary_name ? */ - if(lfields[5] != NULL){ - if(!memcmp(basename(lfields[5]), "libsimgrid", 10)){ - tok = strtok(NULL, "-"); - end_addr = (void *)strtoul(tok, NULL, 16); - size = (char*)end_addr - (char*)start_addr; - /* BSS and data segments may be separated according to the OS */ - if((read = xbt_getline(&line, &n, fp)) != -1){ - line[read - 1] = '\0'; - lfields[0] = strtok(line, " "); - for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) { - lfields[i] = strtok(NULL, " "); - } - if(lfields[1][1] == 'w' && lfields[5] == NULL){ - tok = strtok(lfields[0], "-"); - start_addr1 = (void *)strtoul(tok, NULL, 16); - tok = strtok(NULL, "-"); - size += (char *)(void *)strtoul(tok, NULL, 16) - (char*)start_addr1; - } - } - MC_snapshot_add_region(snapshot, 1, start_addr, size); - }else if(!memcmp(basename(lfields[5]), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){ - tok = strtok(NULL, "-"); - end_addr = (void *)strtoul(tok, NULL, 16); - size = (char*)end_addr - (char*)start_addr; - /* BSS and data segments may be separated according to the OS */ - if((read = xbt_getline(&line, &n, fp)) != -1){ - line[read - 1] = '\0'; - lfields[0] = strtok(line, " "); - for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) { - lfields[i] = strtok(NULL, " "); - } - tok = strtok(lfields[0], "-"); - start_addr1 = (void *)strtoul(tok, NULL, 16); - if(lfields[1][1] == 'w' && lfields[5] == NULL){ - if(start_addr1 == std_heap){ /* Std_heap ? */ - tok = strtok(NULL, "-"); - end_addr = (void *)strtoul(tok, NULL, 16); - MC_snapshot_add_region(snapshot, 0, start_addr1, (char*)end_addr - (char*)start_addr1); - snapshot->heap_bytes_used = mmalloc_get_bytes_used(std_heap); - }else if(start_addr1 != raw_heap){ - tok = strtok(NULL, "-"); - size += (char *)(void *)strtoul(tok, NULL, 16) - (char *)start_addr1; - } - } - } - MC_snapshot_add_region(snapshot, 2, start_addr, size); - }else if (!memcmp(lfields[5], "[stack]", 7)){ - maestro_stack_start = start_addr; - tok = strtok(NULL, "-"); - maestro_stack_end = (void *)strtoul(tok, NULL, 16); - } - } - } - } - +static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot) +{ + 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); } - free(line); - fclose(fp); - + 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; + } } -void MC_init_memory_map_info(){ - +/** \brief Fills the position of the segments (executable, read-only, read/write). + * + * `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; - memory_map_t maps = MC_get_memory_map(); - + const char *name = basename(result->file_name); while (i < maps->mapsize) { reg = maps->regions[i]; - if ((reg.prot & PROT_WRITE)){ - if (maps->regions[i].pathname != NULL){ - if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ - start_data_libsimgrid = reg.start_addr; - i++; - reg = maps->regions[i]; - if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize) - start_bss_libsimgrid = reg.start_addr; - }else if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){ - start_data_binary = reg.start_addr; - i++; - reg = maps->regions[i]; - if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && reg.start_addr != std_heap && reg.start_addr != raw_heap && i < maps->mapsize){ - start_bss_binary = reg.start_addr; - i++; - } - }else if(!memcmp(maps->regions[i].pathname, "[stack]", 7)){ - maestro_stack_start = reg.start_addr; - maestro_stack_end = reg.end_addr; - i++; - } - } - }else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)){ - if (maps->regions[i].pathname != NULL){ - if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ - start_text_libsimgrid = reg.start_addr; - libsimgrid_path = strdup(maps->regions[i].pathname); - }else if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){ - start_text_binary = reg.start_addr; - } + if (maps->regions[i].pathname == NULL + || strcmp(basename(maps->regions[i].pathname), name)) { + // Nothing to do + } else if ((reg.prot & PROT_WRITE)) { + xbt_assert(!result->start_rw, + "Multiple read-write segments for %s, not supported", + maps->regions[i].pathname); + result->start_rw = reg.start_addr; + result->end_rw = reg.end_addr; + // .bss is usually after the .data: + s_map_region_t *next = &(maps->regions[i + 1]); + if (next->pathname == NULL && (next->prot & PROT_WRITE) + && next->start_addr == reg.end_addr) { + result->end_rw = maps->regions[i + 1].end_addr; } + } else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)) { + xbt_assert(!result->start_exec, + "Multiple executable segments for %s, not supported", + maps->regions[i].pathname); + result->start_exec = reg.start_addr; + result->end_exec = reg.end_addr; + } else if ((reg.prot & PROT_READ) && !(reg.prot & PROT_EXEC)) { + xbt_assert(!result->start_ro, + "Multiple read only segments for %s, not supported", + maps->regions[i].pathname); + result->start_ro = reg.start_addr; + result->end_ro = reg.end_addr; } i++; } - - MC_free_memory_map(maps); + 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); } -void MC_get_libsimgrid_plt_section(){ - - FILE *fp; - char *line = NULL; /* Temporal storage for each line that is readed */ - ssize_t read; /* Number of bytes readed */ - size_t n = 0; /* Amount of bytes to read by xbt_getline */ - - char *lfields[7]; - int i, plt_found = 0; - unsigned long int size, offset; - - char *command = bprintf("objdump --section-headers %s", libsimgrid_path); - - fp = popen(command, "r"); - - if(fp == NULL){ - perror("popen failed"); - xbt_abort(); - } +/************************************* Take Snapshot ************************************/ +/****************************************************************************************/ - while ((read = xbt_getline(&line, &n, fp)) != -1 && plt_found != 2) { +/** \brief Checks whether the variable is in scope for a given IP. + * + * A variable may be defined only from a given value of IP. + * + * \param var Variable description + * \param frame Scope description + * \param ip Instruction pointer + * \return true if the variable is valid + * */ +static bool mc_valid_variable(dw_variable_t var, dw_frame_t scope, + const void *ip) +{ + // The variable is not yet valid: + if ((const void *) ((const char *) scope->low_pc + var->start_scope) > ip) + return false; + else + return true; +} - if(n == 0) - continue; +static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, + dw_frame_t scope, int process_index, xbt_dynar_t result) +{ + mc_process_t process = &mc_model_checker->process; - /* Wipeout the new line character */ - line[read - 1] = '\0'; + void *ip = (void *) stack_frame->ip; + if (ip < scope->low_pc || ip >= scope->high_pc) + return; - lfields[0] = strtok(line, " "); + unsigned cursor = 0; + dw_variable_t current_variable; + xbt_dynar_foreach(scope->variables, cursor, current_variable) { - if(lfields[0] == NULL) + if (!mc_valid_variable(current_variable, scope, (void *) stack_frame->ip)) continue; - if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strncmp(lfields[0], libsimgrid_path, strlen(libsimgrid_path)) == 0) - continue; + int region_type; + // FIXME, get rid of `region_type` + if ((long) stack_frame->ip > (long) process->libsimgrid_info->start_exec) + region_type = 1; + else + region_type = 2; + + local_variable_t new_var = xbt_new0(s_local_variable_t, 1); + new_var->subprogram = stack_frame->frame; + new_var->ip = stack_frame->ip; + new_var->name = xbt_strdup(current_variable->name); + new_var->type = current_variable->type; + new_var->region = region_type; + + if (current_variable->address != NULL) { + new_var->address = current_variable->address; + } else if (current_variable->locations.size != 0) { + 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, 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"); + } - for (i = 1; i < 7 && lfields[i - 1] != NULL; i++) { - lfields[i] = strtok(NULL, " "); + } else { + xbt_die("No address"); } - if(i>=6){ - if(strcmp(lfields[1], ".plt") == 0){ - size = strtoul(lfields[2], NULL, 16); - offset = strtoul(lfields[5], NULL, 16); - start_plt_libsimgrid = (char *)start_text_libsimgrid + offset; - end_plt_libsimgrid = (char *)start_plt_libsimgrid + size; - plt_found++; - }else if(strcmp(lfields[1], ".got.plt") == 0){ - size = strtoul(lfields[2], NULL, 16); - offset = strtoul(lfields[5], NULL, 16); - start_got_plt_libsimgrid = (char *)start_text_libsimgrid + offset; - end_got_plt_libsimgrid = (char *)start_got_plt_libsimgrid + size; - plt_found++; - } - - } - + xbt_dynar_push(result, &new_var); } - xbt_free(command); - xbt_free(line); - pclose(fp); - -} - -void MC_get_binary_plt_section(){ - - FILE *fp; - char *line = NULL; /* Temporal storage for each line that is readed */ - ssize_t read; /* Number of bytes readed */ - size_t n = 0; /* Amount of bytes to read by xbt_getline */ - - char *lfields[7]; - int i, plt_found = 0; - unsigned long int size; - - char *command = bprintf( "objdump --section-headers %s", xbt_binary_name); - - fp = popen(command, "r"); - - if(fp == NULL){ - perror("popen failed"); - xbt_abort(); + // 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, process_index, result); } +} - while ((read = xbt_getline(&line, &n, fp)) != -1 && plt_found != 2) { - - if(n == 0) - continue; - - /* Wipeout the new line character */ - line[read - 1] = '\0'; - - lfields[0] = strtok(line, " "); - - if(lfields[0] == NULL) - continue; - - if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strncmp(lfields[0], basename(xbt_binary_name), strlen(xbt_binary_name)) == 0) - continue; +static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames, int process_index) +{ - for (i = 1; i < 7 && lfields[i - 1] != NULL; i++) { - lfields[i] = strtok(NULL, " "); - } + unsigned cursor1 = 0; + mc_stack_frame_t stack_frame; + xbt_dynar_t variables = + xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp); - if(i>=6){ - if(strcmp(lfields[1], ".plt") == 0){ - size = strtoul(lfields[2], NULL, 16); - start_plt_binary = (void *)strtoul(lfields[3], NULL, 16); - end_plt_binary = (char *)start_plt_binary + size; - plt_found++; - }else if(strcmp(lfields[1], ".got.plt") == 0){ - size = strtoul(lfields[2], NULL, 16); - start_got_plt_binary = (char *)strtoul(lfields[3], NULL, 16); - end_got_plt_binary = (char *)start_got_plt_binary + size; - plt_found++; - } - } - - + xbt_dynar_foreach(stack_frames, cursor1, stack_frame) { + mc_fill_local_variables_values(stack_frame, stack_frame->frame, process_index, variables); } - xbt_free(command); - xbt_free(line); - pclose(fp); - + return variables; } -/************************************* Take Snapshot ************************************/ -/****************************************************************************************/ - -static void MC_get_hash_global(char *snapshot_hash, void *data1, void *data2){ - - /* unsigned int cursor = 0; */ - /* size_t offset; */ - /* global_variable_t current_var; */ - /* void *addr_pointed = NULL; */ - /* void *res = NULL; */ - - /* xbt_strbuff_t clear = xbt_strbuff_new(); */ - - /* xbt_dynar_foreach(mc_global_variables, cursor, current_var){ */ - /* if(current_var->address < start_data_libsimgrid){ /\* binary *\/ */ - /* offset = (char *)current_var->address - (char *)start_data_binary; */ - /* addr_pointed = *((void **)((char *)data2 + offset)); */ - /* if(((addr_pointed >= start_plt_binary && addr_pointed <= end_plt_binary)) || ((addr_pointed >= std_heap && (char *)addr_pointed <= (char *)std_heap + STD_HEAP_SIZE ))) */ - /* continue; */ - /* res = xbt_malloc0(current_var->size + 1); */ - /* memset(res, 0, current_var->size + 1); */ - /* memcpy(res, (char*)data2 + offset, current_var->size); */ - /* }else{ /\* libsimgrid *\/ */ - /* offset = (char *)current_var->address - (char *)start_data_libsimgrid; */ - /* addr_pointed = *((void **)((char *)data1 + offset)); */ - /* if((addr_pointed >= start_plt_libsimgrid && addr_pointed <= end_plt_libsimgrid) || (addr_pointed >= std_heap && (char *)addr_pointed <= (char *)std_heap + STD_HEAP_SIZE )) */ - /* continue; */ - /* res = xbt_malloc0(current_var->size + 1); */ - /* memset(res, 0, current_var->size + 1); */ - /* memcpy(res, (char*)data1 + offset, current_var->size); */ - /* } */ - /* if(res != NULL){ */ - /* xbt_strbuff_append(clear, (const char*)res); */ - /* xbt_free(res); */ - /* res = NULL; */ - /* } */ - /* } */ - - /* xbt_sha(clear->data, snapshot_hash); */ - - /* xbt_strbuff_free(clear); */ - +static void MC_stack_frame_free_voipd(void *s) +{ + mc_stack_frame_t stack_frame = *(mc_stack_frame_t *) s; + if (stack_frame) { + xbt_free(stack_frame->frame_name); + xbt_free(stack_frame); + } } -static void MC_get_hash_local(char *snapshot_hash, xbt_dynar_t stacks){ - - /* xbt_dynar_t tokens = NULL, s_tokens = NULL; */ - /* unsigned int cursor1 = 0, cursor2 = 0; */ - /* mc_snapshot_stack_t current_stack; */ - /* char *frame_name = NULL; */ - /* void *addr; */ - - /* xbt_strbuff_t clear = xbt_strbuff_new(); */ - - /* while(cursor1 < xbt_dynar_length(stacks)){ */ - /* current_stack = xbt_dynar_get_as(stacks, cursor1, mc_snapshot_stack_t); */ - /* tokens = xbt_str_split(current_stack->local_variables->data, NULL); */ - /* cursor2 = 0; */ - /* while(cursor2 < xbt_dynar_length(tokens)){ */ - /* s_tokens = xbt_str_split(xbt_dynar_get_as(tokens, cursor2, char *), "="); */ - /* if(xbt_dynar_length(s_tokens) > 1){ */ - /* if(strcmp(xbt_dynar_get_as(s_tokens, 0, char *), "frame_name") == 0){ */ - /* xbt_free(frame_name); */ - /* frame_name = xbt_strdup(xbt_dynar_get_as(s_tokens, 1, char *)); */ - /* xbt_strbuff_append(clear, (const char*)xbt_dynar_get_as(tokens, cursor2, char *)); */ - /* cursor2++; */ - /* xbt_dynar_free(&s_tokens); */ - /* continue; */ - /* } */ - /* addr = (void *) strtoul(xbt_dynar_get_as(s_tokens, 1, char *), NULL, 16); */ - /* if(addr > std_heap && (char *)addr <= (char *)std_heap + STD_HEAP_SIZE){ */ - /* cursor2++; */ - /* xbt_dynar_free(&s_tokens); */ - /* continue; */ - /* } */ - /* if(is_stack_ignore_variable(frame_name, xbt_dynar_get_as(s_tokens, 0, char *))){ */ - /* cursor2++; */ - /* xbt_dynar_free(&s_tokens); */ - /* continue; */ - /* } */ - /* xbt_strbuff_append(clear, (const char *)xbt_dynar_get_as(tokens, cursor2, char *)); */ - /* } */ - /* xbt_dynar_free(&s_tokens); */ - /* cursor2++; */ - /* } */ - /* xbt_dynar_free(&tokens); */ - /* cursor1++; */ - /* } */ - - /* xbt_free(frame_name); */ - - /* xbt_sha(clear->data, snapshot_hash); */ - - /* xbt_strbuff_free(clear); */ - -} +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); -static xbt_dynar_t MC_get_local_variables_values(void *stack_context){ - unw_cursor_t c; - int ret; - char frame_name[256]; - - ret = unw_init_local(&c, (unw_context_t *)stack_context); - if(ret < 0){ - XBT_INFO("unw_init_local failed"); - xbt_abort(); - } + // TODO, check condition check (unw_init_local==0 means end of frame) + if (mc_unw_init_cursor(&c, stack_context) != 0) { - unw_word_t ip, sp, off; - dw_frame_t frame; + xbt_die("Could not initialize stack unwinding"); - unsigned int cursor = 0; - dw_variable_t current_variable; - dw_location_entry_t entry = NULL; - dw_location_t location_entry = NULL; - unw_word_t res; - int frame_found = 0, region_type; - void *frame_pointer_address = NULL; - long true_ip, value; - int stop; + } else + while (1) { - xbt_dynar_t variables = xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp); + mc_stack_frame_t stack_frame = xbt_new(s_mc_stack_frame_t, 1); + xbt_dynar_push(result, &stack_frame); - while(ret >= 0 && !stop){ + stack_frame->unw_cursor = c; - unw_get_reg(&c, UNW_REG_IP, &ip); - unw_get_reg(&c, UNW_REG_SP, &sp); + unw_word_t ip, sp; - unw_get_proc_name(&c, frame_name, sizeof (frame_name), &off); + unw_get_reg(&c, UNW_REG_IP, &ip); + unw_get_reg(&c, UNW_REG_SP, &sp); - if(!strcmp(frame_name, "smx_ctx_sysv_wrapper")) /* Stop before context switch with maestro */ - stop = 1; + stack_frame->ip = ip; + stack_frame->sp = sp; - if((long)ip > (long)start_text_libsimgrid) - frame = xbt_dict_get_or_null(mc_local_variables_libsimgrid, frame_name); - else - frame = xbt_dict_get_or_null(mc_local_variables_binary, frame_name); + // TODO, use real addresses in frame_t instead of fixing it here - if(frame == NULL){ - ret = unw_step(&c); - continue; - } - - true_ip = (long)frame->low_pc + (long)off; - frame_pointer_address = NULL; - - /* Get frame pointer */ - switch(frame->frame_base->type){ - case e_dw_loclist: - cursor = 0; - while(cursor < xbt_dynar_length(frame->frame_base->location.loclist) && !frame_found){ - entry = xbt_dynar_get_as(frame->frame_base->location.loclist, cursor, dw_location_entry_t); - if((true_ip >= entry->lowpc) && (true_ip < entry->highpc)){ - frame_found = 1; - switch(entry->location->type){ - case e_dw_compose: - if(xbt_dynar_length(entry->location->location.compose) > 1){ - frame_pointer_address = NULL; /* TODO : location list with optimizations enabled */ - }else{ - location_entry = xbt_dynar_get_as(entry->location->location.compose, 0, dw_location_t); - switch(location_entry->type){ - case e_dw_register: - unw_get_reg(&c, location_entry->location.reg, &res); - frame_pointer_address = (void*)(long)res; - break; - case e_dw_bregister_op: - unw_get_reg(&c, location_entry->location.breg_op.reg, &res); - frame_pointer_address = (void*)((long)res + location_entry->location.breg_op.offset); - break; - default: - frame_pointer_address = NULL; /* FIXME : implement other cases (with optimizations enabled) */ - break; - } - } - break; - default: - frame_pointer_address = NULL; /* FIXME : implement other cases (with optimizations enabled) */ - break; - } - } - cursor++; - } - break; - default : - frame_pointer_address = NULL; /* FIXME : implement other cases (with optimizations enabled)*/ - break; - } + dw_frame_t frame = MC_process_find_function(process, (void *) ip); + stack_frame->frame = frame; - frame_found = 0; - cursor = 0; - - xbt_dynar_foreach(frame->variables, cursor, current_variable){ - - if((long)ip > (long)start_text_libsimgrid) - region_type = 1; - else - region_type = 2; - - local_variable_t new_var = xbt_new0(s_local_variable_t, 1); - new_var->frame = xbt_strdup(frame_name); - new_var->ip = (unsigned long)ip; - new_var->name = xbt_strdup(current_variable->name); - new_var->type = strdup(current_variable->type_origin); - new_var->region= region_type; - - if(current_variable->address.location != NULL){ - switch(current_variable->address.location->type){ - case e_dw_compose: - if(xbt_dynar_length(current_variable->address.location->location.compose) > 1){ - /* TODO : location list with optimizations enabled */ - }else{ - location_entry = xbt_dynar_get_as(current_variable->address.location->location.compose, 0, dw_location_t); - - switch(location_entry->type){ - case e_dw_register: - unw_get_reg(&c, location_entry->location.reg, &res); - value = (long)res; - break; - case e_dw_bregister_op: - unw_get_reg(&c, location_entry->location.breg_op.reg, &res); - value = (long)res + location_entry->location.breg_op.offset; - break; - case e_dw_fbregister_op: - if(frame_pointer_address != NULL) - value = (long)((char *)frame_pointer_address + location_entry->location.fbreg_op); - else - value = 0; - break; - default: - value = 0; /* FIXME : implement other cases (with optimizations enabled)*/ - break; - } - - if(value) - new_var->address = (void *)value; - else - new_var->address = NULL; - } - break; - default : - break; - } + if (frame) { + stack_frame->frame_name = xbt_strdup(frame->name); + stack_frame->frame_base = + (unw_word_t) mc_find_frame_base(frame, frame->object_info, &c); + } else { + stack_frame->frame_base = 0; + stack_frame->frame_name = NULL; } - xbt_dynar_push(variables, &new_var); + /* Stop before context switch with maestro */ + if (frame != NULL && frame->name != NULL + && !strcmp(frame->name, "smx_ctx_sysv_wrapper")) + break; + int ret = unw_step(&c); + if (ret == 0) { + xbt_die("Unexpected end of stack."); + } else if (ret < 0) { + xbt_die("Error while unwinding stack"); + } } - ret = unw_step(&c); - + if (xbt_dynar_length(result) == 0) { + XBT_INFO("unw_init_local failed"); + xbt_abort(); } - return variables; - -} - + return result; +}; -static void *MC_get_stack_pointer(void *stack_context, void *heap){ +static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t * snapshot) +{ - unw_cursor_t c; - int ret; - unw_word_t sp; + xbt_dynar_t res = + xbt_dynar_new(sizeof(s_mc_snapshot_stack_t), + MC_snapshot_stack_free_voidp); - ret = unw_init_local(&c, (unw_context_t *)stack_context); - if(ret < 0){ - XBT_INFO("unw_init_local failed"); - xbt_abort(); - } + unsigned int cursor = 0; + stack_region_t current_stack; - unw_get_reg(&c, UNW_REG_SP, &sp); + // 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); - return ((char *)heap + (size_t)(((char *)((long)sp) - (char*)std_heap))); + 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."); + } -static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t *snapshot, void *heap){ + 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; - xbt_dynar_t res = xbt_dynar_new(sizeof(s_mc_snapshot_stack_t), MC_snapshot_stack_free_voidp); + unw_word_t sp = xbt_dynar_get_as(st->stack_frames, 0, mc_stack_frame_t)->sp; - unsigned int cursor = 0; - stack_region_t current_stack; - - xbt_dynar_foreach(stacks_areas, cursor, current_stack){ - mc_snapshot_stack_t st = xbt_new(s_mc_snapshot_stack_t, 1); - st->local_variables = MC_get_local_variables_values(current_stack->context); - st->stack_pointer = MC_get_stack_pointer(current_stack->context, heap); - st->real_address = current_stack->address; xbt_dynar_push(res, &st); - (*snapshot)->stack_sizes = xbt_realloc((*snapshot)->stack_sizes, (cursor + 1) * sizeof(size_t)); - (*snapshot)->stack_sizes[cursor] = current_stack->size - ((char *)st->stack_pointer - (char *)((char *)heap + ((char *)current_stack->address - (char *)std_heap))); + (*snapshot)->stack_sizes = + xbt_realloc((*snapshot)->stack_sizes, (cursor + 1) * sizeof(size_t)); + (*snapshot)->stack_sizes[cursor] = + (char*) current_stack->address + current_stack->size - (char*) sp; } return res; } -static xbt_dynar_t MC_take_snapshot_ignore(){ - - if(mc_heap_comparison_ignore == NULL) +static xbt_dynar_t MC_take_snapshot_ignore() +{ + + if (mc_heap_comparison_ignore == NULL) return NULL; - xbt_dynar_t cpy = xbt_dynar_new(sizeof(mc_heap_ignore_region_t), heap_ignore_region_free_voidp); + xbt_dynar_t cpy = + xbt_dynar_new(sizeof(mc_heap_ignore_region_t), + heap_ignore_region_free_voidp); unsigned int cursor = 0; mc_heap_ignore_region_t current_region; - xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region){ + xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region) { mc_heap_ignore_region_t new_region = NULL; new_region = xbt_new0(s_mc_heap_ignore_region_t, 1); new_region->address = current_region->address; @@ -702,62 +588,267 @@ static xbt_dynar_t MC_take_snapshot_ignore(){ } -static void MC_dump_checkpoint_ignore(mc_snapshot_t snapshot){ - +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: unsigned int cursor = 0; mc_checkpoint_ignore_region_t region; - size_t offset; - - xbt_dynar_foreach(mc_checkpoint_ignore, cursor, region){ - if(region->addr > snapshot->regions[0]->start_addr && (char *)(region->addr) < (char *)snapshot->regions[0]->start_addr + STD_HEAP_SIZE){ - offset = (char *)region->addr - (char *)snapshot->regions[0]->start_addr; - memset((char *)snapshot->regions[0]->data + offset, 0, region->size); - }else if(region->addr > snapshot->regions[2]->start_addr && (char *)(region->addr) < (char*)snapshot->regions[2]->start_addr + snapshot->regions[2]->size){ - offset = (char *)region->addr - (char *)snapshot->regions[2]->start_addr; - memset((char *)snapshot->regions[2]->data + offset, 0, region->size); - }else if(region->addr > snapshot->regions[1]->start_addr && (char *)(region->addr) < (char*)snapshot->regions[1]->start_addr + snapshot->regions[1]->size){ - offset = (char *)region->addr - (char *)snapshot->regions[1]->start_addr; - memset((char *)snapshot->regions[1]->data + offset, 0, region->size); - } + 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); + // 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_model_checker->process.checkpoint_ignore, cursor, region) { + MC_process_clear_memory(snapshot->process, region->addr, region->size); } } +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) { + MC_process_write(snapshot->process, + ignored_data.data, ignored_data.start, ignored_data.size); + } +} -mc_snapshot_t MC_take_snapshot(){ +/** @brief Can we remove this snapshot? + * + * Some snapshots cannot be removed (yet) because we need them + * at this point. + * + * @param 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. + // This field is only non-NULL when using soft-dirty + // page tracking. + if (snapshot == mc_model_checker->parent_snapshot) + return true; + + return false; +} + +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->nb_processes = xbt_swag_size(simix_global->process_list); + 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; + 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); + MC_get_memory_regions(mc_process, snapshot); + if (use_soft_dirty) + mc_softdirty_reset(); snapshot->to_ignore = MC_take_snapshot_ignore(); - if(_sg_mc_visited > 0 || strcmp(_sg_mc_property_file,"")){ - snapshot->stacks = MC_take_snapshot_stacks(&snapshot, snapshot->regions[0]->data); - //MC_get_hash_global(snapshot->hash_global, snapshot->regions[1]->data, snapshot->regions[2]->data); - //MC_get_hash_local(snapshot->hash_local, snapshot->stacks); + if (_sg_mc_visited > 0 || strcmp(_sg_mc_property_file, "")) { + snapshot->stacks = + MC_take_snapshot_stacks(&snapshot); + if (_sg_mc_hash && snapshot->stacks != NULL) { + snapshot->hash = mc_hash_processes_state(num_state, snapshot->stacks); + } else { + snapshot->hash = 0; + } + } else { + snapshot->hash = 0; } - MC_dump_checkpoint_ignore(snapshot); - + MC_snapshot_ignore_restore(snapshot); + if (use_soft_dirty) + mc_model_checker->parent_snapshot = snapshot; return snapshot; - } -void MC_restore_snapshot(mc_snapshot_t snapshot){ - unsigned int i; - for(i=0; i < NB_REGIONS; i++){ - MC_region_restore(snapshot->regions[i]); +static inline +void MC_restore_snapshot_regions(mc_snapshot_t snapshot) +{ + mc_snapshot_t parent_snapshot = mc_model_checker->parent_snapshot; + + 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->snapshot_regions[i]) + MC_region_restore(snapshot->snapshot_regions[i], + parent_snapshot ? parent_snapshot->snapshot_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); + } + 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); + } } -mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){ - return MC_take_snapshot(); +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); + if (use_soft_dirty) { + mc_model_checker->parent_snapshot = snapshot; + } + + mc_model_checker->process.cache_flags = 0; } -void *MC_snapshot(void){ - return simcall_mc_snapshot(); +mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall) +{ + return MC_take_snapshot(1); }