Hide more mc symbols

Some can't be hidden right new because they are used in the tests.

diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h
index ada2233..4015e9a 100644 (file)
--- a/include/simgrid/modelchecker.h
+++ b/include/simgrid/modelchecker.h
@@ -30,8 +30,8 @@ XBT_PUBLIC(int) MC_random(int min, int max);
 /* Internal variable used to check if we're running under the MC
  *
  * Please don't use directly: you should use MC_is_active. */
-extern int _sg_do_model_check;
-extern int _sg_mc_visited;
+extern XBT_PUBLIC(int) _sg_do_model_check;
+extern XBT_PUBLIC(int) _sg_mc_visited;
 
 #define MC_is_active()                  _sg_do_model_check
 #define MC_visited_reduction()          _sg_mc_visited

diff --git a/src/include/mc/datatypes.h b/src/include/mc/datatypes.h
index b86592b..c33ed9b 100644 (file)
--- a/src/include/mc/datatypes.h
+++ b/src/include/mc/datatypes.h
@@ -39,10 +39,6 @@ typedef struct s_stack_region{
   int process_index;
 }s_stack_region_t, *stack_region_t;
 
-void heap_ignore_region_free(mc_heap_ignore_region_t r);
-void heap_ignore_region_free_voidp(void *r);
-
-
 /************ DWARF structures *************/
 
 SG_END_DECL()

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 2f4ec26..5052281 100644 (file)
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -7,6 +7,7 @@
 #ifndef _MC_MC_H
 #define _MC_MC_H
 
+#include "xbt/base.h"
 #include "xbt/misc.h"
 #include "xbt/fifo.h"
 #include "xbt/dict.h"
@@ -36,47 +37,47 @@
 SG_BEGIN_DECL()
 
 /********************************** Configuration of MC **************************************/        
-extern int _sg_do_model_check;
-extern int _sg_do_model_check_record;
-extern int _sg_mc_checkpoint;
-extern int _sg_mc_sparse_checkpoint;
-extern char* _sg_mc_property_file;
-extern int _sg_mc_timeout;
-extern int _sg_mc_hash;
-extern int _sg_mc_max_depth;
-extern int _sg_mc_visited;
-extern char* _sg_mc_dot_output_file;
-extern int _sg_mc_comms_determinism;
-extern int _sg_mc_send_determinism;
-extern int _sg_mc_safety;
-extern int _sg_mc_liveness;
-extern int _sg_mc_snapshot_fds;
-extern int _sg_mc_termination;
+extern XBT_PUBLIC(int) _sg_do_model_check;
+extern XBT_PRIVATE int _sg_do_model_check_record;
+extern XBT_PRIVATE int _sg_mc_checkpoint;
+extern XBT_PUBLIC(int) _sg_mc_sparse_checkpoint;
+extern XBT_PUBLIC(char*) _sg_mc_property_file;
+extern XBT_PRIVATE int _sg_mc_timeout;
+extern XBT_PRIVATE int _sg_mc_hash;
+extern XBT_PRIVATE int _sg_mc_max_depth;
+extern XBT_PUBLIC(int) _sg_mc_visited;
+extern XBT_PRIVATE char* _sg_mc_dot_output_file;
+extern XBT_PUBLIC(int) _sg_mc_comms_determinism;
+extern XBT_PUBLIC(int) _sg_mc_send_determinism;
+extern XBT_PRIVATE int _sg_mc_safety;
+extern XBT_PRIVATE int _sg_mc_liveness;
+extern XBT_PRIVATE int _sg_mc_snapshot_fds;
+extern XBT_PRIVATE int _sg_mc_termination;
 
-extern xbt_dynar_t mc_heap_comparison_ignore;
-extern xbt_dynar_t stacks_areas;
+extern XBT_PRIVATE xbt_dynar_t mc_heap_comparison_ignore;
+extern XBT_PRIVATE xbt_dynar_t stacks_areas;
 
 /********************************* Global *************************************/
-void _mc_cfg_cb_reduce(const char *name, int pos);
-void _mc_cfg_cb_checkpoint(const char *name, int pos);
-void _mc_cfg_cb_sparse_checkpoint(const char *name, int pos);
-void _mc_cfg_cb_property(const char *name, int pos);
-void _mc_cfg_cb_timeout(const char *name, int pos);
-void _mc_cfg_cb_hash(const char *name, int pos);
-void _mc_cfg_cb_snapshot_fds(const char *name, int pos);
-void _mc_cfg_cb_max_depth(const char *name, int pos);
-void _mc_cfg_cb_visited(const char *name, int pos);
-void _mc_cfg_cb_dot_output(const char *name, int pos);
-void _mc_cfg_cb_comms_determinism(const char *name, int pos);
-void _mc_cfg_cb_send_determinism(const char *name, int pos);
-void _mc_cfg_cb_termination(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_reduce(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_checkpoint(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_sparse_checkpoint(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_property(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_timeout(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_snapshot_fds(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_hash(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_max_depth(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_visited(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_dot_output(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_comms_determinism(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_send_determinism(const char *name, int pos);
+XBT_PRIVATE void _mc_cfg_cb_termination(const char *name, int pos);
 
 XBT_PUBLIC(void) MC_run(void);
 XBT_PUBLIC(void) MC_init(void);
 XBT_PUBLIC(void) MC_exit(void);
 XBT_PUBLIC(void) MC_process_clock_add(smx_process_t, double);
 XBT_PUBLIC(double) MC_process_clock_get(smx_process_t);
-void MC_automaton_load(const char *file);
+XBT_PRIVATE void MC_automaton_load(const char *file);
 
 /****************************** MC ignore **********************************/
 XBT_PUBLIC(void) MC_ignore_heap(void *address, size_t size);

diff --git a/src/mc/mcer_ignore.cpp b/src/mc/mcer_ignore.cpp
index 43fcc42..6d898a2 100644 (file)
--- a/src/mc/mcer_ignore.cpp
+++ b/src/mc/mcer_ignore.cpp
@@ -28,12 +28,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mcer_ignore, mc,
 
 extern XBT_PRIVATE xbt_dynar_t mc_heap_comparison_ignore;
 
-XBT_PRIVATE void heap_ignore_region_free(mc_heap_ignore_region_t r)
+static void heap_ignore_region_free(mc_heap_ignore_region_t r)
 {
   xbt_free(r);
 }
 
-XBT_PRIVATE void heap_ignore_region_free_voidp(void *r)
+static void heap_ignore_region_free_voidp(void *r)
 {
   heap_ignore_region_free((mc_heap_ignore_region_t) * (void **) r);
 }