void *start_plt_libsimgrid, *end_plt_libsimgrid;
void *start_plt_binary, *end_plt_binary;
char *libsimgrid_path;
-void *start_data_libsimgrid;
+void *start_data_libsimgrid, *start_bss_libsimgrid;
+void *start_data_binary, *start_bss_binary;
void *start_text_binary;
void *end_raw_heap;
static void print_local_variables_values(xbt_dynar_t all_variables);
static void *get_stack_pointer(void *stack_context, void *heap);
+static void snapshot_stack_free(mc_snapshot_stack_t s);
+
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);
return;
}
-void MC_take_snapshot(mc_snapshot_t snapshot)
-{
+/* void MC_take_snapshot(mc_snapshot_t snapshot) */
+/* { */
+/* unsigned int i = 0; */
+/* s_map_region_t reg; */
+/* memory_map_t maps = get_memory_map(); */
+
+/* /\* Save the std heap and the writable mapped pages of libsimgrid *\/ */
+/* while (i < maps->mapsize) { */
+/* reg = maps->regions[i]; */
+/* if ((reg.prot & PROT_WRITE)){ */
+/* 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); */
+/* } */
+/* i++; */
+/* } 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); */
+/* i++; */
+/* reg = maps->regions[i]; */
+/* while(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize){ */
+/* MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr); */
+/* i++; */
+/* reg = maps->regions[i]; */
+/* } */
+/* }else{ */
+/* i++; */
+/* } */
+/* } */
+/* }else{ */
+/* i++; */
+/* } */
+/* } */
+
+/* free_memory_map(maps); */
+/* } */
+
+void MC_init_memory_map_info(){
+
+ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+ MC_SET_RAW_MEM;
+
unsigned int i = 0;
s_map_region_t reg;
memory_map_t maps = get_memory_map();
- /* Save the std heap and the writable mapped pages of libsimgrid */
while (i < maps->mapsize) {
reg = maps->regions[i];
if ((reg.prot & PROT_WRITE)){
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);
+ if(reg.start_addr == raw_heap){
+ end_raw_heap = reg.end_addr;
}
- i++;
} 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);
+ start_data_libsimgrid = reg.start_addr;
i++;
reg = maps->regions[i];
- while(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize){
- MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
+ if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize)
+ start_bss_libsimgrid = reg.start_addr;
+ }else if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
+ start_data_binary = reg.start_addr;
+ 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){
+ start_bss_binary = reg.start_addr;
i++;
- reg = maps->regions[i];
}
+ }
+ }
+ }else if ((reg.prot & PROT_READ)){
+ if (maps->regions[i].pathname != NULL){
+ if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){
+ start_text_libsimgrid = reg.start_addr;
+ libsimgrid_path = strdup(maps->regions[i].pathname);
}else{
- i++;
- }
+ if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
+ start_text_binary = reg.start_addr;
+ }
+ }
}
- }else{
- i++;
}
+ i++;
}
-
+
free_memory_map(maps);
+
+ MC_UNSET_RAW_MEM;
+
+ if(raw_mem_set)
+ MC_SET_RAW_MEM;
+
}
-void MC_take_snapshot_liveness(mc_snapshot_t snapshot)
+mc_snapshot_t MC_take_snapshot()
{
+ int raw_mem = (mmalloc_get_current_heap() == raw_heap);
+
+ MC_SET_RAW_MEM;
+
+ mc_snapshot_t snapshot = xbt_new0(s_mc_snapshot_t, 1);
+
unsigned int i = 0;
s_map_region_t reg;
memory_map_t maps = get_memory_map();
nb_reg++;
i++;
reg = maps->regions[i];
- while(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize){
+ if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize){
MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
- i++;
reg = maps->regions[i];
+ i++;
nb_reg++;
}
} else {
if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
MC_snapshot_add_region(snapshot, 2, reg.start_addr, (char*)reg.end_addr - (char*)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){
+ MC_snapshot_add_region(snapshot, 2, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
+ reg = maps->regions[i];
+ nb_reg++;
+ }
+ }else{
+ i++;
}
- i++;
}
}
}else if ((reg.prot & PROT_READ)){
}
}
- snapshot->stacks = take_snapshot_stacks(heap);
+ if(_surf_mc_stateful > 0 || _surf_mc_property_file)
+ snapshot->stacks = take_snapshot_stacks(heap);
free_memory_map(maps);
+ MC_UNSET_RAW_MEM;
+
+ if(raw_mem)
+ MC_SET_RAW_MEM;
+
+ return snapshot;
+
}
void MC_restore_snapshot(mc_snapshot_t snapshot)
for(i=0; i < snapshot->num_reg; i++)
MC_region_destroy(snapshot->regions[i]);
+ xbt_dynar_free(&(snapshot->stacks));
xbt_free(snapshot);
}
int i, plt_not_found = 1;
unsigned long int size, offset;
- char *command = bprintf( "objdump --section-headers %s", libsimgrid_path);
+ if(libsimgrid_path == NULL)
+ libsimgrid_path = get_libsimgrid_path();
+
+ char *command = bprintf("objdump --section-headers %s", libsimgrid_path);
fp = popen(command, "r");
- if(fp == NULL)
+ if(fp == NULL){
perror("popen failed");
+ xbt_abort();
+ }
while ((read = getline(&line, &n, fp)) != -1 && plt_not_found == 1) {
if(lfields[0] == NULL)
continue;
- if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strcmp(lfields[0], "libsimgrid.so:") == 0)
+ if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strncmp(lfields[0], libsimgrid_path, strlen(libsimgrid_path)) == 0)
continue;
for (i = 1; i < 7 && lfields[i - 1] != NULL; i++) {
}
}
-
}
free(command);
fp = popen(command, "r");
- if(fp == NULL)
+ if(fp == NULL){
perror("popen failed");
+ xbt_abort();
+ }
while ((read = getline(&line, &n, fp)) != -1 && plt_not_found == 1) {
if(lfields[0] == NULL)
continue;
- if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strcmp(lfields[0], basename(xbt_binary_name)) == 0)
+ if(strcmp(lfields[0], "Sections:") == 0 || strcmp(lfields[0], "Idx") == 0 || strncmp(lfields[0], basename(xbt_binary_name), strlen(xbt_binary_name)) == 0)
continue;
for (i = 1; i < 7 && lfields[i - 1] != NULL; i++) {
int ret;
//char *stack_name;
- char buf[512], frame_name[256];
+ char frame_name[256];
ret = unw_init_local(&c, (unw_context_t *)stack_context);
if(ret < 0){
unw_get_reg(&c, UNW_REG_IP, &ip);
unw_get_reg(&c, UNW_REG_SP, &sp);
- buf[0] = '\0';
- if (unw_get_proc_name (&c, frame_name, sizeof (frame_name), &off) == 0){
- if (off)
- snprintf (buf, sizeof (buf), "<%s+0x%lx>", frame_name, (long) off);
- else
- snprintf (buf, sizeof (buf), "<%s>", frame_name);
-
- }
+ unw_get_proc_name (&c, frame_name, sizeof (frame_name), &off);
- xbt_strbuff_append(variables, bprintf("ip=%-32s\n", buf));
+ xbt_strbuff_append(variables, bprintf("ip=%s\n", frame_name));
frame = xbt_dict_get_or_null(mc_local_variables, frame_name);
}
if(xbt_dynar_length(compose) > 0){
+ //XBT_INFO("Variable : %s", current_variable->name);
if(strcmp(xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->type, "value") == 0){
//XBT_INFO("Variable : %s - value : %lx", current_variable->name, xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.res);
xbt_strbuff_append(variables, bprintf("%s=%lx\n", current_variable->name, xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.res));
}else{
- if(*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address) == NULL){
+ if((long)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address < 0 || *((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1,variable_value_t)->value.address) == NULL){
//XBT_INFO("Variable : %s - address : NULL", current_variable->name);
xbt_strbuff_append(variables, bprintf("%s=NULL\n", current_variable->name));
}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)){
//XBT_INFO("Variable : %s - value : %zd", current_variable->name, (size_t)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address));
- xbt_strbuff_append(variables, bprintf("%s=%zd\n", current_variable->name, (size_t)*((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address)));
+ xbt_strbuff_append(variables, 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)));
}else{
//XBT_INFO("Variable : %s - address : %p", current_variable->name, *((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address));
xbt_strbuff_append(variables, bprintf("%s=%p\n", current_variable->name, *((void**)xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address)));
}
}
+
+static void snapshot_stack_free(mc_snapshot_stack_t s){
+ if(s){
+ xbt_free(s->local_variables->data);
+ xbt_free(s->local_variables);
+ xbt_free(s);
+ }
+}
+
+void snapshot_stack_free_voidp(void *s){
+ snapshot_stack_free((mc_snapshot_stack_t) * (void **) s);
+}
+
+void *MC_snapshot(void){
+
+ return simcall_mc_snapshot();
+
+}
