#include <libgen.h>
-#include "private.h"
+#include "mc_private.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;
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");
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);
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 {
+ }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)))){
- 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++;
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;
}