+/* 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 <libgen.h>
-#include "private.h"
+#include "mc_private.h"
+#include "xbt/module.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc,
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", new_reg->data, start_addr);
+ 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;
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){
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 : %lu", sizeof(segment));
+ 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");
i++;
}
}else{
- XBT_DEBUG("Memcpy : dest %p, src %p, size %Zu", reg->start_addr, reg->data, reg->size);
+ XBT_DEBUG("Memcpy : dest %p, src %p, size %zu", reg->start_addr, reg->data, reg->size);
memcpy(reg->start_addr, reg->data, reg->size);
}
{
switch(type){
case 0 :
- XBT_DEBUG("New region heap (%Zu)", size);
+ XBT_DEBUG("New region heap (%zu)", size);
break;
case 1 :
- XBT_DEBUG("New region libsimgrid (%Zu)", size);
+ XBT_DEBUG("New region libsimgrid (%zu)", size);
break;
case 2 :
- XBT_DEBUG("New region program (%Zu)", size);
- break;
- case 3 :
- XBT_DEBUG("New region stack (%Zu)", size);
+ XBT_DEBUG("New region program data (%zu)", size);
break;
}
mc_mem_region_t new_reg = MC_region_new(type, start_addr, size);
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 */
/* FIXME: free the memory map */
}
-
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();
for(i=0; i< snapshot->num_reg; i++){
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);
} else {
- 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);
- } /*else {
- if (!memcmp(maps->regions[i].pathname, "[stack]", 7)){
- MC_snapshot_add_region(snapshot, 3, 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;
- 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);
- } else {
- if (!memcmp(basename(maps->regions[i].pathname), basename(prog_name), strlen(basename(prog_name)))){
+ if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
MC_snapshot_add_region(snapshot, 2, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
}
}
XBT_DEBUG("libsimgrid (data) restored");
break;
case 2:
- XBT_DEBUG("program (data) restored");
- break;
- case 3:
- XBT_DEBUG("stack restored");
+ XBT_DEBUG("data program restored");
break;
}