xbt_cfg_t _surf_cfg_set = NULL;
+static void LOG_help(void)
+{
+ printf("Description of the logging output:\n");
+ printf("\tIn your command line use option: --log=CATEGORY_NAME.thres:PRIORITY_LEVEL\n");
+ printf("\t\tCATEGORY_NAME: defined in code with function 'XBT_LOG_NEW_CATEGORY'\n");
+ printf("\t\tPRIORITY_LEVEL: the level to print (trace,debug,verbose,info,warning,error,critical)\n");
+ printf("\n");
+}
+
/* Parse the command line, looking for options */
static void surf_config_cmd_line(int *argc, char **argv)
{
#ifdef HAVE_TRACING
printf("\nYou can also use --help-tracing to see the details of all tracing options known by this simulator.\n");
#endif
+ printf("\nYou can also use --help-logs to see the details of logging output.\n\n");
exit(0);
} else if (!strncmp(argv[i], "--help-models", strlen("--help-models") + 1)) {
model_help("workstation", surf_workstation_model_description);
printf(" %s: %s\n", surf_optimization_mode_description[i].name, surf_optimization_mode_description[i].description);
printf("Both network and CPU models have 'Lazy' as default optimization level\n");
exit(0);
+ } else if (!strncmp(argv[i], "--help-logs", strlen("--help-logs") + 1)) {
+ LOG_help ();
+ exit(0);
#ifdef HAVE_TRACING
} else if (!strncmp(argv[i], "--help-tracing", strlen("--help-tracing") + 1)) {
TRACE_help (1);
find_model_description(surf_optimization_mode_description, val);
}
+/* callback of the cpu/model variable */
+static void _surf_cfg_cb__storage_mode(const char *name, int pos)
+{
+ char *val;
+
+ xbt_assert(_surf_init_status < 2,
+ "Cannot change the model after the initialization");
+
+ val = xbt_cfg_get_string(_surf_cfg_set, name);
+
+ if (!strcmp(val, "help")) {
+ model_help("storage", surf_storage_model_description);
+ exit(0);
+ }
+
+ /* New Module missing */
+ find_model_description(surf_storage_model_description, val);
+}
+
/* callback of the workstation_model variable */
static void _surf_cfg_cb__network_model(const char *name, int pos)
{
SIMIX_context_set_parallel_mode(XBT_PARMAP_BUSY_WAIT);
}
else {
- XBT_WARN("Command line setting of the parallel synchronization mode should "
+ xbt_die("Command line setting of the parallel synchronization mode should "
"be one of \"posix\", \"futex\" or \"busy_wait\"");
}
}
+static void _surf_cfg_cb_surf_nthreads(const char *name, int pos)
+{
+ surf_set_nthreads(xbt_cfg_get_int(_surf_cfg_set, name));
+}
+
static void _surf_cfg_cb__surf_network_coordinates(const char *name,
int pos)
{
xbt_cfg_register(&_surf_cfg_set, "cpu/optim", description, xbt_cfgelm_string,
&default_value, 1, 1, &_surf_cfg_cb__optimization_mode, NULL);
+ sprintf(description,
+ "The model to use for the storage. Possible values: ");
+ p = description;
+ while (*(++p) != '\0');
+ for (i = 0; surf_storage_model_description[i].name; i++)
+ p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+ surf_storage_model_description[i].name);
+ sprintf(p,
+ ".\n (use 'help' as a value to see the long description of each model)");
+ default_value = xbt_strdup("default");
+ xbt_cfg_register(&_surf_cfg_set, "storage/model", description, xbt_cfgelm_string,
+ &default_value, 1, 1, &_surf_cfg_cb__storage_mode,
+ NULL);
+
sprintf(description,
"The model to use for the network. Possible values: ");
p = description;
xbt_cfgelm_int, &default_value_int, 1, 1,
_surf_cfg_cb_contexts_parallel_threshold, NULL);
- /* minimal number of user contexts to be run in parallel */
+ /* synchronization mode for parallel user contexts */
#ifdef HAVE_FUTEX_H
default_value = xbt_strdup("futex");
#else //No futex on mac and posix is unimplememted yet
xbt_cfgelm_string, &default_value, 1, 1,
_surf_cfg_cb_contexts_parallel_mode, NULL);
+ /* number of parallel threads for Surf */
+ default_value_int = surf_get_nthreads();
+ xbt_cfg_register(&_surf_cfg_set, "surf/nthreads",
+ "Number of parallel threads used to update Surf models",
+ xbt_cfgelm_int, &default_value_int, 1, 1,
+ _surf_cfg_cb_surf_nthreads, NULL);
+
default_value = xbt_strdup("no");
xbt_cfg_register(&_surf_cfg_set, "network/coordinates",
"\"yes\" or \"no\", specifying whether we use a coordinate-based routing (as Vivaldi)",
"Double value to oscillate the link latency, uniformly in random interval [-latency*gtnets_jitter,latency*gtnets_jitter)",
xbt_cfgelm_double, NULL, 1, 1,
_surf_cfg_cb__gtnets_jitter, NULL);
- xbt_cfg_setdefault_double(_surf_cfg_set, "gtnets_jitter", 0.0);
+ xbt_cfg_setdefault_double(_surf_cfg_set, "gtnets/jitter", 0.0);
default_value_int = 10;
xbt_cfg_register(&_surf_cfg_set, "gtnets/jitter_seed",
"Minimal computation time (in seconds) not discarded.",
xbt_cfgelm_double, &default_threshold, 1, 1, NULL,
NULL);
+
+ //For smpi/bw_factor and smpi/lat_factor
+ //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>
+ xbt_cfg_register(&_surf_cfg_set, "smpi/bw_factor",
+ "Bandwidth factors for smpi.",
+ xbt_cfgelm_string, NULL, 1, 1, NULL,
+ NULL);
+ xbt_cfg_setdefault_string(_surf_cfg_set, "smpi/bw_factor", "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;1426:0.608902;732:0.341987;257:0.338112;0:0.812084");
+
+ xbt_cfg_register(&_surf_cfg_set, "smpi/lat_factor",
+ "Latency factors for smpi.",
+ xbt_cfgelm_string, NULL, 1, 1, NULL,
+ NULL);
+ xbt_cfg_setdefault_string(_surf_cfg_set, "smpi/lat_factor", "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;1426:1.61075;732:1.9503;257:1.95341;0:2.01467");
//END SMPI
int workstation_id = -1;
char *network_model_name = NULL;
char *cpu_model_name = NULL;
+ int storage_id = -1;
+ char *storage_model_name = NULL;
workstation_model_name =
xbt_cfg_get_string(_surf_cfg_set, "workstation/model");
network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network/model");
cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu/model");
+ storage_model_name = xbt_cfg_get_string(_surf_cfg_set, "storage/model");
/* Check whether we use a net/cpu model differing from the default ones, in which case
* we should switch to the "compound" workstation model to correctly dispatch stuff to
XBT_DEBUG("Call workstation_model_init");
surf_workstation_model_description[workstation_id].model_init_preparse();
+
+ XBT_DEBUG("Call storage_model_init");
+ storage_id = find_model_description(surf_storage_model_description, storage_model_name);
+ surf_storage_model_description[storage_id].model_init_preparse();
}
