A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add a simple explication about how to use the config options.
[simgrid.git]
/
src
/
surf
/
surf_config.c
diff --git
a/src/surf/surf_config.c
b/src/surf/surf_config.c
index
816709c
..
8a9fd60
100644
(file)
--- 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 "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 "sim
ix/context
.h"
+#include "surf/surf_routing.h"
/* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
+#include "sim
grid/simix
.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
"About the configuration of surf (and the rest of the simulation)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
"About the configuration of surf (and the rest of the simulation)");
@@
-38,6
+38,9
@@
static void surf_config_cmd_line(int *argc, char **argv)
xbt_cfg_help(_surf_cfg_set);
printf(
"\n"
xbt_cfg_help(_surf_cfg_set);
printf(
"\n"
+"Each of these configurations can be used by adding\n"
+" --cfg=<option name>:<option value>\n"
+"to the command line.\n"
"You can also use --help-models to see the details of all models known by this simulator.\n"
#ifdef HAVE_TRACING
"\n"
"You can also use --help-models to see the details of all models known by this simulator.\n"
#ifdef HAVE_TRACING
"\n"
@@
-63,12
+66,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;
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);
#ifdef HAVE_TRACING
} else if (!strcmp(argv[i], "--help-tracing")) {
TRACE_help (1);
@@
-598,7
+595,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"
//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 <prop id="smpi/bw_factor" value="threshold0:value0;threshold1:value1;...;thresholdN:valueN"></prop>
+ //
or with tag config put line <prop id="smpi/bw_factor" value="threshold0:value0;threshold1:value1;...;thresholdN:valueN"></prop>
xbt_cfg_register(&_surf_cfg_set, "smpi/bw_factor",
"Bandwidth factors for smpi.",
xbt_cfgelm_string, NULL, 1, 1, NULL,
xbt_cfg_register(&_surf_cfg_set, "smpi/bw_factor",
"Bandwidth factors for smpi.",
xbt_cfgelm_string, NULL, 1, 1, NULL,
@@
-661,14
+658,14
@@
void surf_config_models_setup()
*/
if((!xbt_cfg_is_default_value(_surf_cfg_set, "network/model") ||
*/
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);
}
XBT_DEBUG("Workstation model: %s", workstation_model_name);