[mc] Move some code into simgrid::mc namespace

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 776842a..cf124de 100644 (file)
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -47,6 +47,11 @@ extern "C" {
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc,
                                 "Logging specific to mc_checkpoint");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc,
                                 "Logging specific to mc_checkpoint");
 

+}
+
+namespace simgrid {
+namespace mc {
+

 /************************************  Free functions **************************************/
 /*****************************************************************************************/
 
 /************************************  Free functions **************************************/
 /*****************************************************************************************/
 


@@ -54,7 +59,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc,
  *
  *  @param reg     Target region
  */
  *
  *  @param reg     Target region
  */

-static void MC_region_restore(mc_mem_region_t region)
+static void restore(mc_mem_region_t region)

 {
   switch(region->storage_type()) {
   case simgrid::mc::StorageType::NoData:
 {
   switch(region->storage_type()) {
   case simgrid::mc::StorageType::NoData:


@@ -73,16 +78,11 @@ static void MC_region_restore(mc_mem_region_t region)
 
   case simgrid::mc::StorageType::Privatized:
     for (auto& p : region->privatized_data())
 
   case simgrid::mc::StorageType::Privatized:
     for (auto& p : region->privatized_data())

-      MC_region_restore(&p);
+      restore(&p);

     break;
   }
 }
 
     break;
   }
 }
 

-}
-
-namespace simgrid {
-namespace mc {
-

 #ifdef HAVE_SMPI
 RegionSnapshot privatized_region(
     RegionType region_type, void *start_addr, void* permanent_addr,
 #ifdef HAVE_SMPI
 RegionSnapshot privatized_region(
     RegionType region_type, void *start_addr, void* permanent_addr,


@@ -118,12 +118,8 @@ RegionSnapshot privatized_region(
 }
 #endif
 
 }
 #endif
 

-}
-}
-
-extern "C" {
-
-static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot,
+static
+void add_region(int index, mc_snapshot_t snapshot,

                                   simgrid::mc::RegionType type,
                                   simgrid::mc::ObjectInformation* object_info,
                                   void *start_addr, void* permanent_addr,
                                   simgrid::mc::RegionType type,
                                   simgrid::mc::ObjectInformation* object_info,
                                   void *start_addr, void* permanent_addr,


@@ -156,13 +152,13 @@ static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot,
   return;
 }
 
   return;
 }
 

-static void MC_get_memory_regions(simgrid::mc::Process* process, mc_snapshot_t snapshot)
+static void get_memory_regions(simgrid::mc::Process* process, mc_snapshot_t snapshot)

 {
   const size_t n = process->object_infos.size();
   snapshot->snapshot_regions.resize(n + 1);
   int i = 0;
   for (auto const& object_info : process->object_infos) {
 {
   const size_t n = process->object_infos.size();
   snapshot->snapshot_regions.resize(n + 1);
   int i = 0;
   for (auto const& object_info : process->object_infos) {

-    MC_snapshot_add_region(i, snapshot, simgrid::mc::RegionType::Data,
+    add_region(i, snapshot, simgrid::mc::RegionType::Data,

       object_info.get(),
       object_info->start_rw, object_info->start_rw,
       object_info->end_rw - object_info->start_rw);
       object_info.get(),
       object_info->start_rw, object_info->start_rw,
       object_info->end_rw - object_info->start_rw);


@@ -173,7 +169,7 @@ static void MC_get_memory_regions(simgrid::mc::Process* process, mc_snapshot_t s
   void *start_heap = heap->base;
   void *end_heap = heap->breakval;
 
   void *start_heap = heap->base;
   void *end_heap = heap->breakval;
 

-  MC_snapshot_add_region(n, snapshot, simgrid::mc::RegionType::Heap, NULL,
+  add_region(n, snapshot, simgrid::mc::RegionType::Heap, NULL,

                         start_heap, start_heap,
                         (char *) end_heap - (char *) start_heap);
   snapshot->heap_bytes_used = mmalloc_get_bytes_used_remote(
                         start_heap, start_heap,
                         (char *) end_heap - (char *) start_heap);
   snapshot->heap_bytes_used = mmalloc_get_bytes_used_remote(


@@ -197,7 +193,7 @@ static void MC_get_memory_regions(simgrid::mc::Process* process, mc_snapshot_t s
  *
  *  `dl_iterate_phdr` would be more robust but would not work in cross-process.
  * */
  *
  *  `dl_iterate_phdr` would be more robust but would not work in cross-process.
  * */

-void MC_find_object_address(
+void find_object_address(

   std::vector<simgrid::xbt::VmMap> const& maps,
   simgrid::mc::ObjectInformation* result)
 {
   std::vector<simgrid::xbt::VmMap> const& maps,
   simgrid::mc::ObjectInformation* result)
 {


@@ -264,7 +260,7 @@ void MC_find_object_address(
  *  \param ip    Instruction pointer
  *  \return      true if the variable is valid
  * */
  *  \param ip    Instruction pointer
  *  \return      true if the variable is valid
  * */

-static bool mc_valid_variable(simgrid::mc::Variable* var,
+static bool valid_variable(simgrid::mc::Variable* var,

                               simgrid::mc::Frame* scope,
                               const void *ip)
 {
                               simgrid::mc::Frame* scope,
                               const void *ip)
 {


@@ -275,7 +271,7 @@ static bool mc_valid_variable(simgrid::mc::Variable* var,
     return true;
 }
 
     return true;
 }
 

-static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
+static void fill_local_variables_values(mc_stack_frame_t stack_frame,

                                            simgrid::mc::Frame* scope,
                                            int process_index,
                                            std::vector<s_local_variable>& result)
                                            simgrid::mc::Frame* scope,
                                            int process_index,
                                            std::vector<s_local_variable>& result)


@@ -288,7 +284,7 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
   for(simgrid::mc::Variable& current_variable :
       scope->variables) {
 
   for(simgrid::mc::Variable& current_variable :
       scope->variables) {
 

-    if (!mc_valid_variable(&current_variable, scope, (void *) stack_frame->ip))
+    if (!valid_variable(&current_variable, scope, (void *) stack_frame->ip))

       continue;
 
     int region_type;
       continue;
 
     int region_type;


@@ -330,26 +326,20 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
 
   // Recursive processing of nested scopes:
   for(simgrid::mc::Frame& nested_scope : scope->scopes)
 
   // Recursive processing of nested scopes:
   for(simgrid::mc::Frame& nested_scope : scope->scopes)

-    mc_fill_local_variables_values(
+    fill_local_variables_values(

       stack_frame, &nested_scope, process_index, result);
 }
 
       stack_frame, &nested_scope, process_index, result);
 }
 

-static std::vector<s_local_variable> MC_get_local_variables_values(
+static std::vector<s_local_variable> get_local_variables_values(

   std::vector<s_mc_stack_frame_t>& stack_frames, int process_index)
 {
   std::vector<s_local_variable> variables;
   for (s_mc_stack_frame_t& stack_frame : stack_frames)
   std::vector<s_mc_stack_frame_t>& stack_frames, int process_index)
 {
   std::vector<s_local_variable> variables;
   for (s_mc_stack_frame_t& stack_frame : stack_frames)

-    mc_fill_local_variables_values(&stack_frame, stack_frame.frame, process_index, variables);
+    fill_local_variables_values(&stack_frame, stack_frame.frame, process_index, variables);

   return std::move(variables);
 }
 
   return std::move(variables);
 }
 

-static void MC_stack_frame_free_voipd(void *s)
-{
-  mc_stack_frame_t stack_frame = *(mc_stack_frame_t *) s;
-  delete(stack_frame);
-}
-
-static std::vector<s_mc_stack_frame_t> MC_unwind_stack_frames(mc_unw_context_t stack_context)
+static std::vector<s_mc_stack_frame_t> unwind_stack_frames(mc_unw_context_t stack_context)

 {
   simgrid::mc::Process* process = &mc_model_checker->process();
   std::vector<s_mc_stack_frame_t> result;
 {
   simgrid::mc::Process* process = &mc_model_checker->process();
   std::vector<s_mc_stack_frame_t> result;


@@ -413,7 +403,7 @@ static std::vector<s_mc_stack_frame_t> MC_unwind_stack_frames(mc_unw_context_t s
   return std::move(result);
 };
 
   return std::move(result);
 };
 

-static std::vector<s_mc_snapshot_stack_t> MC_take_snapshot_stacks(mc_snapshot_t * snapshot)
+static std::vector<s_mc_snapshot_stack_t> take_snapshot_stacks(mc_snapshot_t * snapshot)

 {
   std::vector<s_mc_snapshot_stack_t> res;
 
 {
   std::vector<s_mc_snapshot_stack_t> res;
 


@@ -429,8 +419,8 @@ static std::vector<s_mc_snapshot_stack_t> MC_take_snapshot_stacks(mc_snapshot_t
       &context) < 0) {
       xbt_die("Could not initialise the libunwind context.");
     }
       &context) < 0) {
       xbt_die("Could not initialise the libunwind context.");
     }

-    st.stack_frames = MC_unwind_stack_frames(&st.context);
-    st.local_variables = MC_get_local_variables_values(st.stack_frames, stack.process_index);
+    st.stack_frames = unwind_stack_frames(&st.context);
+    st.local_variables = get_local_variables_values(st.stack_frames, stack.process_index);

     st.process_index = stack.process_index;
 
     unw_word_t sp = st.stack_frames[0].sp;
     st.process_index = stack.process_index;
 
     unw_word_t sp = st.stack_frames[0].sp;


@@ -446,7 +436,7 @@ static std::vector<s_mc_snapshot_stack_t> MC_take_snapshot_stacks(mc_snapshot_t
 
 }
 
 
 }
 

-static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
+static void snapshot_handle_ignore(mc_snapshot_t snapshot)

 {
   xbt_assert(snapshot->process());
   
 {
   xbt_assert(snapshot->process());
   


@@ -469,7 +459,7 @@ static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
 
 }
 
 
 }
 

-static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot)
+static void snapshot_ignore_restore(mc_snapshot_t snapshot)

 {
   for (auto const& ignored_data : snapshot->ignored_data)
     snapshot->process()->write_bytes(
 {
   for (auto const& ignored_data : snapshot->ignored_data)
     snapshot->process()->write_bytes(


@@ -477,7 +467,7 @@ static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot)
       remote(ignored_data.start));
 }
 
       remote(ignored_data.start));
 }
 

-static std::vector<s_fd_infos_t> MC_get_current_fds(pid_t pid)
+static std::vector<s_fd_infos_t> get_current_fds(pid_t pid)

 {
   const size_t fd_dir_path_size = 20;
   char fd_dir_path[fd_dir_path_size];
 {
   const size_t fd_dir_path_size = 20;
   char fd_dir_path[fd_dir_path_size];


@@ -556,7 +546,7 @@ static std::vector<s_fd_infos_t> MC_get_current_fds(pid_t pid)
   return std::move(fds);
 }
 
   return std::move(fds);
 }
 

-mc_snapshot_t MC_take_snapshot(int num_state)
+mc_snapshot_t take_snapshot(int num_state)

 {
   XBT_DEBUG("Taking snapshot %i", num_state);
 
 {
   XBT_DEBUG("Taking snapshot %i", num_state);
 


@@ -570,15 +560,15 @@ mc_snapshot_t MC_take_snapshot(int num_state)
   MC_EACH_SIMIX_PROCESS(process,
     snapshot->enabled_processes.insert(process->pid));
 
   MC_EACH_SIMIX_PROCESS(process,
     snapshot->enabled_processes.insert(process->pid));
 

-  MC_snapshot_handle_ignore(snapshot);
+  snapshot_handle_ignore(snapshot);

 
   if (_sg_mc_snapshot_fds)
 
   if (_sg_mc_snapshot_fds)

-    snapshot->current_fds = MC_get_current_fds(process->pid);
+    snapshot->current_fds = get_current_fds(process->pid);

 
   const bool use_soft_dirty = _sg_mc_sparse_checkpoint && _sg_mc_soft_dirty;
 
   /* Save the std heap and the writable mapped pages of libsimgrid and binary */
 
   const bool use_soft_dirty = _sg_mc_sparse_checkpoint && _sg_mc_soft_dirty;
 
   /* Save the std heap and the writable mapped pages of libsimgrid and binary */

-  MC_get_memory_regions(mc_process, snapshot);
+  get_memory_regions(mc_process, snapshot);

   if (use_soft_dirty)
     mc_process->reset_soft_dirty();
 
   if (use_soft_dirty)
     mc_process->reset_soft_dirty();
 


@@ -586,7 +576,7 @@ mc_snapshot_t MC_take_snapshot(int num_state)
 
   if (_sg_mc_visited > 0 || strcmp(_sg_mc_property_file, "")) {
     snapshot->stacks =
 
   if (_sg_mc_visited > 0 || strcmp(_sg_mc_property_file, "")) {
     snapshot->stacks =

-        MC_take_snapshot_stacks(&snapshot);
+        take_snapshot_stacks(&snapshot);

     if (_sg_mc_hash) {
       snapshot->hash = simgrid::mc::hash(*snapshot);
     } else {
     if (_sg_mc_hash) {
       snapshot->hash = simgrid::mc::hash(*snapshot);
     } else {


@@ -596,19 +586,19 @@ mc_snapshot_t MC_take_snapshot(int num_state)
     snapshot->hash = 0;
   }
 
     snapshot->hash = 0;
   }
 

-  MC_snapshot_ignore_restore(snapshot);
+  snapshot_ignore_restore(snapshot);

   if (use_soft_dirty)
     mc_model_checker->parent_snapshot_ = snapshot;
   return snapshot;
 }
 
 static inline
   if (use_soft_dirty)
     mc_model_checker->parent_snapshot_ = snapshot;
   return snapshot;
 }
 
 static inline

-void MC_restore_snapshot_regions(mc_snapshot_t snapshot)
+void restore_snapshot_regions(mc_snapshot_t snapshot)

 {
   for(std::unique_ptr<s_mc_mem_region_t> const& region : snapshot->snapshot_regions) {
     // For privatized, variables we decided it was not necessary to take the snapshot:
     if (region)
 {
   for(std::unique_ptr<s_mc_mem_region_t> const& region : snapshot->snapshot_regions) {
     // For privatized, variables we decided it was not necessary to take the snapshot:
     if (region)

-      MC_region_restore(region.get());
+      restore(region.get());

   }
 
 #ifdef HAVE_SMPI
   }
 
 #ifdef HAVE_SMPI


@@ -624,7 +614,7 @@ void MC_restore_snapshot_regions(mc_snapshot_t snapshot)
 }
 
 static inline
 }
 
 static inline

-void MC_restore_snapshot_fds(mc_snapshot_t snapshot)
+void restore_snapshot_fds(mc_snapshot_t snapshot)

 {
   if (mc_mode == MC_MODE_SERVER)
     xbt_die("FD snapshot not implemented in client/server mode.");
 {
   if (mc_mode == MC_MODE_SERVER)
     xbt_die("FD snapshot not implemented in client/server mode.");


@@ -644,24 +634,26 @@ void MC_restore_snapshot_fds(mc_snapshot_t snapshot)
   }
 }
 
   }
 }
 

-void MC_restore_snapshot(mc_snapshot_t snapshot)
+void restore_snapshot(mc_snapshot_t snapshot)

 {
   XBT_DEBUG("Restore snapshot %i", snapshot->num_state);
   const bool use_soft_dirty = _sg_mc_sparse_checkpoint && _sg_mc_soft_dirty;
 {
   XBT_DEBUG("Restore snapshot %i", snapshot->num_state);
   const bool use_soft_dirty = _sg_mc_sparse_checkpoint && _sg_mc_soft_dirty;

-  MC_restore_snapshot_regions(snapshot);
+  restore_snapshot_regions(snapshot);

   if (_sg_mc_snapshot_fds)
   if (_sg_mc_snapshot_fds)

-    MC_restore_snapshot_fds(snapshot);
+    restore_snapshot_fds(snapshot);

   if (use_soft_dirty)
     mc_model_checker->process().reset_soft_dirty();
   if (use_soft_dirty)
     mc_model_checker->process().reset_soft_dirty();

-  MC_snapshot_ignore_restore(snapshot);
+  snapshot_ignore_restore(snapshot);

   mc_model_checker->process().cache_flags = 0;
   if (use_soft_dirty)
     mc_model_checker->parent_snapshot_ = snapshot;
 }
 
   mc_model_checker->process().cache_flags = 0;
   if (use_soft_dirty)
     mc_model_checker->parent_snapshot_ = snapshot;
 }
 

-mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall)
-{
-  return MC_take_snapshot(1);
+}

 }
 
 }
 

+extern "C"
+mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall)
+{
+  return simgrid::mc::take_snapshot(1);

 }
 }

diff --git a/src/mc/mc_comm_determinism.cpp b/src/mc/mc_comm_determinism.cpp
index 018a90a..22b442b 100644 (file)
--- a/src/mc/mc_comm_determinism.cpp
+++ b/src/mc/mc_comm_determinism.cpp
@@ -483,7 +483,7 @@ int MC_modelcheck_comm_determinism(void)
   MC_pre_modelcheck_comm_determinism();
 
   initial_global_state = xbt_new0(s_mc_global_t, 1);
   MC_pre_modelcheck_comm_determinism();
 
   initial_global_state = xbt_new0(s_mc_global_t, 1);

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

   initial_global_state->initial_communications_pattern_done = 0;
   initial_global_state->recv_deterministic = 1;
   initial_global_state->send_deterministic = 1;
   initial_global_state->initial_communications_pattern_done = 0;
   initial_global_state->recv_deterministic = 1;
   initial_global_state->send_deterministic = 1;

diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp
index c0cac6f..a9017d4 100644 (file)
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -1150,7 +1150,7 @@ std::shared_ptr<simgrid::mc::ObjectInformation> MC_find_object_info(
   std::shared_ptr<simgrid::mc::ObjectInformation> result =
     std::make_shared<simgrid::mc::ObjectInformation>();
   result->file_name = name;
   std::shared_ptr<simgrid::mc::ObjectInformation> result =
     std::make_shared<simgrid::mc::ObjectInformation>();
   result->file_name = name;

-  MC_find_object_address(maps, result.get());
+  simgrid::mc::find_object_address(maps, result.get());

   MC_dwarf_get_variables(result.get());
   MC_post_process_variables(result.get());
   MC_post_process_types(result.get());
   MC_dwarf_get_variables(result.get());
   MC_post_process_variables(result.get());
   MC_post_process_types(result.get());

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 76a2af2..868329c 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -202,7 +202,7 @@ void MC_replay(xbt_fifo_t stack)
     start_item = xbt_fifo_get_first_item(stack);
     state = (mc_state_t)xbt_fifo_get_item_content(start_item);
     if(state->system_state){
     start_item = xbt_fifo_get_first_item(stack);
     state = (mc_state_t)xbt_fifo_get_item_content(start_item);
     if(state->system_state){

-      MC_restore_snapshot(state->system_state);
+      simgrid::mc::restore_snapshot(state->system_state);

       if(_sg_mc_comms_determinism || _sg_mc_send_determinism) 
         MC_restore_communications_pattern(state);
       return;
       if(_sg_mc_comms_determinism || _sg_mc_send_determinism) 
         MC_restore_communications_pattern(state);
       return;


@@ -211,7 +211,7 @@ void MC_replay(xbt_fifo_t stack)
 
 
   /* Restore the initial state */
 
 
   /* Restore the initial state */

-  MC_restore_snapshot(initial_global_state->snapshot);
+  simgrid::mc::restore_snapshot(initial_global_state->snapshot);

   /* At the moment of taking the snapshot the raw heap was set, so restoring
    * it will set it back again, we have to unset it to continue  */
 
   /* At the moment of taking the snapshot the raw heap was set, so restoring
    * it will set it back again, we have to unset it to continue  */
 


@@ -290,13 +290,13 @@ void MC_replay_liveness(xbt_fifo_t stack)
     item = xbt_fifo_get_first_item(stack);
     pair = (mc_pair_t) xbt_fifo_get_item_content(item);
     if(pair->graph_state->system_state){
     item = xbt_fifo_get_first_item(stack);
     pair = (mc_pair_t) xbt_fifo_get_item_content(item);
     if(pair->graph_state->system_state){

-      MC_restore_snapshot(pair->graph_state->system_state);
+      simgrid::mc::restore_snapshot(pair->graph_state->system_state);

       return;
     }
   }
 
   /* Restore the initial state */
       return;
     }
   }
 
   /* Restore the initial state */

-  MC_restore_snapshot(initial_global_state->snapshot);
+  simgrid::mc::restore_snapshot(initial_global_state->snapshot);

 
     /* Traverse the stack from the initial state and re-execute the transitions */
     for (item = xbt_fifo_get_last_item(stack);
 
     /* Traverse the stack from the initial state and re-execute the transitions */
     for (item = xbt_fifo_get_last_item(stack);

diff --git a/src/mc/mc_liveness.cpp b/src/mc/mc_liveness.cpp
index 2bdc1a7..bb3fadc 100644 (file)
--- a/src/mc/mc_liveness.cpp
+++ b/src/mc/mc_liveness.cpp
@@ -180,7 +180,7 @@ static void MC_pre_modelcheck_liveness(void)
   if(_sg_mc_visited > 0)
     visited_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), NULL);
 
   if(_sg_mc_visited > 0)
     visited_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), NULL);
 

-  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;
   initial_global_state->prev_pair = 0;
 
   unsigned int cursor = 0;

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 17982ed..a5ded6a 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -103,9 +103,15 @@ XBT_PRIVATE void MC_report_crash(int status);
 
 #ifdef __cplusplus
 
 
 #ifdef __cplusplus
 

-XBT_PRIVATE void MC_find_object_address(
+namespace simgrid {
+namespace mc {
+
+XBT_PRIVATE void find_object_address(

   std::vector<simgrid::xbt::VmMap> const& maps, simgrid::mc::ObjectInformation* result);
 
   std::vector<simgrid::xbt::VmMap> const& maps, simgrid::mc::ObjectInformation* result);
 

+}
+}
+

 #endif
 
 SG_END_DECL()
 #endif
 
 SG_END_DECL()

diff --git a/src/mc/mc_safety.cpp b/src/mc/mc_safety.cpp
index 1642b3a..160fea3 100644 (file)
--- a/src/mc/mc_safety.cpp
+++ b/src/mc/mc_safety.cpp
@@ -286,5 +286,5 @@ static void MC_modelcheck_safety_init(void)
 
   /* Save the initial state */
   initial_global_state = xbt_new0(s_mc_global_t, 1);
 
   /* Save the initial state */
   initial_global_state = xbt_new0(s_mc_global_t, 1);

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

 }
 }

diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index 8960b45..47bfc14 100644 (file)
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -177,8 +177,22 @@ mc_mem_region_t mc_get_region_hinted(void* addr, mc_snapshot_t snapshot, int pro
 
 static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot);
 
 
 static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot);
 

-XBT_PRIVATE mc_snapshot_t MC_take_snapshot(int num_state);
-XBT_PRIVATE void MC_restore_snapshot(mc_snapshot_t);
+}
+
+#ifdef __cplusplus
+
+namespace simgrid {
+namespace mc {
+
+XBT_PRIVATE mc_snapshot_t take_snapshot(int num_state);
+XBT_PRIVATE void restore_snapshot(mc_snapshot_t);
+
+}
+}
+
+#endif
+
+extern "C" {

 
 XBT_PRIVATE void mc_restore_page_snapshot_region(
   simgrid::mc::Process* process,
 
 XBT_PRIVATE void mc_restore_page_snapshot_region(
   simgrid::mc::Process* process,

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index e0e6121..3720ff7 100644 (file)
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -37,7 +37,7 @@ mc_state_t MC_state_new()
   state->incomplete_comm_pattern = NULL;
   /* Stateful model checking */
   if((_sg_mc_checkpoint > 0 && (mc_stats->expanded_states % _sg_mc_checkpoint == 0)) ||  _sg_mc_termination){
   state->incomplete_comm_pattern = NULL;
   /* Stateful model checking */
   if((_sg_mc_checkpoint > 0 && (mc_stats->expanded_states % _sg_mc_checkpoint == 0)) ||  _sg_mc_termination){

-    state->system_state = MC_take_snapshot(state->num);
+    state->system_state = simgrid::mc::take_snapshot(state->num);

     if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
       MC_state_copy_incomplete_communications_pattern(state);
       MC_state_copy_index_communications_pattern(state);
     if(_sg_mc_comms_determinism || _sg_mc_send_determinism){
       MC_state_copy_incomplete_communications_pattern(state);
       MC_state_copy_index_communications_pattern(state);

diff --git a/src/mc/mc_visited.cpp b/src/mc/mc_visited.cpp
index 459db40..7634c31 100644 (file)
--- a/src/mc/mc_visited.cpp
+++ b/src/mc/mc_visited.cpp
@@ -64,7 +64,7 @@ static mc_visited_state_t visited_state_new()
   new_state->nb_processes = xbt_dynar_length(
     mc_model_checker->process().smx_process_infos);
 
   new_state->nb_processes = xbt_dynar_length(
     mc_model_checker->process().smx_process_infos);
 

-  new_state->system_state = MC_take_snapshot(mc_stats->expanded_states);
+  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;
   new_state->num = mc_stats->expanded_states;
   new_state->other_num = -1;
   return new_state;


@@ -77,7 +77,7 @@ mc_visited_pair_t MC_visited_pair_new(int pair_num, xbt_automaton_state_t automa
   pair = xbt_new0(s_mc_visited_pair_t, 1);
   pair->graph_state = graph_state;
   if(pair->graph_state->system_state == NULL)
   pair = xbt_new0(s_mc_visited_pair_t, 1);
   pair->graph_state = graph_state;
   if(pair->graph_state->system_state == NULL)

-    pair->graph_state->system_state = MC_take_snapshot(pair_num);
+    pair->graph_state->system_state = simgrid::mc::take_snapshot(pair_num);

   pair->heap_bytes_used = mmalloc_get_bytes_used_remote(
     process->get_heap()->heaplimit,
     process->get_malloc_info());
   pair->heap_bytes_used = mmalloc_get_bytes_used_remote(
     process->get_heap()->heaplimit,
     process->get_malloc_info());