X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d73456f299cf29a6880fe7b2a7d88ec2fb6123f4..6050383ef0dc59e1ca54d02bcf6bccb993593add:/src/mc/mc_visited.cpp

diff --git a/src/mc/mc_visited.cpp b/src/mc/mc_visited.cpp
index 8f07b4ca68..19a9e2ec4d 100644
--- a/src/mc/mc_visited.cpp
+++ b/src/mc/mc_visited.cpp
@@ -7,6 +7,8 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
+#include <memory>
+
 #include <xbt/automaton.h>
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
@@ -20,15 +22,16 @@
 #include "src/mc/Process.hpp"
 #include "src/mc/mc_smx.h"
 
-extern "C" {
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_visited, mc,
                                 "Logging specific to state equaity detection mechanisms");
 
+namespace simgrid {
+namespace mc {
+
 xbt_dynar_t visited_pairs;
-xbt_dynar_t visited_states;
+std::vector<std::unique_ptr<simgrid::mc::VisitedState>> visited_states;
 
-static int is_exploration_stack_state(mc_visited_state_t state){
+static int is_exploration_stack_state(simgrid::mc::VisitedState* state){
   xbt_fifo_item_t item = xbt_fifo_get_first_item(mc_stack);
   while (item) {
     if (((mc_state_t)xbt_fifo_get_item_content(item))->num == state->num){
@@ -40,77 +43,65 @@ static int is_exploration_stack_state(mc_visited_state_t state){
   return 0;
 }
 
-void visited_state_free(mc_visited_state_t state)
-{
-  if (state) {
-    if(!is_exploration_stack_state(state))
-      delete state->system_state;
-    xbt_free(state);
-  }
-}
-
-void visited_state_free_voidp(void *s)
-{
-  visited_state_free((mc_visited_state_t) * (void **) s);
-}
-
 /**
  * \brief Save the current state
  * \return Snapshot of the current state.
  */
-static mc_visited_state_t visited_state_new()
+VisitedState::VisitedState()
 {
   simgrid::mc::Process* process = &(mc_model_checker->process());
-  mc_visited_state_t new_state = xbt_new0(s_mc_visited_state_t, 1);
-  new_state->heap_bytes_used = mmalloc_get_bytes_used_remote(
+  this->heap_bytes_used = mmalloc_get_bytes_used_remote(
     process->get_heap()->heaplimit,
     process->get_malloc_info());
 
-  MC_process_smx_refresh(&mc_model_checker->process());
-  new_state->nb_processes =
-    mc_model_checker->process().smx_process_infos.size();
+  this->nb_processes =
+    mc_model_checker->process().simix_processes().size();
 
-  new_state->system_state = simgrid::mc::take_snapshot(mc_stats->expanded_states);
-  new_state->num = mc_stats->expanded_states;
-  new_state->other_num = -1;
-  return new_state;
+  this->system_state = simgrid::mc::take_snapshot(mc_stats->expanded_states);
+  this->num = mc_stats->expanded_states;
+  this->other_num = -1;
 }
 
-mc_visited_pair_t MC_visited_pair_new(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions, mc_state_t graph_state)
+VisitedState::~VisitedState()
+{
+  if(!is_exploration_stack_state(this))
+    delete this->system_state;
+}
+
+VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions, mc_state_t graph_state)
 {
   simgrid::mc::Process* process = &(mc_model_checker->process());
-  mc_visited_pair_t pair = nullptr;
-  pair = xbt_new0(s_mc_visited_pair_t, 1);
-  pair->graph_state = graph_state;
-  if(pair->graph_state->system_state == nullptr)
-    pair->graph_state->system_state = simgrid::mc::take_snapshot(pair_num);
-  pair->heap_bytes_used = mmalloc_get_bytes_used_remote(
+
+  this->graph_state = graph_state;
+  if(this->graph_state->system_state == nullptr)
+    this->graph_state->system_state = simgrid::mc::take_snapshot(pair_num);
+  this->heap_bytes_used = mmalloc_get_bytes_used_remote(
     process->get_heap()->heaplimit,
     process->get_malloc_info());
 
-  MC_process_smx_refresh(&mc_model_checker->process());
-  pair->nb_processes =
-    mc_model_checker->process().smx_process_infos.size();
-
-  pair->automaton_state = automaton_state;
-  pair->num = pair_num;
-  pair->other_num = -1;
-  pair->acceptance_removed = 0;
-  pair->visited_removed = 0;
-  pair->acceptance_pair = 0;
-  pair->atomic_propositions = xbt_dynar_new(sizeof(int), nullptr);
+  this->nb_processes =
+    mc_model_checker->process().simix_processes().size();
+
+  this->automaton_state = automaton_state;
+  this->num = pair_num;
+  this->other_num = -1;
+  this->acceptance_removed = 0;
+  this->visited_removed = 0;
+  this->acceptance_pair = 0;
+  this->atomic_propositions = simgrid::xbt::unique_ptr<s_xbt_dynar_t>(
+    xbt_dynar_new(sizeof(int), nullptr));
+
   unsigned int cursor = 0;
   int value;
   xbt_dynar_foreach(atomic_propositions, cursor, value)
-      xbt_dynar_push_as(pair->atomic_propositions, int, value);
-  return pair;
+      xbt_dynar_push_as(this->atomic_propositions.get(), int, value);
 }
 
-static int is_exploration_stack_pair(mc_visited_pair_t pair){
+static int is_exploration_stack_pair(simgrid::mc::VisitedPair* pair){
   xbt_fifo_item_t item = xbt_fifo_get_first_item(mc_stack);
   while (item) {
-    if (((mc_pair_t)xbt_fifo_get_item_content(item))->num == pair->num){
-      ((mc_pair_t)xbt_fifo_get_item_content(item))->visited_pair_removed = 1;
+    if (((simgrid::mc::Pair*)xbt_fifo_get_item_content(item))->num == pair->num){
+      ((simgrid::mc::Pair*)xbt_fifo_get_item_content(item))->visited_pair_removed = 1;
       return 1;
     }
     item = xbt_fifo_get_next_item(item);
@@ -118,14 +109,13 @@ static int is_exploration_stack_pair(mc_visited_pair_t pair){
   return 0;
 }
 
-void MC_visited_pair_delete(mc_visited_pair_t p)
+VisitedPair::~VisitedPair()
 {
-  p->automaton_state = nullptr;
-  if( !is_exploration_stack_pair(p))
-    MC_state_delete(p->graph_state, 1);
-  xbt_dynar_free(&(p->atomic_propositions));
-  xbt_free(p);
-  p = nullptr;
+  if( !is_exploration_stack_pair(this))
+    MC_state_delete(this->graph_state, 1);
+}
+
+}
 }
 
 /**
@@ -151,11 +141,11 @@ int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max)
   void *ref_test;
 
   if (_sg_mc_liveness) {
-    nb_processes = ((mc_visited_pair_t) ref)->nb_processes;
-    heap_bytes_used = ((mc_visited_pair_t) ref)->heap_bytes_used;
+    nb_processes = ((simgrid::mc::VisitedPair*) ref)->nb_processes;
+    heap_bytes_used = ((simgrid::mc::VisitedPair*) ref)->heap_bytes_used;
   } else {
-    nb_processes = ((mc_visited_state_t) ref)->nb_processes;
-    heap_bytes_used = ((mc_visited_state_t) ref)->heap_bytes_used;
+    nb_processes = ((simgrid::mc::VisitedState*) ref)->nb_processes;
+    heap_bytes_used = ((simgrid::mc::VisitedState*) ref)->heap_bytes_used;
   }
 
   int start = 0;
@@ -164,35 +154,34 @@ int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max)
   while (start <= end) {
     cursor = (start + end) / 2;
     if (_sg_mc_liveness) {
-      ref_test = (mc_visited_pair_t) xbt_dynar_get_as(list, cursor, mc_visited_pair_t);
-      nb_processes_test = ((mc_visited_pair_t) ref_test)->nb_processes;
-      heap_bytes_used_test = ((mc_visited_pair_t) ref_test)->heap_bytes_used;
+      ref_test = (simgrid::mc::VisitedPair*) xbt_dynar_get_as(list, cursor, simgrid::mc::VisitedPair*);
+      nb_processes_test = ((simgrid::mc::VisitedPair*) ref_test)->nb_processes;
+      heap_bytes_used_test = ((simgrid::mc::VisitedPair*) ref_test)->heap_bytes_used;
     } else {
-      ref_test = (mc_visited_state_t) xbt_dynar_get_as(list, cursor, mc_visited_state_t);
-      nb_processes_test = ((mc_visited_state_t) ref_test)->nb_processes;
-      heap_bytes_used_test = ((mc_visited_state_t) ref_test)->heap_bytes_used;
+      ref_test = (simgrid::mc::VisitedState*) xbt_dynar_get_as(list, cursor, simgrid::mc::VisitedState*);
+      nb_processes_test = ((simgrid::mc::VisitedState*) ref_test)->nb_processes;
+      heap_bytes_used_test = ((simgrid::mc::VisitedState*) ref_test)->heap_bytes_used;
     }
-    if (nb_processes_test < nb_processes) {
+    if (nb_processes_test < nb_processes)
       start = cursor + 1;
-    } else if (nb_processes_test > nb_processes) {
+    else if (nb_processes_test > nb_processes)
       end = cursor - 1;
-    } else {
-      if (heap_bytes_used_test < heap_bytes_used) {
-        start = cursor + 1;
-      } else if (heap_bytes_used_test > heap_bytes_used) {
-        end = cursor - 1;
-      } else {
+    else if (heap_bytes_used_test < heap_bytes_used)
+      start = cursor + 1;
+    else if (heap_bytes_used_test > heap_bytes_used)
+      end = cursor - 1;
+    else {
         *min = *max = cursor;
         previous_cursor = cursor - 1;
         while (previous_cursor >= 0) {
           if (_sg_mc_liveness) {
-            ref_test = (mc_visited_pair_t) xbt_dynar_get_as(list, previous_cursor, mc_visited_pair_t);
-            nb_processes_test = ((mc_visited_pair_t) ref_test)->nb_processes;
-            heap_bytes_used_test = ((mc_visited_pair_t) ref_test)->heap_bytes_used;
+            ref_test = (simgrid::mc::VisitedPair*) xbt_dynar_get_as(list, previous_cursor, simgrid::mc::VisitedPair*);
+            nb_processes_test = ((simgrid::mc::VisitedPair*) ref_test)->nb_processes;
+            heap_bytes_used_test = ((simgrid::mc::VisitedPair*) ref_test)->heap_bytes_used;
           } else {
-            ref_test = (mc_visited_state_t) xbt_dynar_get_as(list, previous_cursor, mc_visited_state_t);
-            nb_processes_test = ((mc_visited_state_t) ref_test)->nb_processes;
-            heap_bytes_used_test = ((mc_visited_state_t) ref_test)->heap_bytes_used;
+            ref_test = (simgrid::mc::VisitedState*) xbt_dynar_get_as(list, previous_cursor, simgrid::mc::VisitedState*);
+            nb_processes_test = ((simgrid::mc::VisitedState*) ref_test)->nb_processes;
+            heap_bytes_used_test = ((simgrid::mc::VisitedState*) ref_test)->heap_bytes_used;
           }
           if (nb_processes_test != nb_processes || heap_bytes_used_test != heap_bytes_used)
             break;
@@ -202,13 +191,13 @@ int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max)
         size_t next_cursor = cursor + 1;
         while (next_cursor < xbt_dynar_length(list)) {
           if (_sg_mc_liveness) {
-            ref_test = (mc_visited_pair_t) xbt_dynar_get_as(list, next_cursor, mc_visited_pair_t);
-            nb_processes_test = ((mc_visited_pair_t) ref_test)->nb_processes;
-            heap_bytes_used_test = ((mc_visited_pair_t) ref_test)->heap_bytes_used;
+            ref_test = (simgrid::mc::VisitedPair*) xbt_dynar_get_as(list, next_cursor, simgrid::mc::VisitedPair*);
+            nb_processes_test = ((simgrid::mc::VisitedPair*) ref_test)->nb_processes;
+            heap_bytes_used_test = ((simgrid::mc::VisitedPair*) ref_test)->heap_bytes_used;
           } else {
-            ref_test = (mc_visited_state_t) xbt_dynar_get_as(list, next_cursor, mc_visited_state_t);
-            nb_processes_test = ((mc_visited_state_t) ref_test)->nb_processes;
-            heap_bytes_used_test = ((mc_visited_state_t) ref_test)->heap_bytes_used;
+            ref_test = (simgrid::mc::VisitedState*) xbt_dynar_get_as(list, next_cursor, simgrid::mc::VisitedState*);
+            nb_processes_test = ((simgrid::mc::VisitedState*) ref_test)->nb_processes;
+            heap_bytes_used_test = ((simgrid::mc::VisitedState*) ref_test)->heap_bytes_used;
           }
           if (nb_processes_test != nb_processes || heap_bytes_used_test != heap_bytes_used)
             break;
@@ -216,40 +205,62 @@ int get_search_interval(xbt_dynar_t list, void *ref, int *min, int *max)
           next_cursor++;
         }
         return -1;
-      }
     }
   }
   return cursor;
 }
 
-static
-void replace_state(
-  mc_visited_state_t state_test, mc_visited_state_t new_state, int cursor)
+// TODO, it would make sense to use std::set instead
+template<class T>
+int get_search_interval(std::vector<std::unique_ptr<T>> const& list, T *ref, int *min, int *max)
 {
-  if (state_test->other_num == -1)
-    new_state->other_num = state_test->num;
-  else
-    new_state->other_num = state_test->other_num;
+  int nb_processes = ref->nb_processes;
+  int heap_bytes_used = ref->heap_bytes_used;
 
-  if (dot_output == nullptr)
-    XBT_DEBUG("State %d already visited ! (equal to state %d)",
-      new_state->num, state_test->num);
-  else
-    XBT_DEBUG(
-      "State %d already visited ! (equal to state %d (state %d in dot_output))",
-      new_state->num, state_test->num, new_state->other_num);
-
-  /* Replace the old state with the new one (with a bigger num)
-     (when the max number of visited states is reached,  the oldest
-     one is removed according to its number (= with the min number) */
-  xbt_dynar_remove_at(visited_states, cursor, nullptr);
-  xbt_dynar_insert_at(visited_states, cursor, &new_state);
-  XBT_DEBUG("Replace visited state %d with the new visited state %d",
-    state_test->num, new_state->num);
+  int cursor = 0;
+  int start = 0;
+  int end = list.size() - 1;
+  while (start <= end) {
+    cursor = (start + end) / 2;
+    int nb_processes_test = list[cursor]->nb_processes;
+    int heap_bytes_used_test = list[cursor]->heap_bytes_used;
+
+    if (nb_processes_test < nb_processes)
+      start = cursor + 1;
+    else if (nb_processes_test > nb_processes)
+      end = cursor - 1;
+    else if (heap_bytes_used_test < heap_bytes_used)
+      start = cursor + 1;
+    else if (heap_bytes_used_test > heap_bytes_used)
+      end = cursor - 1;
+    else {
+        *min = *max = cursor;
+        int previous_cursor = cursor - 1;
+        while (previous_cursor >= 0) {
+          nb_processes_test = list[previous_cursor]->nb_processes;
+          heap_bytes_used_test = list[previous_cursor]->heap_bytes_used;
+          if (nb_processes_test != nb_processes || heap_bytes_used_test != heap_bytes_used)
+            break;
+          *min = previous_cursor;
+          previous_cursor--;
+        }
+        size_t next_cursor = cursor + 1;
+        while (next_cursor < list.size()) {
+          nb_processes_test = list[next_cursor]->nb_processes;
+          heap_bytes_used_test = list[next_cursor]->heap_bytes_used;
+          if (nb_processes_test != nb_processes || heap_bytes_used_test != heap_bytes_used)
+            break;
+          *max = next_cursor;
+          next_cursor++;
+        }
+        return -1;
+    }
+  }
+  return cursor;
 }
 
 static
-bool some_dommunications_are_not_finished()
+bool some_communications_are_not_finished()
 {
   for (size_t current_process = 1; current_process < MC_smx_get_maxpid(); current_process++) {
     xbt_dynar_t pattern = xbt_dynar_get_as(
@@ -262,13 +273,14 @@ bool some_dommunications_are_not_finished()
   return false;
 }
 
+namespace simgrid {
+namespace mc {
+
 /**
  * \brief Checks whether a given state has already been visited by the algorithm.
  */
-
-mc_visited_state_t is_visited_state(mc_state_t graph_state)
+std::unique_ptr<simgrid::mc::VisitedState> is_visited_state(mc_state_t graph_state)
 {
-
   if (_sg_mc_visited == 0)
     return nullptr;
 
@@ -276,167 +288,145 @@ mc_visited_state_t is_visited_state(mc_state_t graph_state)
      communications are not finished (at least, data are transfered). These communications 
      are incomplete and they cannot be analyzed and compared with the initial pattern. */
   int partial_comm = (_sg_mc_comms_determinism || _sg_mc_send_determinism) &&
-    some_dommunications_are_not_finished();
+    some_communications_are_not_finished();
 
-  mc_visited_state_t new_state = visited_state_new();
+  std::unique_ptr<simgrid::mc::VisitedState> new_state =
+    std::unique_ptr<simgrid::mc::VisitedState>(new VisitedState());
   graph_state->system_state = new_state->system_state;
   graph_state->in_visited_states = 1;
   XBT_DEBUG("Snapshot %p of visited state %d (exploration stack state %d)", new_state->system_state, new_state->num, graph_state->num);
 
-  if (xbt_dynar_is_empty(visited_states)) {
-
-    xbt_dynar_push(visited_states, &new_state);
+  if (visited_states.empty()) {
+    visited_states.push_back(std::move(new_state));
     return nullptr;
-
-  } else {
+  }
 
     int min = -1, max = -1, index;
 
-    index = get_search_interval(visited_states, new_state, &min, &max);
+    index = get_search_interval(visited_states, new_state.get(), &min, &max);
 
     if (min != -1 && max != -1) {
 
-      // Parallell implementation
-      /*res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(visited_states, min), (max-min)+1, new_state);
-         if(res != -1){
-         mc_visited_state_t state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, (min+res)-1, mc_visited_state_t);
-         if(state_test->other_num == -1)
-         new_state->other_num = state_test->num;
-         else
-         new_state->other_num = state_test->other_num;
-         if(dot_output == nullptr)
-         XBT_DEBUG("State %d already visited ! (equal to state %d)", new_state->num, state_test->num);
-         else
-         XBT_DEBUG("State %d already visited ! (equal to state %d (state %d in dot_output))", new_state->num, state_test->num, new_state->other_num);
-         xbt_dynar_remove_at(visited_states, (min + res) - 1, nullptr);
-         xbt_dynar_insert_at(visited_states, (min+res) - 1, &new_state);
-         return new_state->other_num;
-         } */
-
       if (_sg_mc_safety || (!partial_comm
         && initial_global_state->initial_communications_pattern_done)) {
 
         int cursor = min;
         while (cursor <= max) {
-          mc_visited_state_t state_test = (mc_visited_state_t) xbt_dynar_get_as(visited_states, cursor, mc_visited_state_t);
-          if (snapshot_compare(state_test, new_state) == 0) {
+          if (snapshot_compare(visited_states[cursor].get(), new_state.get()) == 0) {
             // The state has been visited:
 
-            replace_state(state_test, new_state, cursor);
-            return state_test;
+            std::unique_ptr<simgrid::mc::VisitedState> old_state =
+              std::move(visited_states[cursor]);
+
+            if (old_state->other_num == -1)
+              new_state->other_num = old_state->num;
+            else
+              new_state->other_num = old_state->other_num;
+
+            if (dot_output == nullptr)
+              XBT_DEBUG("State %d already visited ! (equal to state %d)",
+                new_state->num, old_state->num);
+            else
+              XBT_DEBUG(
+                "State %d already visited ! (equal to state %d (state %d in dot_output))",
+                new_state->num, old_state->num, new_state->other_num);
+
+            /* Replace the old state with the new one (with a bigger num)
+               (when the max number of visited states is reached,  the oldest
+               one is removed according to its number (= with the min number) */
+            XBT_DEBUG("Replace visited state %d with the new visited state %d",
+              old_state->num, new_state->num);
+
+            simgrid::mc::visited_states[cursor] = std::move(new_state);
+            return std::move(old_state);
           }
           cursor++;
         }
       }
       
-      xbt_dynar_insert_at(visited_states, min, &new_state);
-      XBT_DEBUG("Insert new visited state %d (total : %lu)", new_state->num, xbt_dynar_length(visited_states));
-      
+      XBT_DEBUG("Insert new visited state %d (total : %lu)", new_state->num, (unsigned long) visited_states.size());
+      visited_states.insert(visited_states.begin() + min, std::move(new_state));
+
     } else {
 
       // The state has not been visited: insert the state in the dynamic array.
-      mc_visited_state_t state_test = (mc_visited_state_t) xbt_dynar_get_as(visited_states, index, mc_visited_state_t);
-      if (state_test->nb_processes < new_state->nb_processes) {
-        xbt_dynar_insert_at(visited_states, index + 1, &new_state);
-      } else {
-        if (state_test->heap_bytes_used < new_state->heap_bytes_used)
-          xbt_dynar_insert_at(visited_states, index + 1, &new_state);
-        else
-          xbt_dynar_insert_at(visited_states, index, &new_state);
-      }
-
-       XBT_DEBUG("Insert new visited state %d (total : %lu)", new_state->num, xbt_dynar_length(visited_states));
+      simgrid::mc::VisitedState* state_test = &*visited_states[index];
+      std::size_t position;
+      if (state_test->nb_processes < new_state->nb_processes)
+        position = index + 1;
+      else if (state_test->heap_bytes_used < new_state->heap_bytes_used)
+        position = index + 1;
+      else
+        position = index;
+      visited_states.insert(visited_states.begin() + position, std::move(new_state));
+      XBT_DEBUG("Insert new visited state %d (total : %lu)",
+        visited_states[index]->num,
+        (unsigned long) visited_states.size());
 
     }
 
-    // We have reached the maximum number of stored states;
-    if ((ssize_t) xbt_dynar_length(visited_states) > _sg_mc_visited) {
+  if (visited_states.size() <= (std::size_t) _sg_mc_visited)
+    return nullptr;
+
+  // We have reached the maximum number of stored states;
 
       XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)");
 
       // Find the (index of the) older state (with the smallest num):
       int min2 = mc_stats->expanded_states;
-      unsigned int cursor2 = 0;
       unsigned int index2 = 0;
 
-      mc_visited_state_t state_test;
-      xbt_dynar_foreach(visited_states, cursor2, state_test){
-        if (!mc_model_checker->is_important_snapshot(*state_test->system_state)
-            && state_test->num < min2) {
+      for (std::size_t cursor2 = 0; cursor2 != visited_states.size(); ++cursor2)
+        if (!mc_model_checker->is_important_snapshot(
+              *visited_states[cursor2]->system_state)
+            && visited_states[cursor2]->num < min2) {
           index2 = cursor2;
-          min2 = state_test->num;
+          min2 = visited_states[cursor2]->num;
         }
-      }
 
       // and drop it:
-      xbt_dynar_remove_at(visited_states, index2, nullptr);
+      visited_states.erase(visited_states.begin() + index2);
       XBT_DEBUG("Remove visited state (maximum number of stored states reached)");
-    }
 
     return nullptr;
-  }
 }
 
 /**
  * \brief Checks whether a given pair has already been visited by the algorithm.
  */
-int is_visited_pair(mc_visited_pair_t visited_pair, mc_pair_t pair) {
+int is_visited_pair(simgrid::mc::VisitedPair* visited_pair, simgrid::mc::Pair* pair) {
 
   if (_sg_mc_visited == 0)
     return -1;
 
-  mc_visited_pair_t new_visited_pair = nullptr;
-
-  if (visited_pair == nullptr) {
-    new_visited_pair = MC_visited_pair_new(pair->num, pair->automaton_state, pair->atomic_propositions, pair->graph_state);
-  } else {
+  simgrid::mc::VisitedPair* new_visited_pair = nullptr;
+  if (visited_pair == nullptr)
+    new_visited_pair = new simgrid::mc::VisitedPair(
+      pair->num, pair->automaton_state, pair->atomic_propositions.get(),
+      pair->graph_state);
+  else
     new_visited_pair = visited_pair;
-  }
 
   if (xbt_dynar_is_empty(visited_pairs)) {
-
     xbt_dynar_push(visited_pairs, &new_visited_pair);
-
-  } else {
+    return -1;
+  }
 
     int min = -1, max = -1, index;
     //int res;
-    mc_visited_pair_t pair_test;
+    simgrid::mc::VisitedPair* pair_test;
     int cursor;
 
     index = get_search_interval(visited_pairs, new_visited_pair, &min, &max);
 
     if (min != -1 && max != -1) {       // Visited pair with same number of processes and same heap bytes used exists
-      /*res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(visited_pairs, min), (max-min)+1, pair);
-         if(res != -1){
-         pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, (min+res)-1, mc_pair_t);
-         if(pair_test->other_num == -1)
-         pair->other_num = pair_test->num;
-         else
-         pair->other_num = pair_test->other_num;
-         if(dot_output == nullptr)
-         XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", pair->num, pair_test->num);
-         else
-         XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", pair->num, pair_test->num, pair->other_num);
-         xbt_dynar_remove_at(visited_pairs, (min + res) - 1, nullptr);
-         xbt_dynar_insert_at(visited_pairs, (min+res) - 1, &pair);
-         pair_test->visited_removed = 1;
-         if(pair_test->stack_removed && pair_test->visited_removed){
-         if((pair_test->automaton_state->type == 1) || (pair_test->automaton_state->type == 2)){
-         if(pair_test->acceptance_removed){
-         MC_pair_delete(pair_test);
-         }
-         }else{
-         MC_pair_delete(pair_test);
-         }
-         }
-         return pair->other_num;
-         } */
       cursor = min;
       while (cursor <= max) {
-        pair_test = (mc_visited_pair_t) xbt_dynar_get_as(visited_pairs, cursor, mc_visited_pair_t);
+        pair_test = (simgrid::mc::VisitedPair*) xbt_dynar_get_as(visited_pairs, cursor, simgrid::mc::VisitedPair*);
         if (xbt_automaton_state_compare(pair_test->automaton_state, new_visited_pair->automaton_state) == 0) {
-          if (xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, new_visited_pair->atomic_propositions) == 0) {
+          if (xbt_automaton_propositional_symbols_compare_value(
+              pair_test->atomic_propositions.get(),
+              new_visited_pair->atomic_propositions.get()) == 0) {
             if (snapshot_compare(pair_test, new_visited_pair) == 0) {
               if (pair_test->other_num == -1)
                 new_visited_pair->other_num = pair_test->num;
@@ -449,12 +439,9 @@ int is_visited_pair(mc_visited_pair_t visited_pair, mc_pair_t pair) {
               xbt_dynar_remove_at(visited_pairs, cursor, &pair_test);
               xbt_dynar_insert_at(visited_pairs, cursor, &new_visited_pair);
               pair_test->visited_removed = 1;
-              if (pair_test->acceptance_pair) {
-                if (pair_test->acceptance_removed == 1)
-                  MC_visited_pair_delete(pair_test);
-              } else {
-                MC_visited_pair_delete(pair_test);
-              }
+              if (!pair_test->acceptance_pair
+                  || pair_test->acceptance_removed == 1)
+                delete pair_test;
               return new_visited_pair->other_num;
             }
           }
@@ -463,15 +450,13 @@ int is_visited_pair(mc_visited_pair_t visited_pair, mc_pair_t pair) {
       }
       xbt_dynar_insert_at(visited_pairs, min, &new_visited_pair);
     } else {
-      pair_test = (mc_visited_pair_t) xbt_dynar_get_as(visited_pairs, index, mc_visited_pair_t);
-      if (pair_test->nb_processes < new_visited_pair->nb_processes) {
+      pair_test = (simgrid::mc::VisitedPair*) xbt_dynar_get_as(visited_pairs, index, simgrid::mc::VisitedPair*);
+      if (pair_test->nb_processes < new_visited_pair->nb_processes)
         xbt_dynar_insert_at(visited_pairs, index + 1, &new_visited_pair);
-      } else {
-        if (pair_test->heap_bytes_used < new_visited_pair->heap_bytes_used)
-          xbt_dynar_insert_at(visited_pairs, index + 1, &new_visited_pair);
-        else
-          xbt_dynar_insert_at(visited_pairs, index, &new_visited_pair);
-      }
+      else if (pair_test->heap_bytes_used < new_visited_pair->heap_bytes_used)
+        xbt_dynar_insert_at(visited_pairs, index + 1, &new_visited_pair);
+      else
+        xbt_dynar_insert_at(visited_pairs, index, &new_visited_pair);
     }
 
     if ((ssize_t) xbt_dynar_length(visited_pairs) > _sg_mc_visited) {
@@ -487,16 +472,11 @@ int is_visited_pair(mc_visited_pair_t visited_pair, mc_pair_t pair) {
       }
       xbt_dynar_remove_at(visited_pairs, index2, &pair_test);
       pair_test->visited_removed = 1;
-      if (pair_test->acceptance_pair) {
-        if (pair_test->acceptance_removed)
-          MC_visited_pair_delete(pair_test);
-      } else {
-        MC_visited_pair_delete(pair_test);
-      }
+      if (!pair_test->acceptance_pair || pair_test->acceptance_removed)
+        delete pair_test;
     }
-
-  }
   return -1;
 }
 
 }
+}
\ No newline at end of file