A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mc] Change type for type->id
[simgrid.git]
/
src
/
mc
/
mc_checkpoint.c
diff --git
a/src/mc/mc_checkpoint.c
b/src/mc/mc_checkpoint.c
index
dab4199
..
e482c42
100644
(file)
--- a/
src/mc/mc_checkpoint.c
+++ b/
src/mc/mc_checkpoint.c
@@
-43,7
+43,6
@@
static void MC_snapshot_stack_free_voidp(void *s){
}
static void local_variable_free(local_variable_t v){
}
static void local_variable_free(local_variable_t v){
- xbt_free(v->frame);
xbt_free(v->name);
xbt_free(v);
}
xbt_free(v->name);
xbt_free(v);
}
@@
-273,7
+272,7
@@
static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, dw_fram
region_type = 2;
local_variable_t new_var = xbt_new0(s_local_variable_t, 1);
region_type = 2;
local_variable_t new_var = xbt_new0(s_local_variable_t, 1);
- new_var->
frame = xbt_strdup(stack_frame->frame_name)
;
+ new_var->
subprogram = stack_frame->frame
;
new_var->ip = stack_frame->ip;
new_var->name = xbt_strdup(current_variable->name);
new_var->type = current_variable->type;
new_var->ip = stack_frame->ip;
new_var->name = xbt_strdup(current_variable->name);
new_var->type = current_variable->type;
@@
-284,6
+283,7
@@
static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, dw_fram
} else */
if(current_variable->locations.size != 0){
new_var->address = (void*) mc_dwarf_resolve_locations(¤t_variable->locations,
} else */
if(current_variable->locations.size != 0){
new_var->address = (void*) mc_dwarf_resolve_locations(¤t_variable->locations,
+ current_variable->object_info,
&(stack_frame->unw_cursor), (void*)stack_frame->frame_base, NULL);
}
&(stack_frame->unw_cursor), (void*)stack_frame->frame_base, NULL);
}
@@
-323,8
+323,13
@@
static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) {
unw_cursor_t c;
unw_cursor_t c;
- int ret;
- for(ret = unw_init_local(&c, (unw_context_t *)stack_context); ret >= 0; ret = unw_step(&c)){
+ // TODO, check condition check (unw_init_local==0 means end of frame)
+ if(unw_init_local(&c, (unw_context_t *)stack_context)!=0) {
+
+ xbt_die("Could not initialize stack unwinding");
+
+ } else while(1) {
+
mc_stack_frame_t stack_frame = xbt_new(s_mc_stack_frame_t, 1);
xbt_dynar_push(result, &stack_frame);
mc_stack_frame_t stack_frame = xbt_new(s_mc_stack_frame_t, 1);
xbt_dynar_push(result, &stack_frame);
@@
-345,14
+350,22
@@
static xbt_dynar_t MC_unwind_stack_frames(void *stack_context) {
if(frame) {
stack_frame->frame_name = xbt_strdup(frame->name);
if(frame) {
stack_frame->frame_name = xbt_strdup(frame->name);
- stack_frame->frame_base = (unw_word_t)mc_find_frame_base(frame, &c);
+ stack_frame->frame_base = (unw_word_t)mc_find_frame_base(frame,
frame->object_info,
&c);
} else {
stack_frame->frame_base = 0;
} else {
stack_frame->frame_base = 0;
+ stack_frame->frame_name = NULL;
}
/* Stop before context switch with maestro */
if(frame!=NULL && frame->name!=NULL && !strcmp(frame->name, "smx_ctx_sysv_wrapper"))
break;
}
/* Stop before context switch with maestro */
if(frame!=NULL && frame->name!=NULL && !strcmp(frame->name, "smx_ctx_sysv_wrapper"))
break;
+
+ int ret = ret = unw_step(&c);
+ if(ret==0) {
+ xbt_die("Unexpected end of stack.");
+ } else if(ret<0) {
+ xbt_die("Error while unwinding stack.");
+ }
}
if(xbt_dynar_length(result) == 0){
}
if(xbt_dynar_length(result) == 0){