Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[mc] Remove useless extern "C" around logging categories
[simgrid.git] / src / mc / mc_visited.cpp
index 8b084b5..e87f274 100644 (file)
 #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 {
 
@@ -56,9 +52,8 @@ VisitedState::VisitedState()
     process->get_heap()->heaplimit,
     process->get_malloc_info());
 
-  MC_process_smx_refresh(&mc_model_checker->process());
   this->nb_processes =
-    mc_model_checker->process().smx_process_infos.size();
+    mc_model_checker->process().simix_processes().size();
 
   this->num = mc_stats->expanded_states;
   this->other_num = -1;
@@ -81,9 +76,8 @@ VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, xb
     process->get_heap()->heaplimit,
     process->get_malloc_info());
 
-  MC_process_smx_refresh(&mc_model_checker->process());
   this->nb_processes =
-    mc_model_checker->process().smx_process_infos.size();
+    mc_model_checker->process().simix_processes().size();
 
   this->automaton_state = automaton_state;
   this->num = pair_num;
@@ -240,7 +234,7 @@ void replace_state(
 }
 
 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(
@@ -268,7 +262,7 @@ simgrid::mc::VisitedState* 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();
 
   simgrid::mc::VisitedState* new_state = new VisitedState();
   graph_state->system_state = new_state->system_state;