void *start_data_libsimgrid, *start_bss_libsimgrid;
void *start_data_binary, *start_bss_binary;
void *start_text_binary;
-void *end_raw_heap;
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 *get_stack_pointer(void *stack_context, void *heap);
static void snapshot_stack_free(mc_snapshot_stack_t s);
+static xbt_dynar_t take_snapshot_ignore(void);
+
+static void get_hash_global(char *snapshot_hash, void *data1, void *data2);
+static void get_hash_local(char *snapshot_hash, xbt_dynar_t stacks);
static mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size)
{
mc_mem_region_t new_reg = xbt_new0(s_mc_mem_region_t, 1);
- new_reg->type = type;
new_reg->start_addr = start_addr;
new_reg->size = size;
new_reg->data = xbt_malloc0(size);
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->regions = xbt_realloc(snapshot->regions, (snapshot->num_reg + 1) * sizeof(mc_mem_region_t));
- snapshot->regions[snapshot->num_reg] = new_reg;
- snapshot->region_type[snapshot->num_reg] = type;
- snapshot->num_reg++;
+ snapshot->regions[type] = new_reg;
return;
}
start_bss_binary = reg.start_addr;
i++;
}
- }else if(!memcmp(maps->regions[i].pathname, "[heap]", 6)){
- end_raw_heap = reg.end_addr;
+ }else if(!memcmp(maps->regions[i].pathname, "[stack]", 7)){
+ maestro_stack_start = reg.start_addr;
+ maestro_stack_end = reg.end_addr;
i++;
}
}
}
-mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){
- return MC_take_snapshot();
-}
-
mc_snapshot_t MC_take_snapshot()
{
int raw_mem = (mmalloc_get_current_heap() == raw_heap);
unsigned int i = 0;
s_map_region_t reg;
memory_map_t maps = get_memory_map();
- int nb_reg = 0;
void *heap = NULL;
size_t size = 0;
void *start = NULL;
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);
- snapshot->heap_chunks_used = mmalloc_get_chunks_used(std_heap);
- heap = snapshot->regions[nb_reg]->data;
- nb_reg++;
+ snapshot->heap_bytes_used = mmalloc_get_bytes_used(std_heap);
+ heap = snapshot->regions[0]->data;
}
i++;
} else{
if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){
size = (char*)reg.end_addr - (char*)reg.start_addr;
start = reg.start_addr;
- nb_reg++;
i++;
reg = maps->regions[i];
if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize){
i++;
}
MC_snapshot_add_region(snapshot, 1, start, size);
- }else if(!memcmp(maps->regions[i].pathname, "[heap]", 6)){
- end_raw_heap = reg.end_addr;
+ }else if(!memcmp(maps->regions[i].pathname, "[stack]", 7)){
+ maestro_stack_start = reg.start_addr;
+ maestro_stack_end = reg.end_addr;
i++;
} else if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
size = (char*)reg.end_addr - (char*)reg.start_addr;
start = reg.start_addr;
- nb_reg++;
i++;
reg = maps->regions[i];
if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && reg.start_addr != std_heap && reg.start_addr != raw_heap && i < maps->mapsize){
}
}
- if(_sg_mc_visited > 0 || strcmp(_sg_mc_property_file,""))
+ snapshot->to_ignore = take_snapshot_ignore();
+
+ if(_sg_mc_visited > 0 || strcmp(_sg_mc_property_file,"")){
snapshot->stacks = take_snapshot_stacks(&snapshot, heap);
-
+ get_hash_global(snapshot->hash_global, snapshot->regions[2]->data, snapshot->regions[1]->data);
+ get_hash_local(snapshot->hash_local, snapshot->stacks);
+ }
+
free_memory_map(maps);
MC_UNSET_RAW_MEM;
void MC_restore_snapshot(mc_snapshot_t snapshot)
{
unsigned int i;
- for(i=0; i < snapshot->num_reg; i++){
+ for(i=0; i < NB_REGIONS; i++){
MC_region_restore(snapshot->regions[i]);
}
void MC_free_snapshot(mc_snapshot_t snapshot)
{
unsigned int i;
- for(i=0; i < snapshot->num_reg; i++)
+ for(i=0; i < NB_REGIONS; i++)
MC_region_destroy(snapshot->regions[i]);
- xbt_free(snapshot->regions);
xbt_dynar_free(&(snapshot->stacks));
+ xbt_dynar_free(&(snapshot->to_ignore));
xbt_free(snapshot);
}
FILE *fp;
char *line = NULL; /* Temporal storage for each line that is readed */
ssize_t read; /* Number of bytes readed */
- size_t n = 0; /* Amount of bytes to read by getline */
+ size_t n = 0; /* Amount of bytes to read by xbt_getline */
char *lfields[7];
int i, plt_found = 0;
xbt_abort();
}
- while ((read = getline(&line, &n, fp)) != -1 && plt_found != 2) {
+ while ((read = xbt_getline(&line, &n, fp)) != -1 && plt_found != 2) {
if(n == 0)
continue;
FILE *fp;
char *line = NULL; /* Temporal storage for each line that is readed */
ssize_t read; /* Number of bytes readed */
- size_t n = 0; /* Amount of bytes to read by getline */
+ size_t n = 0; /* Amount of bytes to read by xbt_getline */
char *lfields[7];
int i, plt_found = 0;
xbt_abort();
}
- while ((read = getline(&line, &n, fp)) != -1 && plt_found != 2) {
+ while ((read = xbt_getline(&line, &n, fp)) != -1 && plt_found != 2) {
if(n == 0)
continue;
return variables;
}
- to_append = bprintf("ip=%s\n", frame_name);
+ to_append = bprintf("frame_name=%s\n", frame_name);
xbt_strbuff_append(variables, to_append);
xbt_free(to_append);
-
+ to_append = bprintf("ip=%lx\n", ip);
+ xbt_strbuff_append(variables, to_append);
+ xbt_free(to_append);
+
true_ip = (long)frame->low_pc + (long)off;
/* Get frame pointer */
cursor2++;
}
- if(xbt_dynar_length(compose) > 0){
+ if(!xbt_dynar_is_empty(compose)){
frame_pointer_address = xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address ;
}
break;
cursor++;
}
- if(xbt_dynar_length(compose) > 0){
+ if(!xbt_dynar_is_empty(compose)){
if(strcmp(xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->type, "value") == 0){
to_append = bprintf("%s=%lx\n", current_variable->name, xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.res);
xbt_strbuff_append(variables, to_append);
xbt_strbuff_append(variables, to_append);
xbt_free(to_append);
}else if(((long)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address) > 0xffffffff) || ((long)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address) < (long)start_text_binary)){
- to_append = bprintf("%s=%d\n", current_variable->name, (int)(long)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address));
+ to_append = bprintf("%s=%u\n", current_variable->name, (unsigned int)(long)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address));
xbt_strbuff_append(variables, to_append);
xbt_free(to_append);
}else{
snapshot_stack_free((mc_snapshot_stack_t) * (void **) s);
}
+mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){
+ return MC_take_snapshot();
+}
+
void *MC_snapshot(void){
return simcall_mc_snapshot();
variable_value_free((variable_value_t) * (void **)v);
}
+static void get_hash_global(char *snapshot_hash, void *data1, void *data2){
+
+ unsigned int cursor = 0;
+ size_t offset;
+ global_variable_t current_var;
+ void *addr_pointed = NULL;
+
+ void *res;
+
+ xbt_strbuff_t clear = xbt_strbuff_new();
+
+ xbt_dynar_foreach(mc_global_variables, cursor, current_var){
+ if(current_var->address < start_data_libsimgrid)
+ continue;
+ offset = (char *)current_var->address - (char *)start_data_libsimgrid;
+ addr_pointed = *((void **)((char *)data2 + offset));
+ if((addr_pointed > start_plt_libsimgrid && addr_pointed < end_plt_libsimgrid) || (addr_pointed > std_heap && (char *)addr_pointed < (char *)std_heap + STD_HEAP_SIZE ))
+ continue;
+ res = xbt_malloc0(current_var->size);;
+ memcpy(res, (char*)data2 + offset, current_var->size);
+ xbt_strbuff_append(clear, (const char*)res);
+ xbt_free(res);
+ }
+
+ xbt_dynar_foreach(mc_global_variables, cursor, current_var){
+ if(current_var->address > start_data_libsimgrid)
+ break;
+ offset = (char *)current_var->address - (char *)start_data_binary;
+ addr_pointed = *((void **)((char *)data1 + offset));
+ if((addr_pointed > start_plt_binary && addr_pointed < end_plt_binary) || (addr_pointed > std_heap && (char *)addr_pointed < (char *)std_heap + STD_HEAP_SIZE ))
+ continue;
+ res = xbt_malloc0(current_var->size);;
+ memcpy(res, (char*)data1 + offset, current_var->size);
+ xbt_strbuff_append(clear, (const char*)res);
+ xbt_free(res);
+ }
+
+ xbt_sha(clear->data, snapshot_hash);
+
+ xbt_strbuff_free(clear);
+
+}
+
+static void get_hash_local(char *snapshot_hash, xbt_dynar_t stacks){
+
+ xbt_dynar_t tokens = NULL, s_tokens = NULL;
+ unsigned int cursor1 = 0, cursor2 = 0;
+ mc_snapshot_stack_t current_stack;
+ char *frame_name = NULL;
+ void *addr;
+
+ xbt_strbuff_t clear = xbt_strbuff_new();
+
+ while(cursor1 < xbt_dynar_length(stacks)){
+ current_stack = xbt_dynar_get_as(stacks, cursor1, mc_snapshot_stack_t);
+ tokens = xbt_str_split(current_stack->local_variables->data, NULL);
+ cursor2 = 0;
+ while(cursor2 < xbt_dynar_length(tokens)){
+ s_tokens = xbt_str_split(xbt_dynar_get_as(tokens, cursor2, char *), "=");
+ if(xbt_dynar_length(s_tokens) > 1){
+ if(strcmp(xbt_dynar_get_as(s_tokens, 0, char *), "frame_name") == 0){
+ xbt_free(frame_name);
+ frame_name = xbt_strdup(xbt_dynar_get_as(s_tokens, 1, char *));
+ xbt_strbuff_append(clear, (const char*)xbt_dynar_get_as(tokens, cursor2, char *));
+ cursor2++;
+ xbt_dynar_free(&s_tokens);
+ continue;
+ }
+ addr = (void *) strtoul(xbt_dynar_get_as(s_tokens, 1, char *), NULL, 16);
+ if(addr > std_heap && (char *)addr <= (char *)std_heap + STD_HEAP_SIZE){
+ cursor2++;
+ xbt_dynar_free(&s_tokens);
+ continue;
+ }
+ if(is_stack_ignore_variable(frame_name, xbt_dynar_get_as(s_tokens, 0, char *))){
+ cursor2++;
+ xbt_dynar_free(&s_tokens);
+ continue;
+ }
+ xbt_strbuff_append(clear, (const char *)xbt_dynar_get_as(tokens, cursor2, char *));
+ }
+ xbt_dynar_free(&s_tokens);
+ cursor2++;
+ }
+ xbt_dynar_free(&tokens);
+ cursor1++;
+ }
+
+ xbt_free(frame_name);
+
+ xbt_sha(clear->data, snapshot_hash);
+
+ xbt_strbuff_free(clear);
+
+}
+
+
+static xbt_dynar_t take_snapshot_ignore(){
+
+ if(mc_heap_comparison_ignore == NULL)
+ return NULL;
+
+ xbt_dynar_t cpy = xbt_dynar_new(sizeof(mc_heap_ignore_region_t), heap_ignore_region_free_voidp);
+
+ unsigned int cursor = 0;
+ mc_heap_ignore_region_t current_region;
+
+ xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region){
+ mc_heap_ignore_region_t new_region = NULL;
+ new_region = xbt_new0(s_mc_heap_ignore_region_t, 1);
+ new_region->address = current_region->address;
+ new_region->size = current_region->size;
+ new_region->block = current_region->block;
+ new_region->fragment = current_region->fragment;
+ xbt_dynar_push(cpy, &new_region);
+ }
+
+ return cpy;
+
+}
