void *start_text_libsimgrid;
void *start_plt_libsimgrid, *end_plt_libsimgrid;
+void *start_got_plt_libsimgrid, *end_got_plt_libsimgrid;
void *start_plt_binary, *end_plt_binary;
+void *start_got_plt_binary, *end_got_plt_binary;
char *libsimgrid_path;
void *start_data_libsimgrid, *start_bss_libsimgrid;
void *start_data_binary, *start_bss_binary;
new_reg->data = xbt_malloc0(size);
memcpy(new_reg->data, start_addr, size);
- XBT_DEBUG("New region : type : %d, data : %p, size : %zu", type, new_reg->data, size);
+ XBT_DEBUG("New region : type : %d, data : %p (real addr %p), size : %zu", type, new_reg->data, start_addr, size);
return new_reg;
}
return;
}
-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(){
- raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
while (i < maps->mapsize) {
reg = maps->regions[i];
if ((reg.prot & PROT_WRITE)){
- if (maps->regions[i].pathname == NULL){
- if(reg.start_addr == raw_heap){
- end_raw_heap = reg.end_addr;
- }
- } else {
+ if (maps->regions[i].pathname != NULL){
if (!memcmp(basename(maps->regions[i].pathname), "libsimgrid", 10)){
start_data_libsimgrid = reg.start_addr;
i++;
start_bss_binary = reg.start_addr;
i++;
}
+ }else if(!memcmp(maps->regions[i].pathname, "[heap]", 6)){
+ end_raw_heap = reg.end_addr;
+ i++;
}
}
- }else if ((reg.prot & PROT_READ)){
+ }else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)){
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{
- if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
- start_text_binary = reg.start_addr;
- }
+ }else if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
+ start_text_binary = reg.start_addr;
}
}
}
}
-mc_snapshot_t MC_take_snapshot_liveness()
-{
+mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){
+ return MC_take_snapshot();
+}
- raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+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);
memory_map_t maps = get_memory_map();
int nb_reg = 0;
void *heap = NULL;
+ size_t size = 0;
+ void *start = NULL;
/* Save the std heap and the writable mapped pages of libsimgrid */
while (i < maps->mapsize) {
MC_snapshot_add_region(snapshot, 0, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
heap = snapshot->regions[nb_reg]->data;
nb_reg++;
- }else if(reg.start_addr == raw_heap){
- end_raw_heap = reg.end_addr;
}
i++;
- } else {
+ } 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;
+ 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){
- MC_snapshot_add_region(snapshot, 1, reg.start_addr, (char*)reg.end_addr - (char*)reg.start_addr);
+ size += (char*)reg.end_addr - (char*)reg.start_addr;
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++;
+ MC_snapshot_add_region(snapshot, 1, start, size);
+ }else if(!memcmp(maps->regions[i].pathname, "[heap]", 6)){
+ end_raw_heap = 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){
+ size += (char*)reg.end_addr - (char*)reg.start_addr;
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++;
}
- }
- }
- }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);
+ MC_snapshot_add_region(snapshot, 2, start, size);
}else{
- if (!memcmp(basename(maps->regions[i].pathname), basename(xbt_binary_name), strlen(basename(xbt_binary_name)))){
- start_text_binary = reg.start_addr;
- }
+ i++;
}
}
- i++;
}else{
i++;
}
}
- snapshot->stacks = take_snapshot_stacks(heap);
+ if(_sg_mc_visited > 0 || strcmp(_sg_mc_property_file,""))
+ snapshot->stacks = take_snapshot_stacks(heap);
free_memory_map(maps);
MC_UNSET_RAW_MEM;
- if(raw_mem_set)
+ if(raw_mem)
MC_SET_RAW_MEM;
return snapshot;
size_t n = 0; /* Amount of bytes to read by getline */
char *lfields[7];
- int i, plt_not_found = 1;
+ int i, plt_found = 0;
unsigned long int size, offset;
- 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) {
+ while ((read = getline(&line, &n, fp)) != -1 && plt_found != 2) {
if(n == 0)
continue;
offset = strtoul(lfields[5], NULL, 16);
start_plt_libsimgrid = (char *)start_text_libsimgrid + offset;
end_plt_libsimgrid = (char *)start_plt_libsimgrid + size;
- plt_not_found = 0;
- }
+ plt_found++;
+ }else if(strcmp(lfields[1], ".got.plt") == 0){
+ size = strtoul(lfields[2], NULL, 16);
+ offset = strtoul(lfields[5], NULL, 16);
+ start_got_plt_libsimgrid = (char *)start_text_libsimgrid + offset;
+ end_got_plt_libsimgrid = (char *)start_got_plt_libsimgrid + size;
+ plt_found++;
+ }
+
}
}
size_t n = 0; /* Amount of bytes to read by getline */
char *lfields[7];
- int i, plt_not_found = 1;
- unsigned long int size, offset;
+ int i, plt_found = 0;
+ unsigned long int size;
char *command = bprintf( "objdump --section-headers %s", xbt_binary_name);
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) {
+ while ((read = getline(&line, &n, fp)) != -1 && plt_found != 2) {
if(n == 0)
continue;
if(i>=6){
if(strcmp(lfields[1], ".plt") == 0){
size = strtoul(lfields[2], NULL, 16);
- offset = strtoul(lfields[5], NULL, 16);
- start_plt_binary = (char *)start_text_binary + offset;
+ start_plt_binary = (void *)strtoul(lfields[3], NULL, 16);
end_plt_binary = (char *)start_plt_binary + size;
- plt_not_found = 0;
- }
+ plt_found++;
+ }else if(strcmp(lfields[1], ".got.plt") == 0){
+ size = strtoul(lfields[2], NULL, 16);
+ start_got_plt_binary = (char *)strtoul(lfields[3], NULL, 16);
+ end_got_plt_binary = (char *)start_got_plt_binary + size;
+ plt_found++;
+ }
}
unw_cursor_t c;
int ret;
- //char *stack_name;
char frame_name[256];
xbt_abort();
}
- //stack_name = strdup(((smx_process_t)((smx_ctx_sysv_t)(stack->address))->super.data)->name);
-
unw_word_t ip, sp, off;
dw_frame_t frame;
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);
-
- xbt_strbuff_append(variables, bprintf("ip=%s\n", frame_name));
+ unw_get_proc_name(&c, frame_name, sizeof (frame_name), &off);
frame = xbt_dict_get_or_null(mc_local_variables, frame_name);
- if(frame == NULL){
- ret = unw_step(&c);
- continue;
- }
+ if(frame == NULL)
+ return variables;
+
+ xbt_strbuff_append(variables, bprintf("ip=%s\n", frame_name));
true_ip = (long)frame->low_pc + (long)off;
frame_found = 0;
cursor = 0;
- //XBT_INFO("Frame %s", frame->name);
-
xbt_dict_foreach(frame->variables, dict_cursor, variable_name, current_variable){
if(current_variable->location != NULL){
switch(current_variable->location->type){
if(xbt_dynar_length(compose) > 0){
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){
- //XBT_INFO("Variable : %s - address : NULL", current_variable->name);
+ 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_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=%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));
+ }else{
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)));
}
}
}else{
- //XBT_INFO("Variable %s undefined", current_variable->name);
xbt_strbuff_append(variables, bprintf("%s=undefined\n", current_variable->name));
}
break;
break;
}
}else{
- //XBT_INFO("Variable : %s, no location", current_variable->name);
xbt_strbuff_append(variables, bprintf("%s=undefined\n", current_variable->name));
}
}
ret = unw_step(&c);
-
- //XBT_INFO(" ");
}
- //free(stack_name);
-
return variables;
}
