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 mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size)
{
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++;
}
}
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;
}
}
+ snapshot->to_ignore = take_snapshot_ignore();
+
if(_sg_mc_visited > 0 || strcmp(_sg_mc_property_file,""))
snapshot->stacks = take_snapshot_stacks(&snapshot, heap);
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("ip=%lx\n", ip);
+ xbt_strbuff_append(variables, to_append);
+ xbt_free(to_append);
+ to_append = bprintf("frame_name=%s\n", frame_name);
xbt_strbuff_append(variables, to_append);
xbt_free(to_append);
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);
variable_value_free((variable_value_t) * (void **)v);
}
+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;
+
+}