X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ba8e265192b67c6903d48faeabe9e1d626bcd3d..01a26a51594f70d9e244fc7a29fb555f8a713b56:/src/mc/mc_global.c

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index f5d183b3f9..17b7634454 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -138,6 +138,9 @@ xbt_automaton_t _mc_property_automaton = NULL;
 mc_object_info_t mc_libsimgrid_info = NULL;
 mc_object_info_t mc_binary_info = NULL;
 
+mc_object_info_t mc_object_infos[2] = { NULL, NULL };
+size_t mc_object_infos_size = 2;
+
 /* Ignore mechanism */
 extern xbt_dynar_t mc_heap_comparison_ignore;
 extern xbt_dynar_t stacks_areas;
@@ -152,6 +155,14 @@ const char* colors[13];
 
 /************************** Free functions *************************/
 
+void mc_frame_free(dw_frame_t frame){
+  xbt_free(frame->name);
+  mc_dwarf_location_list_clear(&(frame->frame_base));
+  xbt_dynar_free(&(frame->variables));
+  xbt_dynar_free(&(frame->scopes));
+  xbt_free(frame);
+}
+
 void dw_type_free(dw_type_t t){
   xbt_free(t->name);
   xbt_free(t->dw_type_id);
@@ -160,10 +171,6 @@ void dw_type_free(dw_type_t t){
   xbt_free(t);
 }
 
-static void dw_type_free_voidp(void *t){
-  dw_type_free((dw_type_t) * (void **) t);
-}
-
 void dw_variable_free(dw_variable_t v){
   if(v){
     xbt_free(v->name);
@@ -181,21 +188,23 @@ void dw_variable_free_voidp(void *t){
 
 // ***** object_info
 
+
+
 mc_object_info_t MC_new_object_info(void) {
   mc_object_info_t res = xbt_new0(s_mc_object_info_t, 1);
-  res->subprograms = xbt_dynar_new(sizeof(dw_frame_t), NULL);
+  res->subprograms = xbt_dict_new_homogeneous((void (*)(void*))mc_frame_free);
   res->global_variables = xbt_dynar_new(sizeof(dw_variable_t), dw_variable_free_voidp);
-  res->types = xbt_dict_new_homogeneous(NULL);
-  res->types_by_name = xbt_dict_new_homogeneous(NULL);
+  res->types = xbt_dict_new_homogeneous((void (*)(void*))dw_type_free);
+  res->full_types_by_name = xbt_dict_new_homogeneous(NULL);
   return res;
 }
 
 void MC_free_object_info(mc_object_info_t* info) {
   xbt_free(&(*info)->file_name);
-  xbt_dynar_free(&(*info)->subprograms);
+  xbt_dict_free(&(*info)->subprograms);
   xbt_dynar_free(&(*info)->global_variables);
   xbt_dict_free(&(*info)->types);
-  xbt_dict_free(&(*info)->types_by_name);
+  xbt_dict_free(&(*info)->full_types_by_name);
   xbt_free(info);
   xbt_dynar_free(&(*info)->functions_index);
   *info = NULL;
@@ -226,8 +235,9 @@ static void MC_make_functions_index(mc_object_info_t info) {
 
   // Populate the array:
   dw_frame_t frame = NULL;
-  unsigned cursor = 0;
-  xbt_dynar_foreach(info->subprograms, cursor, frame) {
+  xbt_dict_cursor_t cursor;
+  char* key;
+  xbt_dict_foreach(info->subprograms, cursor, key, frame) {
     if(frame->low_pc==NULL)
       continue;
     s_mc_function_index_item_t entry;
@@ -249,12 +259,10 @@ static void MC_make_functions_index(mc_object_info_t info) {
 }
 
 mc_object_info_t MC_ip_find_object_info(void* ip) {
-  mc_object_info_t infos[2] = { mc_binary_info, mc_libsimgrid_info };
-  size_t n = 2;
   size_t i;
-  for(i=0; i!=n; ++i) {
-    if(ip >= (void*)infos[i]->start_exec && ip <= (void*)infos[i]->end_exec) {
-      return infos[i];
+  for(i=0; i!=mc_object_infos_size; ++i) {
+    if(ip >= (void*)mc_object_infos[i]->start_exec && ip <= (void*)mc_object_infos[i]->end_exec) {
+      return mc_object_infos[i];
     }
   }
   return NULL;
@@ -269,7 +277,7 @@ static dw_frame_t MC_find_function_by_ip_and_object(void* ip, mc_object_info_t i
     int k = i + ((j-i)/2);
     if(ip < base[k].low_pc) {
       j = k-1;
-    } else if(ip > base[k].high_pc) {
+    } else if(ip >= base[k].high_pc) {
       i = k+1;
     } else {
       return base[k].function;
@@ -296,18 +304,42 @@ static void MC_post_process_variables(mc_object_info_t info) {
   }
 }
 
-static void MC_post_process_functions(mc_object_info_t info) {
+static void mc_post_process_scope(mc_object_info_t info, dw_frame_t scope) {
+
+  if(scope->tag == DW_TAG_inlined_subroutine) {
+
+    // Attach correct namespaced name in inlined subroutine:
+    char* key = bprintf("%" PRIx64, (uint64_t) scope->abstract_origin_id);
+    dw_frame_t abstract_origin = xbt_dict_get_or_null(info->subprograms, key);
+    xbt_assert(abstract_origin, "Could not lookup abstract origin %s", key);
+    xbt_free(key);
+    scope->name = xbt_strdup(abstract_origin->name);
+
+  }
+
+  // Direct:
   unsigned cursor = 0;
-  dw_frame_t function = NULL;
-  xbt_dynar_foreach(info->subprograms, cursor, 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_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 subprogram = NULL;
+  xbt_dict_foreach(info->subprograms, cursor, key, subprogram) {
+    mc_post_process_scope(info, subprogram);
+  }
 }
 
 /** \brief Finds informations about a given shared object/executable */
@@ -327,41 +359,6 @@ mc_object_info_t MC_find_object_info(memory_map_t maps, char* name, int executab
 
 /*************************************************************************/
 
-/** \brief Finds a frame (DW_TAG_subprogram) from an DWARF offset in the rangd of this subprogram
- *
- * The offset can be an offset of a child DW_TAG_variable.
- */
-static dw_frame_t MC_dwarf_get_frame_by_offset(xbt_dict_t all_variables, unsigned long int offset){
-
-  xbt_dict_cursor_t cursor = NULL;
-  char *name;
-  dw_frame_t res;
-
-  xbt_dict_foreach(all_variables, cursor, name, res) {
-    if(offset >= res->start && offset < res->end){
-      xbt_dict_cursor_free(&cursor);
-      return res;
-    }
-  }
-
-  xbt_dict_cursor_free(&cursor);
-  return NULL;
-  
-}
-
-static dw_variable_t MC_dwarf_get_variable_by_name(dw_frame_t frame, char *var){
-
-  unsigned int cursor = 0;
-  dw_variable_t current_var;
-
-  xbt_dynar_foreach(frame->variables, cursor, current_var){
-    if(strcmp(var, current_var->name) == 0)
-      return current_var;
-  }
-
-  return NULL;
-}
-
 static int MC_dwarf_get_variable_index(xbt_dynar_t variables, char* var, void *address){
 
   if(xbt_dynar_is_empty(variables))
@@ -599,35 +596,42 @@ void MC_ignore_global_variable(const char *name){
     MC_UNSET_RAW_MEM;
 }
 
-static void MC_ignore_local_variable_in_object(const char *var_name, const char *frame_name, mc_object_info_t info) {
-  unsigned cursor2;
-  dw_frame_t frame;
-  int start, end;
-  int cursor = 0;
-  dw_variable_t current_var;
+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;
+    }
+  }
 
-  xbt_dynar_foreach(info->subprograms, cursor2, frame) {
+  // 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;
+  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);
   }
 }
 
@@ -735,14 +739,22 @@ void MC_ignore(void *addr, size_t size){
 /*********************************************************************************/
 
 static void MC_post_process_object_info(mc_object_info_t info) {
-  mc_object_info_t other_info = info == mc_binary_info ? mc_libsimgrid_info : mc_binary_info;
   xbt_dict_cursor_t cursor = NULL;
   char* key = NULL;
   dw_type_t type = NULL;
   xbt_dict_foreach(info->types, cursor, key, type){
+
+    // Resolve full_type:
     if(type->name && type->byte_size == 0) {
-      type->other_object_same_type = xbt_dict_get_or_null(other_info->types_by_name, type->name);
+      for(size_t i=0; i!=mc_object_infos_size; ++i) {
+        dw_type_t same_type =  xbt_dict_get_or_null(mc_object_infos[i]->full_types_by_name, type->name);
+        if(same_type && same_type->name && same_type->byte_size) {
+          type->full_type = same_type;
+          break;
+        }
+      }
     }
+
   }
 }
 
@@ -753,7 +765,10 @@ static void MC_init_debug_info(void) {
 
   /* Get local variables for state equality detection */
   mc_binary_info = MC_find_object_info(maps, xbt_binary_name, 1);
+  mc_object_infos[0] = mc_binary_info;
+
   mc_libsimgrid_info = MC_find_object_info(maps, libsimgrid_path, 0);
+  mc_object_infos[1] = mc_libsimgrid_info;
 
   // Use information of the other objects:
   MC_post_process_object_info(mc_binary_info);