X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9436b840852218b39dce22d6057b6f223168daa..da6a8948438ab0798f492ed7bf5dad2a515ca04e:/src/mc/mc_config.cpp diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index a288a173d0..c6b2d716c2 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -4,9 +4,9 @@ /* 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/config.h" +#include "xbt/log.h" #include -#include -#include #include #include "src/mc/mc_replay.h" @@ -20,8 +20,7 @@ #include "src/mc/mc_record.h" -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 SIMGRID_HAVE_MC namespace simgrid { @@ -40,7 +39,7 @@ 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); @@ -64,7 +63,7 @@ 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."); @@ -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,7 +139,7 @@ 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."); @@ -149,7 +148,7 @@ void _mc_cfg_cb_visited(const char *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.");