X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c8936bbc125e2396d1573bb629dc9c32181b729f..4d2b4eb26b57eb3c5727bb849d102e0dfdd5500d:/src/surf/surf_config.c
diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 816709cb25..3679b9c97a 100644
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -10,8 +10,8 @@
#include "xbt/log.h"
#include "xbt/str.h"
#include "surf/surf_private.h"
-#include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
-#include "simix/context.h"
+#include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
+#include "simgrid/simix.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
"About the configuration of surf (and the rest of the simulation)");
@@ -63,12 +63,6 @@ static void surf_config_cmd_line(int *argc, char **argv)
surf_optimization_mode_description[k].description);
printf("Both network and CPU models have 'Lazy' as default optimization level\n\n");
shall_exit = 1;
- } else if (!strcmp(argv[i], "--help-logs")) {
- xbt_log_help();
- shall_exit = 1;
- } else if (!strcmp(argv[i], "--help-log-categories")) {
- xbt_log_help_categories();
- shall_exit = 1;
#ifdef HAVE_TRACING
} else if (!strcmp(argv[i], "--help-tracing")) {
TRACE_help (1);
@@ -598,7 +592,7 @@ void surf_config_init(int *argc, char **argv)
//Default value have to be "threshold0:value0;threshold1:value1;...;thresholdN:valueN"
//test is if( size >= thresholdN ) return valueN;
//Values can be modified with command line --cfg=smpi/bw_factor:"threshold0:value0;threshold1:value1;...;thresholdN:valueN"
- // or with tag config put line
+ // or with tag config put line
xbt_cfg_register(&_surf_cfg_set, "smpi/bw_factor",
"Bandwidth factors for smpi.",
xbt_cfgelm_string, NULL, 1, 1, NULL,
@@ -661,14 +655,14 @@ void surf_config_models_setup()
*/
if((!xbt_cfg_is_default_value(_surf_cfg_set, "network/model") ||
- !xbt_cfg_is_default_value(_surf_cfg_set, "cpu/model")) &&
- xbt_cfg_is_default_value(_surf_cfg_set, "workstation/model"))
+ !xbt_cfg_is_default_value(_surf_cfg_set, "cpu/model")) &&
+ xbt_cfg_is_default_value(_surf_cfg_set, "workstation/model"))
{
- const char *val = "compound";
- XBT_INFO
- ("Switching workstation model to compound since you changed the network and/or cpu model(s)");
- xbt_cfg_set_string(_surf_cfg_set, "workstation/model", val);
- workstation_model_name = (char *) "compound";
+ const char *val = "compound";
+ XBT_INFO
+ ("Switching workstation model to compound since you changed the network and/or cpu model(s)");
+ xbt_cfg_set_string(_surf_cfg_set, "workstation/model", val);
+ workstation_model_name = (char *) "compound";
}
XBT_DEBUG("Workstation model: %s", workstation_model_name);