[mc] Process nested-scopes

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index db664a6..dab4199 100644 (file)
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -254,6 +254,49 @@ static bool mc_valid_variable(dw_variable_t var, dw_frame_t frame, const void* i
     return true;
 }
 
+static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, dw_frame_t scope, xbt_dynar_t result) {
+  void* ip = (void*) stack_frame->ip;
+  if(ip < scope->low_pc || ip>= scope->high_pc)
+    return;
+
+  unsigned cursor = 0;
+  dw_variable_t current_variable;
+  xbt_dynar_foreach(scope->variables, cursor, current_variable){
+
+    if(!mc_valid_variable(current_variable, stack_frame->frame, (void*) stack_frame->ip))
+      continue;
+
+    int region_type;
+    if((long)stack_frame->ip > (long)mc_libsimgrid_info->start_exec)
+      region_type = 1;
+    else
+      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->ip = stack_frame->ip;
+    new_var->name = xbt_strdup(current_variable->name);
+    new_var->type = current_variable->type;
+    new_var->region= region_type;
+
+    /* if(current_variable->address!=NULL) {
+      new_var->address = current_variable->address;
+    } else */
+    if(current_variable->locations.size != 0){
+      new_var->address = (void*) mc_dwarf_resolve_locations(&current_variable->locations,
+        &(stack_frame->unw_cursor), (void*)stack_frame->frame_base, NULL);
+    }
+
+    xbt_dynar_push(result, &new_var);
+  }
+
+  // Recursive processing of nested scopes:
+  dw_frame_t nested_scope = NULL;
+  xbt_dynar_foreach(scope->scopes, cursor, nested_scope) {
+    mc_fill_local_variables_values(stack_frame, nested_scope, result);
+  }
+}
+
 static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames){
 
   unsigned cursor1 = 0;
@@ -261,42 +304,10 @@ static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames){
   xbt_dynar_t variables = xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp);
 
   xbt_dynar_foreach(stack_frames,cursor1,stack_frame) {
-
-    unsigned cursor2 = 0;
-    dw_variable_t current_variable;
-    xbt_dynar_foreach(stack_frame->frame->variables, cursor2, current_variable){
-      
-      if(!mc_valid_variable(current_variable, stack_frame->frame, (void*) stack_frame->ip))
-        continue;
-
-      int region_type;
-      if((long)stack_frame->ip > (long)mc_libsimgrid_info->start_exec)
-        region_type = 1;
-      else
-        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->ip = stack_frame->ip;
-      new_var->name = xbt_strdup(current_variable->name);
-      new_var->type = current_variable->type;
-      new_var->region= region_type;
-      
-      /* if(current_variable->address!=NULL) {
-        new_var->address = current_variable->address;
-      } else */
-      if(current_variable->locations.size != 0){
-        new_var->address = (void*) mc_dwarf_resolve_locations(&current_variable->locations,
-          &(stack_frame->unw_cursor), (void*)stack_frame->frame_base, NULL);
-      }
-
-      xbt_dynar_push(variables, &new_var);
-
-    }
+    mc_fill_local_variables_values(stack_frame, stack_frame->frame, variables);
   }
 
   return variables;
-
 }
 
 static void MC_stack_frame_free_voipd(void *s){

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index b37ed50..efe1ef5 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -304,18 +304,30 @@ static void MC_post_process_variables(mc_object_info_t info) {
   }
 }
 
+static void mc_post_process_scope(mc_object_info_t info, dw_frame_t scope) {
+
+  // Direct:
+  unsigned cursor = 0;
+  dw_variable_t variable = NULL;
+  xbt_dynar_foreach(scope->variables, cursor, variable) {
+    if(variable->type_origin) {
+      variable->type = xbt_dict_get_or_null(info->types, variable->type_origin);
+    }
+  }
+
+  // Recursive post-processing of nested-scopes:
+  dw_frame_t nested_scope = NULL;
+  xbt_dynar_foreach(scope->scopes, cursor, nested_scope)
+    mc_post_process_scope(info, nested_scope);
+
+}
+
 static void MC_post_process_functions(mc_object_info_t info) {
   xbt_dict_cursor_t cursor;
   char* key;
-  dw_frame_t function = NULL;
-  xbt_dict_foreach(info->subprograms, cursor, key, function) {
-    unsigned cursor2 = 0;
-    dw_variable_t variable = NULL;
-    xbt_dynar_foreach(function->variables, cursor2, variable) {
-      if(variable->type_origin) {
-        variable->type = xbt_dict_get_or_null(info->types, variable->type_origin);
-      }
-    }
+  dw_frame_t subprogram = NULL;
+  xbt_dict_foreach(info->subprograms, cursor, key, subprogram) {
+    mc_post_process_scope(info, subprogram);
   }
 }
 
@@ -573,35 +585,42 @@ void MC_ignore_global_variable(const char *name){
     MC_UNSET_RAW_MEM;
 }
 
+static void mc_ignore_local_variable_in_scope(const char *var_name, dw_frame_t scope) {
+  // Processing of direct variables:
+  int start = 0;
+  int end = xbt_dynar_length(scope->variables) - 1;
+  while(start <= end){
+    int cursor = (start + end) / 2;
+    dw_variable_t current_var = (dw_variable_t)xbt_dynar_get_as(scope->variables, cursor, dw_variable_t);
+
+    int compare = strcmp(current_var->name, var_name);
+    if(compare == 0){
+      xbt_dynar_remove_at(scope->variables, cursor, NULL);
+      start = 0;
+      end = xbt_dynar_length(scope->variables) - 1;
+    }else if(compare < 0){
+      start = cursor + 1;
+    }else{
+      end = cursor - 1;
+    }
+  }
+
+  // And recursive processing in nested scopes:
+  unsigned cursor = 0;
+  dw_frame_t nested_scope = NULL;
+  xbt_dynar_foreach(scope->scopes, cursor, nested_scope) {
+    mc_ignore_local_variable_in_scope(var_name, nested_scope);
+  }
+}
+
 static void MC_ignore_local_variable_in_object(const char *var_name, const char *frame_name, mc_object_info_t info) {
   xbt_dict_cursor_t cursor2;
   dw_frame_t frame;
-  int start, end;
-  int cursor = 0;
-  dw_variable_t current_var;
   char* key;
   xbt_dict_foreach(info->subprograms, cursor2, key, frame) {
-
     if(frame_name && strcmp(frame_name, frame->name))
       continue;
-
-    start = 0;
-    end = xbt_dynar_length(frame->variables) - 1;
-    while(start <= end){
-      cursor = (start + end) / 2;
-      current_var = (dw_variable_t)xbt_dynar_get_as(frame->variables, cursor, dw_variable_t);
-
-      int compare = strcmp(current_var->name, var_name);
-      if(compare == 0){
-        xbt_dynar_remove_at(frame->variables, cursor, NULL);
-        start = 0;
-        end = xbt_dynar_length(frame->variables) - 1;
-      }else if(compare < 0){
-        start = cursor + 1;
-      }else{
-        end = cursor - 1;
-      }
-    }
+    mc_ignore_local_variable_in_scope(var_name, frame);
   }
 }
 

diff --git a/src/mc/mc_hash.c b/src/mc/mc_hash.c
index 5b824ae..dc2add0 100644 (file)
--- a/src/mc/mc_hash.c
+++ b/src/mc/mc_hash.c
@@ -251,6 +251,8 @@ static void mc_hash_stack_frame(
 
     mc_hash_value(hash, state, info, variable_address, type);
   }
+
+  // TODO, handle nested scopes
 }
 
 static void mc_hash_stack(mc_hash_t *hash, mc_snapshot_stack_t stack, mc_hashing_state* state) {