From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 7 Apr 2016 16:25:06 +0000 (+0200)
Subject: oups, forgot to adapt MC to my last change in config
X-Git-Tag: v3_13~123
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1398fa7c21c0d81f808108e0803d875c6fce9b8e?ds=sidebyside

oups, forgot to adapt MC to my last change in config
---

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index 8fbad5cb21..e24db91b44 100644
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -48,21 +48,21 @@ extern XBT_PRIVATE int _sg_mc_snapshot_fds;
 extern XBT_PRIVATE int _sg_mc_termination;
 
 /********************************* Global *************************************/
-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_ksm(const char *name, int pos);
-XBT_PRIVATE void _mc_cfg_cb_soft_dirty(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_PRIVATE void _mc_cfg_cb_reduce(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_checkpoint(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_sparse_checkpoint(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_ksm(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_soft_dirty(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_property(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_timeout(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_snapshot_fds(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_hash(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_max_depth(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_visited(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_dot_output(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_comms_determinism(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_send_determinism(const char *name);
+XBT_PRIVATE void _mc_cfg_cb_termination(const char *name);
 
 XBT_PUBLIC(void) MC_run(void);
 XBT_PUBLIC(void) MC_process_clock_add(smx_process_t, double);
diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index 336f0114e5..4b0f610eb0 100644
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -38,7 +38,7 @@ simgrid::mc::ReductionMode reduction_mode = simgrid::mc::ReductionMode::unset;
 
 int _sg_mc_timeout = 0;
 
-void _mc_cfg_cb_timeout(const char *name, int pos)
+void _mc_cfg_cb_timeout(const char *name)
 {
   if (_sg_cfg_init_status && !(_sg_do_model_check || MC_record_path))
     xbt_die("You are specifying a value to enable/disable timeout for wait requests after the initialization (through MSG_config?), but model-checking was not activated at config time (through bu the program was not runned under the model-checker (with simgrid-mc)). This won't work, sorry.");
@@ -63,7 +63,7 @@ int _sg_mc_send_determinism = 0;
 int _sg_mc_snapshot_fds = 0;
 int _sg_mc_termination = 0;
 
-void _mc_cfg_cb_reduce(const char *name, int pos)
+void _mc_cfg_cb_reduce(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die
@@ -79,7 +79,7 @@ void _mc_cfg_cb_reduce(const char *name, int pos)
             name);
 }
 
-void _mc_cfg_cb_checkpoint(const char *name, int pos)
+void _mc_cfg_cb_checkpoint(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die
@@ -88,14 +88,14 @@ void _mc_cfg_cb_checkpoint(const char *name, int pos)
   _sg_mc_checkpoint = xbt_cfg_get_int(name);
 }
 
-void _mc_cfg_cb_sparse_checkpoint(const char *name, int pos) {
+void _mc_cfg_cb_sparse_checkpoint(const char *name) {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through bu the program was not runned under the model-checker (with simgrid-mc)). This won't work, sorry.");
 
   _sg_mc_sparse_checkpoint = xbt_cfg_get_boolean(name);
 }
 
-void _mc_cfg_cb_soft_dirty(const char *name, int pos) {
+void _mc_cfg_cb_soft_dirty(const char *name) {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die("You are specifying a soft dirty value after the initialization "
             "(through MSG_config?), but model-checking was not activated "
@@ -105,7 +105,7 @@ void _mc_cfg_cb_soft_dirty(const char *name, int pos) {
   _sg_mc_soft_dirty = xbt_cfg_get_boolean(name);
 }
 
-void _mc_cfg_cb_ksm(const char *name, int pos)
+void _mc_cfg_cb_ksm(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die("You are specifying a KSM value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
@@ -113,7 +113,7 @@ void _mc_cfg_cb_ksm(const char *name, int pos)
   _sg_mc_ksm = xbt_cfg_get_boolean(name);
 }
 
-void _mc_cfg_cb_property(const char *name, int pos)
+void _mc_cfg_cb_property(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die
@@ -122,7 +122,7 @@ void _mc_cfg_cb_property(const char *name, int pos)
   _sg_mc_property_file = xbt_cfg_get_string(name);
 }
 
-void _mc_cfg_cb_hash(const char *name, int pos)
+void _mc_cfg_cb_hash(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die
@@ -131,7 +131,7 @@ void _mc_cfg_cb_hash(const char *name, int pos)
   _sg_mc_hash = xbt_cfg_get_boolean(name);
 }
 
-void _mc_cfg_cb_snapshot_fds(const char *name, int pos)
+void _mc_cfg_cb_snapshot_fds(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die
@@ -140,7 +140,7 @@ void _mc_cfg_cb_snapshot_fds(const char *name, int pos)
   _sg_mc_snapshot_fds = xbt_cfg_get_boolean(name);
 }
 
-void _mc_cfg_cb_max_depth(const char *name, int pos)
+void _mc_cfg_cb_max_depth(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die
@@ -149,7 +149,7 @@ void _mc_cfg_cb_max_depth(const char *name, int pos)
   _sg_mc_max_depth = xbt_cfg_get_int(name);
 }
 
-void _mc_cfg_cb_visited(const char *name, int pos)
+void _mc_cfg_cb_visited(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die
@@ -158,7 +158,7 @@ void _mc_cfg_cb_visited(const char *name, int pos)
   _sg_mc_visited = xbt_cfg_get_int(name);
 }
 
-void _mc_cfg_cb_dot_output(const char *name, int pos)
+void _mc_cfg_cb_dot_output(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die
@@ -167,7 +167,7 @@ void _mc_cfg_cb_dot_output(const char *name, int pos)
   _sg_mc_dot_output_file = xbt_cfg_get_string(name);
 }
 
-void _mc_cfg_cb_comms_determinism(const char *name, int pos)
+void _mc_cfg_cb_comms_determinism(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die
@@ -176,7 +176,7 @@ void _mc_cfg_cb_comms_determinism(const char *name, int pos)
   _sg_mc_comms_determinism = xbt_cfg_get_boolean(name);
 }
 
-void _mc_cfg_cb_send_determinism(const char *name, int pos)
+void _mc_cfg_cb_send_determinism(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die
@@ -185,7 +185,7 @@ void _mc_cfg_cb_send_determinism(const char *name, int pos)
   _sg_mc_send_determinism = xbt_cfg_get_boolean(name);
 }
 
-void _mc_cfg_cb_termination(const char *name, int pos)
+void _mc_cfg_cb_termination(const char *name)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die