[mc] Remove the --cfg=model-check:1 flag

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

diff --git a/src/mc/mcer_ignore.cpp b/src/mc/mcer_ignore.cpp
index bf75f7d..f1fc2a1 100644 (file)
--- a/src/mc/mcer_ignore.cpp
+++ b/src/mc/mcer_ignore.cpp
@@ -13,6 +13,10 @@
 #include "mc/mc_protocol.h"
 #include "mc/mc_client.h"
 
+#include "mc/Frame.hpp"
+#include "mc/Variable.hpp"
+#include "mc/ObjectInformation.hpp"
+
 extern "C" {
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mcer_ignore, mc,
@@ -111,17 +115,17 @@ void MC_heap_region_ignore_remove(void *address, size_t size)
 
 void MCer_ignore_global_variable(const char *name)
 {
-  mc_process_t process = &mc_model_checker->process();
+  simgrid::mc::Process* process = &mc_model_checker->process();
   xbt_assert(!process->object_infos.empty(), "MC subsystem not initialized");
 
-  for (std::shared_ptr<s_mc_object_info_t> const& info : process->object_infos) {
+  for (std::shared_ptr<simgrid::mc::ObjectInformation> const& info : process->object_infos) {
 
     // Binary search:
     int start = 0;
     int end = info->global_variables.size() - 1;
     while (start <= end) {
       unsigned int cursor = (start + end) / 2;
-      mc_variable_t current_var = &info->global_variables[cursor];
+      simgrid::mc::Variable* current_var = &info->global_variables[cursor];
       int cmp = strcmp(current_var->name.c_str(), name);
       if (cmp == 0) {
         info->global_variables.erase(
@@ -141,32 +145,29 @@ void MCer_ignore_global_variable(const char *name)
 
 static void mc_ignore_local_variable_in_scope(const char *var_name,
                                               const char *subprogram_name,
-                                              mc_frame_t subprogram,
-                                              mc_frame_t scope);
+                                              simgrid::mc::Frame* subprogram,
+                                              simgrid::mc::Frame* scope);
 static void MC_ignore_local_variable_in_object(const char *var_name,
                                                const char *subprogram_name,
-                                               mc_object_info_t info);
+                                               simgrid::mc::ObjectInformation* info);
 
 void MC_ignore_local_variable(const char *var_name, const char *frame_name)
 {
-  mc_process_t process = &mc_model_checker->process();
+  simgrid::mc::Process* process = &mc_model_checker->process();
   if (strcmp(frame_name, "*") == 0)
     frame_name = NULL;
 
-  for (std::shared_ptr<s_mc_object_info_t> const& info : process->object_infos)
+  for (std::shared_ptr<simgrid::mc::ObjectInformation> const& info : process->object_infos)
     MC_ignore_local_variable_in_object(var_name, frame_name, info.get());
 }
 
 static void MC_ignore_local_variable_in_object(const char *var_name,
                                                const char *subprogram_name,
-                                               mc_object_info_t info)
+                                               simgrid::mc::ObjectInformation* info)
 {
-  xbt_dict_cursor_t cursor2;
-  mc_frame_t frame;
-  char *key;
-  xbt_dict_foreach(info->subprograms, cursor2, key, frame) {
-    mc_ignore_local_variable_in_scope(var_name, subprogram_name, frame, frame);
-  }
+  for (auto& entry : info->subprograms)
+    mc_ignore_local_variable_in_scope(
+      var_name, subprogram_name, &entry.second, &entry.second);
 }
 
 /** \brief Ignore a local variable in a scope
@@ -182,8 +183,8 @@ static void MC_ignore_local_variable_in_object(const char *var_name,
  */
 static void mc_ignore_local_variable_in_scope(const char *var_name,
                                               const char *subprogram_name,
-                                              mc_frame_t subprogram,
-                                              mc_frame_t scope)
+                                              simgrid::mc::Frame* subprogram,
+                                              simgrid::mc::Frame* scope)
 {
   // Processing of direct variables:
 
@@ -199,7 +200,7 @@ static void mc_ignore_local_variable_in_scope(const char *var_name,
     // Dichotomic search:
     while (start <= end) {
       int cursor = (start + end) / 2;
-      mc_variable_t current_var = &scope->variables[cursor];
+      simgrid::mc::Variable* current_var = &scope->variables[cursor];
 
       int compare = strcmp(current_var->name.c_str(), var_name);
       if (compare == 0) {
@@ -221,7 +222,7 @@ static void mc_ignore_local_variable_in_scope(const char *var_name,
   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 =
+    simgrid::mc::Frame* nested_subprogram =
         nested_scope.tag ==
         DW_TAG_inlined_subroutine ? &nested_scope : subprogram;