if(fp == NULL)
perror("fopen failed");
- if(addr == NULL)
+ if(addr == NULL){
+ fclose(fp);
return "nil";
+ }
- char *lfields[6], *start, *end, *endptr;
- int i;
+ xbt_dynar_t lfields = NULL;
+ xbt_dynar_t start_end = NULL;
void *start_addr;
void *end_addr;
while ((read = getline(&line, &n, fp)) != -1) {
- line[read - 1] = '\0';
+ xbt_str_trim(line, NULL);
+ xbt_str_strip_spaces(line);
+ lfields = xbt_str_split(line,NULL);
- lfields[0] = strtok(line, " ");
-
- for (i = 1; i < 6 && lfields[i - 1] != NULL; i++) {
- lfields[i] = strtok(NULL, " ");
- }
+ start_end = xbt_str_split(xbt_dynar_get_as(lfields, 0, char*), "-");
+ start_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 0, char*), NULL, 16);
+ end_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 1, char*), NULL, 16);
- start = strtok(lfields[0], "-");
- start_addr = (void *) strtoul(start, &endptr, 16);
-
- if(start_addr == std_heap)
- lfields[5] = strdup("std_heap");
- if(start_addr == raw_heap)
- lfields[5] = strdup("raw_heap");
- end = strtok(NULL, "-");
- end_addr = (void *) strtoul(end, &endptr, 16);
-
if((addr > start_addr) && ( addr < end_addr)){
free(line);
fclose(fp);
- if(lfields[5] != NULL){
- return lfields[5];
- }else{
+ if(start_addr == std_heap)
+ return "std_heap";
+ if(start_addr == raw_heap)
+ return "raw_heap";
+ if(xbt_dynar_length(lfields) == 6)
+ return xbt_dynar_get_as(lfields, xbt_dynar_length(lfields) - 1, char*);
+ else
return "Anonymous";
- }
}
-
+
}
+ free(line);
+ fclose(fp);
return "Unknown area";
}
return 1;
}
}
- if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
XBT_DEBUG("Different memcmp for data in libsimgrid");
errors++;
return 1;
}
}
- if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
- XBT_DEBUG("Different memcmp for data in libsimgrid");
+ XBT_DEBUG("Different memcmp for data in program");
errors++;
}else{
return 1;
XBT_DEBUG("Double-DFS init");
XBT_DEBUG("**************************************************");
- XBT_DEBUG("Std heap : %p", std_heap);
- XBT_DEBUG("Raw heap : %p", raw_heap);
-
mc_pair_stateless_t mc_initial_pair = NULL;
mc_state_t initial_graph_state = NULL;
smx_process_t process;