[mc] Efficient lookup of subprogram by offset

[simgrid.git] / src / mc / mc_global.c

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index f5d183b..6f36ffe 100644 (file)
--- 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,13 @@ 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_free(frame);
+}
+
 void dw_type_free(dw_type_t t){
   xbt_free(t->name);
   xbt_free(t->dw_type_id);
@@ -181,21 +191,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->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 +238,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 +262,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;
@@ -297,9 +308,10 @@ static void MC_post_process_variables(mc_object_info_t info) {
 }
 
 static void MC_post_process_functions(mc_object_info_t info) {
-  unsigned cursor = 0;
+  xbt_dict_cursor_t cursor;
+  char* key;
   dw_frame_t function = NULL;
-  xbt_dynar_foreach(info->subprograms, cursor, function) {
+  xbt_dict_foreach(info->subprograms, cursor, key, function) {
     unsigned cursor2 = 0;
     dw_variable_t variable = NULL;
     xbt_dynar_foreach(function->variables, cursor2, variable) {
@@ -600,13 +612,13 @@ void MC_ignore_global_variable(const char *name){
 }
 
 static void MC_ignore_local_variable_in_object(const char *var_name, const char *frame_name, mc_object_info_t info) {
-  unsigned cursor2;
+  xbt_dict_cursor_t cursor2;
   dw_frame_t frame;
   int start, end;
   int cursor = 0;
   dw_variable_t current_var;
-
-  xbt_dynar_foreach(info->subprograms, cursor2, frame) {
+  char* key;
+  xbt_dict_foreach(info->subprograms, cursor2, key, frame) {
 
     if(frame_name && strcmp(frame_name, frame->name))
       continue;
@@ -735,14 +747,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 +773,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);