"Logging specific to mc_checkpoint");
void *start_text_libsimgrid;
-void *start_plt, *end_plt;
+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;
+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 add_value(xbt_dynar_t *list, const char *type, unsigned long int val);
static xbt_dynar_t take_snapshot_stacks(void *heap);
-static xbt_strbuff_t get_local_variables_values(stack_region_t stack, void *heap);
+static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap);
static void print_local_variables_values(xbt_dynar_t all_variables);
-static void *get_stack_pointer(stack_region_t stack, void *heap);
+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)
{
return;
}
-void MC_take_snapshot(mc_snapshot_t snapshot)
-{
+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;
}
} 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];
+ 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++;
+ }
+ }
+ }
+ }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;
+ }
+ }
}
}
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 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);
+
+ 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();
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 && nb_reg < 3) {
+ while (i < maps->mapsize) {
reg = maps->regions[i];
if ((reg.prot & PROT_WRITE)){
if (maps->regions[i].pathname == NULL){
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 {
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);
+ size = (char*)reg.end_addr - (char*)reg.start_addr;
+ start = reg.start_addr;
nb_reg++;
- start_data_libsimgrid = reg.start_addr;
+ i++;
+ reg = maps->regions[i];
+ if(reg.pathname == NULL && (reg.prot & PROT_WRITE) && i < maps->mapsize){
+ size += (char*)reg.end_addr - (char*)reg.start_addr;
+ reg = maps->regions[i];
+ i++;
+ nb_reg++;
+ }
+ MC_snapshot_add_region(snapshot, 1, start, size);
} 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++;
}
}
}
- }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{
- 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++;
}
- snapshot->stacks = take_snapshot_stacks(heap);
+ if(_surf_mc_visited > 0 || strcmp(_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);
}
-void get_plt_section(){
+void get_libsimgrid_plt_section(){
FILE *fp;
char *line = NULL; /* Temporal storage for each line that is readed */
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;
- char *command = bprintf( "objdump --section-headers %s", 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;
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++) {
lfields[i] = strtok(NULL, " ");
}
- if(i>=5){
+ if(i>=6){
if(strcmp(lfields[1], ".plt") == 0){
size = strtoul(lfields[2], NULL, 16);
- offset = strtoul(lfields[4], NULL, 16);
- start_plt = (char *)start_text_libsimgrid + offset;
- end_plt = (char *)start_plt + size;
- plt_not_found = 0;
- }
+ offset = strtoul(lfields[5], NULL, 16);
+ start_plt_libsimgrid = (char *)start_text_libsimgrid + offset;
+ end_plt_libsimgrid = (char *)start_plt_libsimgrid + size;
+ 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++;
+ }
+
+ }
+
+ }
+
+ free(command);
+ free(line);
+ pclose(fp);
+
+}
+
+void get_binary_plt_section(){
+
+ 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 */
+
+ char *lfields[7];
+ 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){
+ perror("popen failed");
+ xbt_abort();
+ }
+
+ while ((read = getline(&line, &n, fp)) != -1 && plt_found != 2) {
+
+ if(n == 0)
+ continue;
+
+ /* Wipeout the new line character */
+ line[read - 1] = '\0';
+
+ lfields[0] = strtok(line, " ");
+
+ if(lfields[0] == NULL)
+ continue;
+
+ 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++) {
+ lfields[i] = strtok(NULL, " ");
+ }
+
+ if(i>=6){
+ if(strcmp(lfields[1], ".plt") == 0){
+ size = strtoul(lfields[2], NULL, 16);
+ start_plt_binary = (void *)strtoul(lfields[3], NULL, 16);
+ end_plt_binary = (char *)start_plt_binary + size;
+ 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++;
+ }
}
xbt_dynar_foreach(stacks_areas, cursor1, current_stack){
mc_snapshot_stack_t st = xbt_new(s_mc_snapshot_stack_t, 1);
- st->local_variables = get_local_variables_values(current_stack, heap);
- st->stack_pointer = get_stack_pointer(current_stack, heap);
+ st->local_variables = get_local_variables_values(current_stack->context, heap);
+ st->stack_pointer = get_stack_pointer(current_stack->context, heap);
xbt_dynar_push(res, &st);
}
}
-static void *get_stack_pointer(stack_region_t stack, void *heap){
+static void *get_stack_pointer(void *stack_context, void *heap){
unw_cursor_t c;
int ret;
unw_word_t sp;
- ret = unw_init_local(&c, (unw_context_t *)&(((smx_ctx_sysv_t)(stack->address))->uc));
+ ret = unw_init_local(&c, (unw_context_t *)stack_context);
if(ret < 0){
XBT_INFO("unw_init_local failed");
xbt_abort();
}
-static xbt_strbuff_t get_local_variables_values(stack_region_t stack, void *heap){
+static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap){
unw_cursor_t c;
int ret;
- char *stack_name;
- char buf[512], frame_name[256];
+ char frame_name[256];
- ret = unw_init_local(&c, (unw_context_t *)&(((smx_ctx_sysv_t)(stack->address))->uc));
+ ret = unw_init_local(&c, (unw_context_t *)stack_context);
if(ret < 0){
XBT_INFO("unw_init_local failed");
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);
- 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);
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 : %d", current_variable->name, (int)(long long int)*((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 long int)*((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=%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_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;
}
}
}
+
+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();
+
+}
