X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b0d4aa36f4ef3a0e253b6104b317b5737e075e8..b560ac9518f1a60d5416a5af54709e4cbc680257:/src/mc/mc_config.cpp

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index 84b8b07dbc..566544c059 100644
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -1,29 +1,28 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
+/* Copyright (c) 2008-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* 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 <xbt/str.h>
-#include <xbt/log.h>
-#include <xbt/config.h>
+#include "xbt/config.h"
+#include "xbt/log.h"
+#include <xbt/sysdep.h>
 
 #include <mc/mc.h>
 #include "src/mc/mc_replay.h"
 
 #include <simgrid/sg_config.h>
 
-#if HAVE_MC
-#include "src/mc/mc_safety.h"
-#include "src/mc/mc_private.h"
+#if SIMGRID_HAVE_MC
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_safety.hpp"
 #endif
 
-#include "src/mc/mc_record.h"
+#include "src/mc/mc_record.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_config, mc,
-                                "Configuration of MC");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_config, mc, "Configuration of the Model Checker");
 
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
 namespace simgrid {
 namespace mc {
 /* Configuration support */
@@ -32,7 +31,7 @@ simgrid::mc::ReductionMode reduction_mode = simgrid::mc::ReductionMode::unset;
 }
 #endif
 
-#if !HAVE_MC
+#if !SIMGRID_HAVE_MC
 #define _sg_do_model_check 0
 #endif
 
@@ -40,13 +39,13 @@ int _sg_mc_timeout = 0;
 
 void _mc_cfg_cb_timeout(const char *name)
 {
-  if (_sg_cfg_init_status && !(_sg_do_model_check || MC_record_path))
+  if (_sg_cfg_init_status && not(_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.");
 
   _sg_mc_timeout = xbt_cfg_get_boolean(name);
 }
 
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
 int _sg_do_model_check = 0;
 int _sg_do_model_check_record = 0;
 int _sg_mc_checkpoint = 0;
@@ -55,7 +54,7 @@ int _sg_mc_ksm = 0;
 char *_sg_mc_property_file = nullptr;
 int _sg_mc_hash = 0;
 int _sg_mc_max_depth = 1000;
-int _sg_mc_visited = 0;
+int _sg_mc_max_visited_states = 0;
 char *_sg_mc_dot_output_file = nullptr;
 int _sg_mc_comms_determinism = 0;
 int _sg_mc_send_determinism = 0;
@@ -64,14 +63,14 @@ int _sg_mc_termination = 0;
 
 void _mc_cfg_cb_reduce(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _sg_do_model_check)
     xbt_die
         ("You are specifying a reduction strategy 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.");
 
   char *val = xbt_cfg_get_string(name);
-  if (!strcasecmp(val, "none"))
+  if (not strcasecmp(val, "none"))
     simgrid::mc::reduction_mode = simgrid::mc::ReductionMode::none;
-  else if (!strcasecmp(val, "dpor"))
+  else if (not strcasecmp(val, "dpor"))
     simgrid::mc::reduction_mode = simgrid::mc::ReductionMode::dpor;
   else
     xbt_die("configuration option %s can only take 'none' or 'dpor' as a value",
@@ -80,7 +79,7 @@ void _mc_cfg_cb_reduce(const char *name)
 
 void _mc_cfg_cb_checkpoint(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _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.");
 
@@ -88,7 +87,7 @@ void _mc_cfg_cb_checkpoint(const char *name)
 }
 
 void _mc_cfg_cb_sparse_checkpoint(const char *name) {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _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);
@@ -96,7 +95,7 @@ void _mc_cfg_cb_sparse_checkpoint(const char *name) {
 
 void _mc_cfg_cb_ksm(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _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.");
 
   _sg_mc_ksm = xbt_cfg_get_boolean(name);
@@ -104,7 +103,7 @@ void _mc_cfg_cb_ksm(const char *name)
 
 void _mc_cfg_cb_property(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _sg_do_model_check)
     xbt_die
         ("You are specifying a property 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.");
 
@@ -113,7 +112,7 @@ void _mc_cfg_cb_property(const char *name)
 
 void _mc_cfg_cb_hash(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _sg_do_model_check)
     xbt_die
         ("You are specifying a value to enable/disable the use of global hash to speedup state comparaison, 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.");
 
@@ -122,7 +121,7 @@ void _mc_cfg_cb_hash(const char *name)
 
 void _mc_cfg_cb_snapshot_fds(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _sg_do_model_check)
     xbt_die
         ("You are specifying a value to enable/disable the use of FD snapshotting, 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.");
 
@@ -131,7 +130,7 @@ void _mc_cfg_cb_snapshot_fds(const char *name)
 
 void _mc_cfg_cb_max_depth(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _sg_do_model_check)
     xbt_die
         ("You are specifying a max depth 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.");
 
@@ -140,16 +139,16 @@ void _mc_cfg_cb_max_depth(const char *name)
 
 void _mc_cfg_cb_visited(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _sg_do_model_check)
     xbt_die
         ("You are specifying a number of stored visited states 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_visited = xbt_cfg_get_int(name);
+  _sg_mc_max_visited_states = xbt_cfg_get_int(name);
 }
 
 void _mc_cfg_cb_dot_output(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _sg_do_model_check)
     xbt_die
         ("You are specifying a file name for a dot output of graph state 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.");
 
@@ -158,7 +157,7 @@ void _mc_cfg_cb_dot_output(const char *name)
 
 void _mc_cfg_cb_comms_determinism(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _sg_do_model_check)
     xbt_die
         ("You are specifying a value to enable/disable the detection of determinism in the communications schemes 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.");
 
@@ -167,7 +166,7 @@ void _mc_cfg_cb_comms_determinism(const char *name)
 
 void _mc_cfg_cb_send_determinism(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _sg_do_model_check)
     xbt_die
         ("You are specifying a value to enable/disable the detection of send-determinism in the communications schemes 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.");
 
@@ -176,7 +175,7 @@ void _mc_cfg_cb_send_determinism(const char *name)
 
 void _mc_cfg_cb_termination(const char *name)
 {
-  if (_sg_cfg_init_status && !_sg_do_model_check)
+  if (_sg_cfg_init_status && not _sg_do_model_check)
     xbt_die
         ("You are specifying a value to enable/disable the detection of non progressive cycles 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.");