X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/788db2724e25a92188bb8012665999c088b815c6..95b11095f38bb2b508878eb860d1b52ca7e9d09c:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index 1c1134a905..2fbb5bef62 100644 --- a/src/mc/mc_checkpoint.c +++ b/src/mc/mc_checkpoint.c @@ -1,5 +1,10 @@ +/* Copyright (c) 2008-2012 Da 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 -#include "private.h" +#include "mc_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, @@ -8,7 +13,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size); static void MC_region_restore(mc_mem_region_t reg); static void MC_region_destroy(mc_mem_region_t reg); -static void MC_snapshot_destroy(mc_snapshot_t s); static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start_addr, size_t size); @@ -19,7 +23,9 @@ static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size) new_reg->start_addr = start_addr; new_reg->size = size; new_reg->data = xbt_malloc0(size); + XBT_DEBUG("New reg data %p, start_addr %p, size %zu", new_reg->data, start_addr, size); memcpy(new_reg->data, start_addr, size); + return new_reg; } @@ -27,7 +33,32 @@ static void MC_region_restore(mc_mem_region_t 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); + if(reg->type == 3){ + memory_map_t maps = get_memory_map(); + MC_UNSET_RAW_MEM; + unsigned int i=0; + s_map_region_t r; + while(i < maps->mapsize){ + r = maps->regions[i]; + if (maps->regions[i].pathname != NULL){ + if (!memcmp(maps->regions[i].pathname, "[stack]", 7)){ + size_t diff = (char*)reg->start_addr - (char*)r.start_addr; + void *segment = malloc(reg->size + diff); + XBT_DEBUG("Size of segment : %zu", sizeof(segment)); + memcpy((char *)segment + diff, reg->data, reg->size); + memcpy(r.start_addr, segment, sizeof(segment)); + XBT_DEBUG("Memcpy region ok"); + break; + } + } + i++; + } + }else{ + XBT_DEBUG("Memcpy : dest %p, src %p, size %zu", reg->start_addr, reg->data, reg->size); + memcpy(reg->start_addr, reg->data, reg->size); + } + + return; } static void MC_region_destroy(mc_mem_region_t reg) @@ -38,6 +69,17 @@ static void MC_region_destroy(mc_mem_region_t reg) static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start_addr, size_t size) { + switch(type){ + case 0 : + XBT_DEBUG("New region heap (%zu)", size); + break; + case 1 : + XBT_DEBUG("New region libsimgrid (%zu)", size); + break; + case 2 : + XBT_DEBUG("New region program data (%zu)", size); + break; + } mc_mem_region_t new_reg = MC_region_new(type, start_addr, size); snapshot->regions = xbt_realloc(snapshot->regions, (snapshot->num_reg + 1) * sizeof(mc_mem_region_t)); snapshot->regions[snapshot->num_reg] = new_reg; @@ -48,11 +90,9 @@ static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start void MC_take_snapshot(mc_snapshot_t snapshot) { unsigned int i = 0; - s_map_region reg; + s_map_region_t reg; memory_map_t maps = get_memory_map(); - XBT_DEBUG("Take snapshot"); - /* Save the std heap and the writable mapped pages of libsimgrid */ while (i < maps->mapsize) { reg = maps->regions[i]; @@ -70,31 +110,22 @@ void MC_take_snapshot(mc_snapshot_t snapshot) i++; } - /* FIXME: free the memory map */ } -static void MC_snapshot_destroy(mc_snapshot_t s){ - - int i; - - for(i=0; i< s->num_reg; i++){ - MC_region_destroy(s->regions[i]); - } - - s->num_reg=0; - -} - -void MC_take_snapshot_liveness(mc_snapshot_t snapshot, char *prgm) +void MC_take_snapshot_liveness(mc_snapshot_t snapshot) { unsigned int i = 0; - s_map_region reg; + s_map_region_t reg; memory_map_t maps = get_memory_map(); - MC_snapshot_destroy(snapshot); + for(i=0; i< snapshot->num_reg; i++){ + MC_region_destroy(snapshot->regions[i]); + } - XBT_DEBUG("Take snapshot"); + snapshot->num_reg = 0; + + i = 0; /* Save the std heap and the writable mapped pages of libsimgrid */ while (i < maps->mapsize) { @@ -102,17 +133,14 @@ void MC_take_snapshot_liveness(mc_snapshot_t snapshot, char *prgm) if ((reg.prot & PROT_WRITE)){ if (maps->regions[i].pathname == NULL){ if (reg.start_addr == std_heap){ // only save the std heap (and not the raw one) - MC_snapshot_add_region(snapshot, 0, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); - //XBT_DEBUG("Region heap"); + MC_snapshot_add_region(snapshot, 0, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); } } else { if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){ MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); - //XBT_DEBUG("Region simgrid"); } else { - if (!memcmp(basename(maps->regions[i].pathname), basename(prgm), strlen(basename(prgm)))){ - MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); - //XBT_DEBUG("Region prog"); + if (!memcmp(basename(maps->regions[i].pathname), basename(prog_name), strlen(basename(prog_name)))){ + MC_snapshot_add_region(snapshot, 2, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); } } } @@ -120,15 +148,28 @@ void MC_take_snapshot_liveness(mc_snapshot_t snapshot, char *prgm) i++; } - /* FIXME: free the memory map */ } void MC_restore_snapshot(mc_snapshot_t snapshot) { unsigned int i; - for(i=0; i < snapshot->num_reg; i++) + for(i=0; i < snapshot->num_reg; i++){ MC_region_restore(snapshot->regions[i]); + switch(snapshot->regions[i]->type){ + case 0 : + XBT_DEBUG("heap restored"); + break; + case 1: + XBT_DEBUG("libsimgrid (data) restored"); + break; + case 2: + XBT_DEBUG("data program restored"); + break; + } + + } + } void MC_free_snapshot(mc_snapshot_t snapshot) @@ -139,3 +180,5 @@ void MC_free_snapshot(mc_snapshot_t snapshot) xbt_free(snapshot); } + +