[mc] Remove commented out code (parallel code)

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

diff --git a/src/mc/mc_liveness.cpp b/src/mc/mc_liveness.cpp
index 7eef307..380c4c8 100644 (file)
--- a/src/mc/mc_liveness.cpp
+++ b/src/mc/mc_liveness.cpp
@@ -4,27 +4,35 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 

+#include <cstring>
+

 #include <unistd.h>
 #include <sys/wait.h>
 
 #include <unistd.h>
 #include <sys/wait.h>
 

-#include <xbt/dynar.h>

 #include <xbt/automaton.h>
 #include <xbt/automaton.h>

-
-#include "mc_request.h"
-#include "mc_liveness.h"
-#include "mc_private.h"
-#include "mc_record.h"
-#include "mc_smx.h"
-#include "mc_client.h"
-#include "mc_replay.h"
-#include "mc_safety.h"
-#include "mc_exit.h"
+#include <xbt/dynar.h>
+#include <xbt/fifo.h>
+#include <xbt/log.h>
+#include <xbt/parmap.h>
+#include <xbt/sysdep.h>
+
+#include "src/mc/mc_request.h"
+#include "src/mc/mc_liveness.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_client.h"
+#include "src/mc/mc_replay.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_exit.h"

 
 extern "C" {
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
                                 "Logging specific to algorithms for liveness properties verification");
 
 
 extern "C" {
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
                                 "Logging specific to algorithms for liveness properties verification");
 

+}
+

 /********* Global variables *********/
 
 xbt_dynar_t acceptance_pairs;
 /********* Global variables *********/
 
 xbt_dynar_t acceptance_pairs;


@@ -35,9 +43,9 @@ xbt_parmap_t parmap;
 static xbt_dynar_t get_atomic_propositions_values()
 {
   unsigned int cursor = 0;
 static xbt_dynar_t get_atomic_propositions_values()
 {
   unsigned int cursor = 0;

-  xbt_automaton_propositional_symbol_t ps = NULL;
-  xbt_dynar_t values = xbt_dynar_new(sizeof(int), NULL);
-  xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps) {
+  xbt_automaton_propositional_symbol_t ps = nullptr;
+  xbt_dynar_t values = xbt_dynar_new(sizeof(int), nullptr);
+  xbt_dynar_foreach(simgrid::mc::property_automaton->propositional_symbols, cursor, ps) {

     int res = xbt_automaton_propositional_symbol_evaluate(ps);
     xbt_dynar_push_as(values, int, res);
   }
     int res = xbt_automaton_propositional_symbol_evaluate(ps);
     xbt_dynar_push_as(values, int, res);
   }


@@ -45,45 +53,37 @@ static xbt_dynar_t get_atomic_propositions_values()
   return values;
 }
 
   return values;
 }
 

-static mc_visited_pair_t is_reached_acceptance_pair(mc_pair_t pair)
+static simgrid::mc::VisitedPair* is_reached_acceptance_pair(simgrid::mc::Pair* pair)

 {
 {

-  mc_visited_pair_t new_pair = NULL;
-  new_pair = MC_visited_pair_new(pair->num, pair->automaton_state, pair->atomic_propositions, pair->graph_state);
+  simgrid::mc::VisitedPair* new_pair = nullptr;
+  new_pair = simgrid::mc::visited_pair_new(pair->num, pair->automaton_state, pair->atomic_propositions, pair->graph_state);

   new_pair->acceptance_pair = 1;
 
   new_pair->acceptance_pair = 1;
 

-  if (xbt_dynar_is_empty(acceptance_pairs)) {
-
+  if (xbt_dynar_is_empty(acceptance_pairs))

     xbt_dynar_push(acceptance_pairs, &new_pair);
     xbt_dynar_push(acceptance_pairs, &new_pair);

-
-  } else {
+  else {

 
     int min = -1, max = -1, index;
     //int res;
 
     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(acceptance_pairs, new_pair, &min, &max);
 
     if (min != -1 && max != -1) {       // Acceptance pair with same number of processes and same heap bytes used exists
 
     int cursor;
 
     index = get_search_interval(acceptance_pairs, new_pair, &min, &max);
 
     if (min != -1 && max != -1) {       // Acceptance pair with same number of processes and same heap bytes used exists
 

-      // Parallell implementation
-      /*res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(acceptance_pairs, min), (max-min)+1, pair);
-         if(res != -1){
-         return ((mc_pair_t)xbt_dynar_get_as(acceptance_pairs, (min+res)-1, mc_pair_t))->num;
-         } */
-

       cursor = min;
       if(pair->search_cycle == 1){
         while (cursor <= max) {
       cursor = min;
       if(pair->search_cycle == 1){
         while (cursor <= max) {

-          pair_test = (mc_visited_pair_t) xbt_dynar_get_as(acceptance_pairs, cursor, mc_visited_pair_t);
+          pair_test = (simgrid::mc::VisitedPair*) xbt_dynar_get_as(acceptance_pairs, cursor, simgrid::mc::VisitedPair*);

           if (xbt_automaton_state_compare(pair_test->automaton_state, new_pair->automaton_state) == 0) {
             if (xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, new_pair->atomic_propositions) == 0) {
               if (snapshot_compare(pair_test, new_pair) == 0) {
                 XBT_INFO("Pair %d already reached (equal to pair %d) !", new_pair->num, pair_test->num);
                 xbt_fifo_shift(mc_stack);
           if (xbt_automaton_state_compare(pair_test->automaton_state, new_pair->automaton_state) == 0) {
             if (xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, new_pair->atomic_propositions) == 0) {
               if (snapshot_compare(pair_test, new_pair) == 0) {
                 XBT_INFO("Pair %d already reached (equal to pair %d) !", new_pair->num, pair_test->num);
                 xbt_fifo_shift(mc_stack);

-                if (dot_output != NULL)
+                if (dot_output != nullptr)

                   fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, pair_test->num, initial_global_state->prev_req);
                   fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, pair_test->num, initial_global_state->prev_req);

-                return NULL;
+                return nullptr;

               }
             }
           }
               }
             }
           }


@@ -92,15 +92,13 @@ static mc_visited_pair_t is_reached_acceptance_pair(mc_pair_t pair)
       }
       xbt_dynar_insert_at(acceptance_pairs, min, &new_pair);
     } else {
       }
       xbt_dynar_insert_at(acceptance_pairs, min, &new_pair);
     } else {

-      pair_test = (mc_visited_pair_t) xbt_dynar_get_as(acceptance_pairs, index, mc_visited_pair_t);
-      if (pair_test->nb_processes < new_pair->nb_processes) {
+      pair_test = (simgrid::mc::VisitedPair*) xbt_dynar_get_as(acceptance_pairs, index, simgrid::mc::VisitedPair*);
+      if (pair_test->nb_processes < new_pair->nb_processes)

         xbt_dynar_insert_at(acceptance_pairs, index + 1, &new_pair);
         xbt_dynar_insert_at(acceptance_pairs, index + 1, &new_pair);

-      } else {
-        if (pair_test->heap_bytes_used < new_pair->heap_bytes_used)
-          xbt_dynar_insert_at(acceptance_pairs, index + 1, &new_pair);
-        else
-          xbt_dynar_insert_at(acceptance_pairs, index, &new_pair);
-      }
+      else if (pair_test->heap_bytes_used < new_pair->heap_bytes_used)
+        xbt_dynar_insert_at(acceptance_pairs, index + 1, &new_pair);
+      else
+        xbt_dynar_insert_at(acceptance_pairs, index, &new_pair);

     }
   }
   return new_pair;
     }
   }
   return new_pair;


@@ -109,15 +107,14 @@ static mc_visited_pair_t is_reached_acceptance_pair(mc_pair_t pair)
 static void remove_acceptance_pair(int pair_num)
 {
   unsigned int cursor = 0;
 static void remove_acceptance_pair(int pair_num)
 {
   unsigned int cursor = 0;

-  mc_visited_pair_t pair_test = NULL;
+  simgrid::mc::VisitedPair* pair_test = nullptr;

   int pair_found = 0;
 
   int pair_found = 0;
 

-  xbt_dynar_foreach(acceptance_pairs, cursor, pair_test) {
+  xbt_dynar_foreach(acceptance_pairs, cursor, pair_test)

     if (pair_test->num == pair_num) {
        pair_found = 1;
       break;
     }
     if (pair_test->num == pair_num) {
        pair_found = 1;
       break;
     }

-  }

 
   if(pair_found == 1) {
     xbt_dynar_remove_at(acceptance_pairs, cursor, &pair_test);
 
   if(pair_found == 1) {
     xbt_dynar_remove_at(acceptance_pairs, cursor, &pair_test);


@@ -125,7 +122,7 @@ static void remove_acceptance_pair(int pair_num)
     pair_test->acceptance_removed = 1;
 
     if (_sg_mc_visited == 0 || pair_test->visited_removed == 1) 
     pair_test->acceptance_removed = 1;
 
     if (_sg_mc_visited == 0 || pair_test->visited_removed == 1) 

-      MC_visited_pair_delete(pair_test);
+      simgrid::mc::visited_pair_delete(pair_test);

 
   }
 }
 
   }
 }


@@ -152,55 +149,47 @@ static int MC_automaton_evaluate_label(xbt_automaton_exp_label_t l,
     }
   case 3:{
       unsigned int cursor = 0;
     }
   case 3:{
       unsigned int cursor = 0;

-      xbt_automaton_propositional_symbol_t p = NULL;
-      xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, p) {
-        if (strcmp(xbt_automaton_propositional_symbol_get_name(p), l->u.predicat) == 0)
+      xbt_automaton_propositional_symbol_t p = nullptr;
+      xbt_dynar_foreach(simgrid::mc::property_automaton->propositional_symbols, cursor, p) {
+        if (std::strcmp(xbt_automaton_propositional_symbol_get_name(p), l->u.predicat) == 0)

           return (int) xbt_dynar_get_as(atomic_propositions_values, cursor, int);
       }
       return -1;
     }
           return (int) xbt_dynar_get_as(atomic_propositions_values, cursor, int);
       }
       return -1;
     }

-  case 4:{
-      return 2;
-    }
+  case 4:
+    return 2;

   default:
     return -1;
   }
 }
 
   default:
     return -1;
   }
 }
 

-static int MC_modelcheck_liveness_main(void);
-

 static void MC_pre_modelcheck_liveness(void)
 {
 static void MC_pre_modelcheck_liveness(void)
 {

-  mc_pair_t initial_pair = NULL;
-  smx_process_t process;
-
+  simgrid::mc::Pair* initial_pair = nullptr;

   mc_model_checker->wait_for_requests();
   mc_model_checker->wait_for_requests();

-
-  acceptance_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), NULL);
+  acceptance_pairs = xbt_dynar_new(sizeof(simgrid::mc::VisitedPair*), nullptr);

   if(_sg_mc_visited > 0)
   if(_sg_mc_visited > 0)

-    visited_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), NULL);
+    simgrid::mc::visited_pairs = xbt_dynar_new(sizeof(simgrid::mc::VisitedPair*), nullptr);

 
 

-  initial_global_state->snapshot = MC_take_snapshot(0);
+  initial_global_state->snapshot = simgrid::mc::take_snapshot(0);

   initial_global_state->prev_pair = 0;
 
   unsigned int cursor = 0;
   xbt_automaton_state_t automaton_state;
   
   initial_global_state->prev_pair = 0;
 
   unsigned int cursor = 0;
   xbt_automaton_state_t automaton_state;
   

-  xbt_dynar_foreach(_mc_property_automaton->states, cursor, automaton_state) {
+  xbt_dynar_foreach(simgrid::mc::property_automaton->states, cursor, automaton_state) {

     if (automaton_state->type == -1) {  /* Initial automaton state */
 
     if (automaton_state->type == -1) {  /* Initial automaton state */
 

-      initial_pair = MC_pair_new();
+      initial_pair = simgrid::mc::pair_new();

       initial_pair->automaton_state = automaton_state;
       initial_pair->graph_state = MC_state_new();
       initial_pair->atomic_propositions = get_atomic_propositions_values();
       initial_pair->depth = 1;
 
       /* Get enabled processes and insert them in the interleave set of the graph_state */
       initial_pair->automaton_state = automaton_state;
       initial_pair->graph_state = MC_state_new();
       initial_pair->atomic_propositions = get_atomic_propositions_values();
       initial_pair->depth = 1;
 
       /* Get enabled processes and insert them in the interleave set of the graph_state */

-      MC_EACH_SIMIX_PROCESS(process,
-        if (MC_process_is_enabled(process)) {
-          MC_state_interleave_process(initial_pair->graph_state, process);
-        }
-      );
+      for (auto& p : mc_model_checker->process().simix_processes())
+        if (simgrid::mc::process_is_enabled(&p.copy))
+          MC_state_interleave_process(initial_pair->graph_state, &p.copy);

 
       initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state);
       initial_pair->search_cycle = 0;
 
       initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state);
       initial_pair->search_cycle = 0;


@@ -212,23 +201,22 @@ static void MC_pre_modelcheck_liveness(void)
 
 static int MC_modelcheck_liveness_main(void)
 {
 
 static int MC_modelcheck_liveness_main(void)
 {

-  smx_process_t process = NULL;
-  mc_pair_t current_pair = NULL;
+  simgrid::mc::Pair* current_pair = nullptr;

   int value, res, visited_num = -1;
   int value, res, visited_num = -1;

-  smx_simcall_t req = NULL;
-  xbt_automaton_transition_t transition_succ = NULL;
+  smx_simcall_t req = nullptr;
+  xbt_automaton_transition_t transition_succ = nullptr;

   int cursor = 0;
   int cursor = 0;

-  mc_pair_t next_pair = NULL;
-  xbt_dynar_t prop_values = NULL;
-  mc_visited_pair_t reached_pair = NULL;
+  simgrid::mc::Pair* next_pair = nullptr;
+  xbt_dynar_t prop_values = nullptr;
+  simgrid::mc::VisitedPair* reached_pair = nullptr;

   
   while(xbt_fifo_size(mc_stack) > 0){
 
     /* Get current pair */
   
   while(xbt_fifo_size(mc_stack) > 0){
 
     /* Get current pair */

-    current_pair = (mc_pair_t) xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack));
+    current_pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack));

 
     /* Update current state in buchi automaton */
 
     /* Update current state in buchi automaton */

-    _mc_property_automaton->current_state = current_pair->automaton_state;
+    simgrid::mc::property_automaton->current_state = current_pair->automaton_state;

 
     XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d, interleave size = %d, pair_num = %d, requests = %d)",
        current_pair->depth, current_pair->search_cycle,
 
     XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d, interleave size = %d, pair_num = %d, requests = %d)",
        current_pair->depth, current_pair->search_cycle,


@@ -239,15 +227,15 @@ static int MC_modelcheck_liveness_main(void)
 
       if (current_pair->automaton_state->type == 1 && current_pair->exploration_started == 0) {
         /* If new acceptance pair, return new pair */
 
       if (current_pair->automaton_state->type == 1 && current_pair->exploration_started == 0) {
         /* If new acceptance pair, return new pair */

-        if ((reached_pair = is_reached_acceptance_pair(current_pair)) == NULL) {
+        if ((reached_pair = is_reached_acceptance_pair(current_pair)) == nullptr) {

           int counter_example_depth = current_pair->depth;
           XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
           XBT_INFO("|             ACCEPTANCE CYCLE            |");
           XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
           XBT_INFO("Counter-example that violates formula :");
           MC_record_dump_path(mc_stack);
           int counter_example_depth = current_pair->depth;
           XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
           XBT_INFO("|             ACCEPTANCE CYCLE            |");
           XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
           XBT_INFO("Counter-example that violates formula :");
           MC_record_dump_path(mc_stack);

-          MC_show_stack_liveness(mc_stack);
-          MC_dump_stack_liveness(mc_stack);
+          simgrid::mc::show_stack_liveness(mc_stack);
+          simgrid::mc::dump_stack_liveness(mc_stack);

           MC_print_statistics(mc_stats);
           XBT_INFO("Counter-example depth : %d", counter_example_depth);
           return SIMGRID_MC_EXIT_LIVENESS;
           MC_print_statistics(mc_stats);
           XBT_INFO("Counter-example depth : %d", counter_example_depth);
           return SIMGRID_MC_EXIT_LIVENESS;


@@ -255,9 +243,11 @@ static int MC_modelcheck_liveness_main(void)
       }
 
       /* Pair already visited ? stop the exploration on the current path */
       }
 
       /* Pair already visited ? stop the exploration on the current path */

-      if ((current_pair->exploration_started == 0) && (visited_num = is_visited_pair(reached_pair, current_pair)) != -1) {
+      if ((current_pair->exploration_started == 0)
+        && (visited_num = simgrid::mc::is_visited_pair(
+          reached_pair, current_pair)) != -1) {

 
 

-        if (dot_output != NULL){
+        if (dot_output != nullptr){

           fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, visited_num, initial_global_state->prev_req);
           fflush(dot_output);
         }
           fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, visited_num, initial_global_state->prev_req);
           fflush(dot_output);
         }


@@ -270,19 +260,19 @@ static int MC_modelcheck_liveness_main(void)
 
         req = MC_state_get_request(current_pair->graph_state, &value);
 
 
         req = MC_state_get_request(current_pair->graph_state, &value);
 

-         if (dot_output != NULL) {
+         if (dot_output != nullptr) {

            if (initial_global_state->prev_pair != 0 && initial_global_state->prev_pair != current_pair->num) {
              fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, current_pair->num, initial_global_state->prev_req);
              xbt_free(initial_global_state->prev_req);
            }
            initial_global_state->prev_pair = current_pair->num;
            if (initial_global_state->prev_pair != 0 && initial_global_state->prev_pair != current_pair->num) {
              fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, current_pair->num, initial_global_state->prev_req);
              xbt_free(initial_global_state->prev_req);
            }
            initial_global_state->prev_pair = current_pair->num;

-           initial_global_state->prev_req = MC_request_get_dot_output(req, value);
+           initial_global_state->prev_req = simgrid::mc::request_get_dot_output(req, value);

            if (current_pair->search_cycle)
              fprintf(dot_output, "%d [shape=doublecircle];\n", current_pair->num);
            fflush(dot_output);
          }
 
            if (current_pair->search_cycle)
              fprintf(dot_output, "%d [shape=doublecircle];\n", current_pair->num);
            fflush(dot_output);
          }
 

-         char* req_str = MC_request_to_string(req, value, MC_REQUEST_SIMIX); 
+         char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix);

          XBT_DEBUG("Execute: %s", req_str);
          xbt_free(req_str);
 
          XBT_DEBUG("Execute: %s", req_str);
          xbt_free(req_str);
 


@@ -295,7 +285,7 @@ static int MC_modelcheck_liveness_main(void)
            mc_stats->visited_pairs++;
 
          /* Answer the request */
            mc_stats->visited_pairs++;
 
          /* Answer the request */

-         MC_simcall_handle(req, value);
+         simgrid::mc::handle_simcall(req, value);

          
          /* Wait for requests (schedules processes) */
          mc_model_checker->wait_for_requests();
          
          /* Wait for requests (schedules processes) */
          mc_model_checker->wait_for_requests();


@@ -312,17 +302,15 @@ static int MC_modelcheck_liveness_main(void)
            transition_succ = (xbt_automaton_transition_t)xbt_dynar_get_as(current_pair->automaton_state->out, cursor, xbt_automaton_transition_t);
            res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
            if (res == 1 || res == 2) { /* 1 = True transition (always enabled), 2 = enabled transition according to atomic prop values */
            transition_succ = (xbt_automaton_transition_t)xbt_dynar_get_as(current_pair->automaton_state->out, cursor, xbt_automaton_transition_t);
            res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
            if (res == 1 || res == 2) { /* 1 = True transition (always enabled), 2 = enabled transition according to atomic prop values */

-              next_pair = MC_pair_new();
+              next_pair = simgrid::mc::pair_new();

               next_pair->graph_state = MC_state_new();
               next_pair->automaton_state = transition_succ->dst;
               next_pair->atomic_propositions = get_atomic_propositions_values();
               next_pair->depth = current_pair->depth + 1;
               /* Get enabled processes and insert them in the interleave set of the next graph_state */
               next_pair->graph_state = MC_state_new();
               next_pair->automaton_state = transition_succ->dst;
               next_pair->atomic_propositions = get_atomic_propositions_values();
               next_pair->depth = current_pair->depth + 1;
               /* Get enabled processes and insert them in the interleave set of the next graph_state */

-              MC_EACH_SIMIX_PROCESS(process,
-                if (MC_process_is_enabled(process)) {
-                  MC_state_interleave_process(next_pair->graph_state, process);
-                }
-              );
+              for (auto& p : mc_model_checker->process().simix_processes())
+                if (simgrid::mc::process_is_enabled(&p.copy))
+                  MC_state_interleave_process(next_pair->graph_state, &p.copy);

 
               next_pair->requests = MC_state_interleave_size(next_pair->graph_state);
 
 
               next_pair->requests = MC_state_interleave_size(next_pair->graph_state);
 


@@ -349,7 +337,7 @@ static int MC_modelcheck_liveness_main(void)
     
       /* Traverse the stack backwards until a pair with a non empty interleave
          set is found, deleting all the pairs that have it empty in the way. */
     
       /* Traverse the stack backwards until a pair with a non empty interleave
          set is found, deleting all the pairs that have it empty in the way. */

-      while ((current_pair = (mc_pair_t) xbt_fifo_shift(mc_stack)) != NULL) {
+      while ((current_pair = (simgrid::mc::Pair*) xbt_fifo_shift(mc_stack)) != nullptr) {

         if (current_pair->requests > 0) {
           /* We found a backtracking point */
           XBT_DEBUG("Backtracking to depth %d", current_pair->depth);
         if (current_pair->requests > 0) {
           /* We found a backtracking point */
           XBT_DEBUG("Backtracking to depth %d", current_pair->depth);


@@ -362,7 +350,7 @@ static int MC_modelcheck_liveness_main(void)
           XBT_DEBUG("Delete pair %d at depth %d", current_pair->num, current_pair->depth);
           if (current_pair->automaton_state->type == 1) 
             remove_acceptance_pair(current_pair->num);
           XBT_DEBUG("Delete pair %d at depth %d", current_pair->num, current_pair->depth);
           if (current_pair->automaton_state->type == 1) 
             remove_acceptance_pair(current_pair->num);

-          MC_pair_delete(current_pair);
+          simgrid::mc::pair_delete(current_pair);

         }
       }
 
         }
       }
 


@@ -375,7 +363,10 @@ static int MC_modelcheck_liveness_main(void)
   return SIMGRID_MC_EXIT_SUCCESS;
 }
 
   return SIMGRID_MC_EXIT_SUCCESS;
 }
 

-int MC_modelcheck_liveness(void)
+namespace simgrid {
+namespace mc {
+
+int modelcheck_liveness(void)

 {
   if (mc_reduce_kind == e_mc_reduce_unset)
     mc_reduce_kind = e_mc_reduce_none;
 {
   if (mc_reduce_kind == e_mc_reduce_unset)
     mc_reduce_kind = e_mc_reduce_none;


@@ -396,9 +387,10 @@ int MC_modelcheck_liveness(void)
   int res = MC_modelcheck_liveness_main();
 
   /* We're done */
   int res = MC_modelcheck_liveness_main();
 
   /* We're done */

-  xbt_free(mc_time);
+  simgrid::mc::processes_time.clear();

 
   return res;
 }
 
 }
 
   return res;
 }
 
 }

+}