X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5ad8ca1a68bbaa9152471c8d0eeb99d762f0d86..1f27be8ecd303fa9f686a2ca2ad1987cc4658180:/src/mc/mc_checkpoint.c diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c index da376da567..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, @@ -32,7 +37,7 @@ static void MC_region_restore(mc_mem_region_t reg) memory_map_t maps = get_memory_map(); MC_UNSET_RAW_MEM; unsigned int i=0; - s_map_region r; + s_map_region_t r; while(i < maps->mapsize){ r = maps->regions[i]; if (maps->regions[i].pathname != NULL){ @@ -85,7 +90,7 @@ 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(); /* Save the std heap and the writable mapped pages of libsimgrid */ @@ -108,45 +113,10 @@ void MC_take_snapshot(mc_snapshot_t snapshot) /* FIXME: free the memory map */ } - void MC_take_snapshot_liveness(mc_snapshot_t snapshot) { unsigned int i = 0; - s_map_region reg; - memory_map_t maps = get_memory_map(); - - for(i=0; i< snapshot->num_reg; i++){ - MC_region_destroy(snapshot->regions[i]); - } - - snapshot->num_reg = 0; - - i = 0; - - /* Save the std heap and the writable mapped pages of libsimgrid */ - while (i < maps->mapsize) { - reg = maps->regions[i]; - 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); - } - }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); - } - } - } - i++; - } - - /* FIXME: free the memory map */ -} - -void MC_take_snapshot_to_restore_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(); for(i=0; i< snapshot->num_reg; i++){