[mc] Make type_is an integer instead of a string and use std:: containers

[simgrid.git] / src / mc / mcer_ignore.cpp

diff --git a/src/mc/mcer_ignore.cpp b/src/mc/mcer_ignore.cpp
index bb509d1..bf75f7d 100644 (file)
--- a/src/mc/mcer_ignore.cpp
+++ b/src/mc/mcer_ignore.cpp
@@ -118,17 +118,16 @@ void MCer_ignore_global_variable(const char *name)
 
     // Binary search:
     int start = 0;
-    int end = xbt_dynar_length(info->global_variables) - 1;
+    int end = info->global_variables.size() - 1;
     while (start <= end) {
       unsigned int cursor = (start + end) / 2;
-      mc_variable_t current_var =
-          (mc_variable_t) xbt_dynar_get_as(info->global_variables,
-                                           cursor, mc_variable_t);
+      mc_variable_t current_var = &info->global_variables[cursor];
       int cmp = strcmp(current_var->name.c_str(), name);
       if (cmp == 0) {
-        xbt_dynar_remove_at(info->global_variables, cursor, NULL);
+        info->global_variables.erase(
+          info->global_variables.begin() + cursor);
         start = 0;
-        end = xbt_dynar_length(info->global_variables) - 1;
+        end = info->global_variables.size() - 1;
       } else if (cmp < 0) {
         start = cursor + 1;
       } else {
@@ -195,23 +194,21 @@ static void mc_ignore_local_variable_in_scope(const char *var_name,
 
     // Try to find the variable and remove it:
     int start = 0;
-    int end = xbt_dynar_length(scope->variables) - 1;
+    int end = scope->variables.size() - 1;
 
     // Dichotomic search:
     while (start <= end) {
       int cursor = (start + end) / 2;
-      mc_variable_t current_var =
-          (mc_variable_t) xbt_dynar_get_as(scope->variables, cursor,
-                                           mc_variable_t);
+      mc_variable_t current_var = &scope->variables[cursor];
 
       int compare = strcmp(current_var->name.c_str(), var_name);
       if (compare == 0) {
         // Variable found, remove it:
-        xbt_dynar_remove_at(scope->variables, cursor, NULL);
+        scope->variables.erase(scope->variables.begin() + cursor);
 
         // and start again:
         start = 0;
-        end = xbt_dynar_length(scope->variables) - 1;
+        end = scope->variables.size() - 1;
       } else if (compare < 0) {
         start = cursor + 1;
       } else {
@@ -221,17 +218,15 @@ static void mc_ignore_local_variable_in_scope(const char *var_name,
 
   }
   // And recursive processing in nested scopes:
-  unsigned cursor = 0;
-  mc_frame_t nested_scope = NULL;
-  xbt_dynar_foreach(scope->scopes, cursor, nested_scope) {
+  for (simgrid::mc::Frame& nested_scope : scope->scopes) {
     // The new scope may be an inlined subroutine, in this case we want to use its
     // namespaced name in recursive calls:
     mc_frame_t nested_subprogram =
-        nested_scope->tag ==
-        DW_TAG_inlined_subroutine ? nested_scope : subprogram;
+        nested_scope.tag ==
+        DW_TAG_inlined_subroutine ? &nested_scope : subprogram;
 
     mc_ignore_local_variable_in_scope(var_name, subprogram_name,
-                                      nested_subprogram, nested_scope);
+                                      nested_subprogram, &nested_scope);
   }
 }