-/* Copyright (c) 2008-2013 Da SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2013. 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. */
void *start_data_binary, *start_bss_binary;
void *start_text_binary;
-/* Free functions */
+/************************************ Free functions **************************************/
+/*****************************************************************************************/
static void MC_snapshot_stack_free(mc_snapshot_stack_t s){
if(s){
- xbt_free(s->local_variables->data);
- xbt_free(s->local_variables);
+ xbt_dynar_free(&(s->local_variables));
xbt_free(s);
}
}
local_variable_free((local_variable_t) * (void **) v);
}
+static void MC_region_destroy(mc_mem_region_t reg)
+{
+ xbt_free(reg->data);
+ xbt_free(reg);
+}
-/* Snapshot regions */
+void MC_free_snapshot(mc_snapshot_t snapshot){
+ unsigned int i;
+ for(i=0; i < NB_REGIONS; i++)
+ MC_region_destroy(snapshot->regions[i]);
+
+ xbt_free(snapshot->stack_sizes);
+ xbt_dynar_free(&(snapshot->stacks));
+ xbt_dynar_free(&(snapshot->to_ignore));
+ xbt_free(snapshot);
+}
+
+
+/******************************* Snapshot regions ********************************/
+/*********************************************************************************/
static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size)
{
before copying the data */
memcpy(reg->start_addr, reg->data, reg->size);
-
return;
}
-static void MC_region_destroy(mc_mem_region_t reg)
-{
- xbt_free(reg->data);
- xbt_free(reg);
-}
-
static void MC_snapshot_add_region(mc_snapshot_t snapshot, int type, void *start_addr, size_t size)
{
mc_mem_region_t new_reg = MC_region_new(type, start_addr, size);
}
-/* Snapshot */
+/************************************* Take Snapshot ************************************/
+/****************************************************************************************/
static void MC_get_hash_global(char *snapshot_hash, void *data1, void *data2){
unw_word_t res;
int frame_found = 0, region_type;
void *frame_pointer_address = NULL;
- long true_ip, value;
+ unsigned long true_ip, value;
+ int stop = 0;
xbt_dynar_t variables = xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp);
- while(ret >= 0){
+ while(ret >= 0 && !stop){
unw_get_reg(&c, UNW_REG_IP, &ip);
unw_get_reg(&c, UNW_REG_SP, &sp);
unw_get_proc_name(&c, frame_name, sizeof (frame_name), &off);
- if((long)ip > (long)start_text_libsimgrid)
+ if(!strcmp(frame_name, "smx_ctx_sysv_wrapper")) /* Stop before context switch with maestro */
+ stop = 1;
+
+ if((uintptr_t)ip > (uintptr_t)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);
continue;
}
- true_ip = (long)frame->low_pc + (long)off;
+ true_ip = (unsigned long)frame->low_pc + (unsigned long)off;
frame_pointer_address = NULL;
/* Get frame pointer */
switch(location_entry->type){
case e_dw_register:
unw_get_reg(&c, location_entry->location.reg, &res);
- frame_pointer_address = (void*)(long)res;
+ frame_pointer_address = (void*)(uintptr_t)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);
+ frame_pointer_address = (void*)((uintptr_t)res + location_entry->location.breg_op.offset);
break;
default:
frame_pointer_address = NULL; /* FIXME : implement other cases (with optimizations enabled) */
xbt_dynar_foreach(frame->variables, cursor, current_variable){
- if((long)ip > (long)start_text_libsimgrid)
+ if((uintptr_t)ip > (uintptr_t)start_text_libsimgrid)
region_type = 1;
else
region_type = 2;
switch(location_entry->type){
case e_dw_register:
unw_get_reg(&c, location_entry->location.reg, &res);
- value = (long)res;
+ value = (unsigned 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;
+ value = (unsigned 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);
+ value = (unsigned long)((char *)frame_pointer_address + location_entry->location.fbreg_op);
else
value = 0;
break;
unw_get_reg(&c, UNW_REG_SP, &sp);
- return ((char *)heap + (size_t)(((char *)((long)sp) - (char*)std_heap)));
+ return (char *)heap + ((char *)sp - (char*)std_heap);
}
}
+static void MC_dump_checkpoint_ignore(mc_snapshot_t snapshot){
+
+ 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);
+ }
+ }
-mc_snapshot_t MC_take_snapshot(){
+}
- int raw_mem = (mmalloc_get_current_heap() == raw_heap);
-
- MC_SET_RAW_MEM;
+
+mc_snapshot_t MC_take_snapshot(int num_state){
mc_snapshot_t snapshot = xbt_new0(s_mc_snapshot_t, 1);
snapshot->nb_processes = xbt_swag_size(simix_global->process_list);
//MC_get_hash_local(snapshot->hash_local, snapshot->stacks);
}
- MC_UNSET_RAW_MEM;
-
- if(raw_mem)
- MC_SET_RAW_MEM;
+ if(num_state > 0)
+ MC_dump_checkpoint_ignore(snapshot);
return snapshot;
}
-void MC_free_snapshot(mc_snapshot_t snapshot){
- unsigned int i;
- for(i=0; i < NB_REGIONS; i++)
- MC_region_destroy(snapshot->regions[i]);
-
- xbt_free(snapshot->stack_sizes);
- xbt_dynar_free(&(snapshot->stacks));
- xbt_dynar_free(&(snapshot->to_ignore));
- xbt_free(snapshot);
-}
-
mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){
- return MC_take_snapshot();
+ return MC_take_snapshot(1);
}
void *MC_snapshot(void){
