"Logging specific to mc_checkpoint");
void *start_text_libsimgrid;
-void *start_plt, *end_plt;
+void *start_plt_libsimgrid, *end_plt_libsimgrid;
+void *start_plt_binary, *end_plt_binary;
char *libsimgrid_path;
void *start_data_libsimgrid;
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 mc_mem_region_t MC_region_new(int type, void *start_addr, size_t size)
{
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++;
}
- i++;
}
free_memory_map(maps);
void *heap = 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);
- nb_reg++;
start_data_libsimgrid = reg.start_addr;
+ nb_reg++;
+ 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];
+ 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++;
}
}
}else if ((reg.prot & PROT_READ)){
}
}
}
+ i++;
+ }else{
+ i++;
}
- i++;
}
snapshot->stacks = take_snapshot_stacks(heap);
}
-void get_plt_section(){
+void get_libsimgrid_plt_section(){
FILE *fp;
char *line = NULL; /* Temporal storage for each line that is readed */
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>=6){
+ if(strcmp(lfields[1], ".plt") == 0){
+ size = strtoul(lfields[2], NULL, 16);
+ 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;
+ }
+ }
+
+
+ }
+
+ 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_not_found = 1;
+ unsigned long int size, offset;
+
+ char *command = bprintf( "objdump --section-headers %s", xbt_binary_name);
+
+ fp = popen(command, "r");
+
+ if(fp == NULL)
+ perror("popen failed");
+
+ while ((read = getline(&line, &n, fp)) != -1 && plt_not_found == 1) {
+
+ 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>=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;
+ offset = strtoul(lfields[5], NULL, 16);
+ start_plt_binary = (char *)start_text_binary + offset;
+ end_plt_binary = (char *)start_plt_binary + size;
plt_not_found = 0;
}
}
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 *stack_name;
char buf[512], 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);
+ //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;
//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 : %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)));
+ //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)));
}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)));
}
- free(stack_name);
+ //free(stack_name);
return variables;
