-/* Copyright (c) 2009-2010 The SimGrid team. All rights reserved. */
+/* Copyright (c) 2009, 2010. 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/config.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"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
"About the configuration of surf (and the rest of the simulation)");
xbt_cfg_t _surf_cfg_set = NULL;
-
/* Parse the command line, looking for options */
static void surf_config_cmd_line(int *argc, char **argv)
{
opt++;
xbt_cfg_set_parse(_surf_cfg_set, opt);
- DEBUG1("Did apply '%s' as config setting", opt);
+ XBT_DEBUG("Did apply '%s' as config setting", opt);
remove_it = 1;
} else if (!strncmp(argv[i], "--cfg-help", strlen("--cfg-help") + 1) ||
!strncmp(argv[i], "--help", strlen("--help") + 1)) {
- printf("Description of the configuration accepted by this simulator:\n");
+ printf
+ ("Description of the configuration accepted by this simulator:\n");
xbt_cfg_help(_surf_cfg_set);
printf("\nYou can also use --help-models to see the details of all models known by this simulator.\n");
+#ifdef HAVE_TRACING
+ printf("\nYou can also use --help-tracing to see the details of all tracing options known by this simulator.\n");
+#endif
exit(0);
- } else if (!strncmp(argv[i], "--help-models", strlen("--help-models")+1)) {
- model_help("workstation",surf_workstation_model_description);
- model_help("CPU",surf_cpu_model_description);
- model_help("network",surf_network_model_description);
+ } else if (!strncmp(argv[i], "--help-models", strlen("--help-models") + 1)) {
+ model_help("workstation", surf_workstation_model_description);
+ model_help("CPU", surf_cpu_model_description);
+ model_help("network", surf_network_model_description);
exit(0);
+#ifdef HAVE_TRACING
+ } else if (!strncmp(argv[i], "--help-tracing", strlen("--help-tracing") + 1)) {
+ TRACE_help (1);
+ exit(0);
+#endif
}
if (remove_it) { /*remove this from argv */
for (j = i + 1; j < *argc; j++) {
{
char *val;
- xbt_assert0(_surf_init_status < 2,
+ 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("workstation",surf_workstation_model_description);
+ if (!strcmp(val, "help")) {
+ model_help("workstation", surf_workstation_model_description);
exit(0);
}
{
char *val;
- xbt_assert0(_surf_init_status < 2,
+ 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("CPU",surf_cpu_model_description);
+ if (!strcmp(val, "help")) {
+ model_help("CPU", surf_cpu_model_description);
exit(0);
}
find_model_description(surf_cpu_model_description, val);
}
+/* callback of the cpu/model variable */
+static void _surf_cfg_cb__optimization_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("optimization", surf_optimization_mode_description);
+ exit(0);
+ }
+
+ /* New Module missing */
+ find_model_description(surf_optimization_mode_description, val);
+}
+
/* callback of the workstation_model variable */
static void _surf_cfg_cb__network_model(const char *name, int pos)
{
char *val;
- xbt_assert0(_surf_init_status < 2,
+ 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("network",surf_network_model_description);
+ if (!strcmp(val, "help")) {
+ model_help("network", surf_network_model_description);
exit(0);
}
/* callbacks of the network models values */
-static void _surf_cfg_cb__tcp_gamma(const char *name, int pos) {
+static void _surf_cfg_cb__tcp_gamma(const char *name, int pos)
+{
sg_tcp_gamma = xbt_cfg_get_double(_surf_cfg_set, name);
}
-static void _surf_cfg_cb__latency_factor(const char *name, int pos) {
+
+static void _surf_cfg_cb__maxmin_precision(const char* name, int pos)
+{
+ sg_maxmin_precision = xbt_cfg_get_double(_surf_cfg_set, name);
+}
+
+static void _surf_cfg_cb__sender_gap(const char* name, int pos)
+{
+ sg_sender_gap = xbt_cfg_get_double(_surf_cfg_set, name);
+}
+
+static void _surf_cfg_cb__latency_factor(const char *name, int pos)
+{
sg_latency_factor = xbt_cfg_get_double(_surf_cfg_set, name);
}
-static void _surf_cfg_cb__bandwidth_factor(const char *name, int pos) {
+
+static void _surf_cfg_cb__bandwidth_factor(const char *name, int pos)
+{
sg_bandwidth_factor = xbt_cfg_get_double(_surf_cfg_set, name);
}
-static void _surf_cfg_cb__weight_S(const char *name, int pos) {
+
+static void _surf_cfg_cb__weight_S(const char *name, int pos)
+{
sg_weight_S_parameter = xbt_cfg_get_double(_surf_cfg_set, name);
}
-static void _surf_cfg_cb__surf_maxmin_selective_update(const char *name, int pos) {
- sg_maxmin_selective_update = xbt_cfg_get_int(_surf_cfg_set, name);
-}
/* callback of the inclusion path */
-static void _surf_cfg_cb__surf_path(const char *name, int pos) {
+static void _surf_cfg_cb__surf_path(const char *name, int pos)
+{
char *path = xbt_cfg_get_string_at(_surf_cfg_set, name, pos);
xbt_dynar_push(surf_path, &path);
}
+/* callback to decide if we want to use the model-checking */
+#include "xbt_modinter.h"
+extern int _surf_do_model_check; /* this variable lives in xbt_main until I find a right location for it */
+
+static void _surf_cfg_cb_model_check(const char *name, int pos)
+{
+ _surf_do_model_check = xbt_cfg_get_int(_surf_cfg_set, name);
+
+ if (_surf_do_model_check) {
+ /* Tell modules using mallocators that they shouldn't. MC don't like them */
+ xbt_fifo_preinit();
+ xbt_dict_preinit();
+ }
+}
+
+extern int _surf_do_verbose_exit;
+
+static void _surf_cfg_cb_verbose_exit(const char *name, int pos)
+{
+ _surf_do_verbose_exit = xbt_cfg_get_int(_surf_cfg_set, name);
+}
+
+
+static void _surf_cfg_cb_context_factory(const char *name, int pos)
+{
+ smx_context_factory_name = xbt_cfg_get_string(_surf_cfg_set, name);
+}
+
+static void _surf_cfg_cb_context_stack_size(const char *name, int pos)
+{
+ smx_context_stack_size = xbt_cfg_get_int(_surf_cfg_set, name) * 1024;
+}
+
+static void _surf_cfg_cb_contexts_nthreads(const char *name, int pos)
+{
+ SIMIX_context_set_nthreads(xbt_cfg_get_int(_surf_cfg_set, name));
+}
+
+static void _surf_cfg_cb_contexts_parallel_threshold(const char *name, int pos)
+{
+ SIMIX_context_set_parallel_threshold(xbt_cfg_get_int(_surf_cfg_set, name));
+}
+
+static void _surf_cfg_cb_contexts_parallel_mode(const char *name, int pos)
+{
+ const char* mode_name = xbt_cfg_get_string(_surf_cfg_set, name);
+ if (!strcmp(mode_name, "posix")) {
+ SIMIX_context_set_parallel_mode(XBT_PARMAP_POSIX);
+ }
+ else if (!strcmp(mode_name, "futex")) {
+ SIMIX_context_set_parallel_mode(XBT_PARMAP_FUTEX);
+ }
+ else if (!strcmp(mode_name, "busy_wait")) {
+ SIMIX_context_set_parallel_mode(XBT_PARMAP_BUSY_WAIT);
+ }
+ else {
+ XBT_WARN("Command line setting of the parallel synchronization mode should "
+ "be one of \"posix\", \"futex\" or \"busy_wait\"");
+ }
+}
+
+static void _surf_cfg_cb__surf_network_coordinates(const char *name,
+ int pos)
+{
+ char *val = xbt_cfg_get_string(_surf_cfg_set, name);
+ if (!strcmp(val, "yes")) {
+ if (!COORD_HOST_LEVEL) {
+ COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
+ COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
+ }
+ } else if (!strcmp(val, "no")) {
+ if (COORD_HOST_LEVEL)
+ XBT_WARN("Setting of whether to use coordinate cannot be disabled once set.");
+ } else {
+ XBT_WARN("Command line setting of whether to use coordinates must be either \"yes\" or \"no\"");
+ }
+}
+
+static void _surf_cfg_cb__surf_network_crosstraffic(const char *name,
+ int pos)
+{
+ sg_network_crosstraffic = xbt_cfg_get_int(_surf_cfg_set, name);
+}
#ifdef HAVE_GTNETS
-static void _surf_cfg_cb__gtnets_jitter(const char *name, int pos){
- sg_gtnets_jitter = xbt_cfg_get_double(_surf_cfg_set, name);
+static void _surf_cfg_cb__gtnets_jitter(const char *name, int pos)
+{
+ sg_gtnets_jitter = xbt_cfg_get_double(_surf_cfg_set, name);
}
-static void _surf_cfg_cb__gtnets_jitter_seed(const char *name, int pos){
- sg_gtnets_jitter_seed = xbt_cfg_get_int(_surf_cfg_set, name);
+
+static void _surf_cfg_cb__gtnets_jitter_seed(const char *name, int pos)
+{
+ sg_gtnets_jitter_seed = xbt_cfg_get_int(_surf_cfg_set, name);
}
#endif
/* create the config set, register what should be and parse the command line*/
void surf_config_init(int *argc, char **argv)
{
+ char *description = xbt_malloc(1024), *p = description;
+ char *default_value;
+ double double_default_value;
+ int default_value_int;
+ int i;
/* Create the configuration support */
if (_surf_init_status == 0) { /* Only create stuff if not already inited */
_surf_init_status = 1;
- char *description = xbt_malloc(1024), *p = description;
- char *default_value;
- double double_default_value;
- int default_value_int;
- int i;
-
- sprintf(description, "The model to use for the CPU. Possible values: ");
+ sprintf(description,
+ "The model to use for the CPU. Possible values: ");
p = description;
while (*(++p) != '\0');
for (i = 0; surf_cpu_model_description[i].name; i++)
- p +=
- sprintf(p, "%s%s", (i == 0 ? "" : ", "),
- surf_cpu_model_description[i].name);
- sprintf(p,".\n (use 'help' as a value to see the long description of each model)");
+ p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+ surf_cpu_model_description[i].name);
+ sprintf(p,
+ ".\n (use 'help' as a value to see the long description of each model)");
default_value = xbt_strdup("Cas01");
xbt_cfg_register(&_surf_cfg_set,
"cpu/model", description, xbt_cfgelm_string,
&default_value, 1, 1, &_surf_cfg_cb__cpu_model, NULL);
+ sprintf(description,
+ "The optimization modes to use for the CPU. Possible values: ");
+ p = description;
+ while (*(++p) != '\0');
+ for (i = 0; surf_optimization_mode_description[i].name; i++)
+ p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+ surf_optimization_mode_description[i].name);
+ sprintf(p,
+ ".\n (use 'help' as a value to see the long description of each optimization mode)");
+ default_value = xbt_strdup("Lazy");
+ 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 network. Possible values: ");
p = description;
while (*(++p) != '\0');
for (i = 0; surf_network_model_description[i].name; i++)
- p +=
- sprintf(p, "%s%s", (i == 0 ? "" : ", "),
- surf_network_model_description[i].name);
- sprintf(p,".\n (use 'help' as a value to see the long description of each model)");
+ p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+ surf_network_model_description[i].name);
+ sprintf(p,
+ ".\n (use 'help' as a value to see the long description of each model)");
default_value = xbt_strdup("LV08");
xbt_cfg_register(&_surf_cfg_set,
"network/model", description, xbt_cfgelm_string,
&default_value, 1, 1, &_surf_cfg_cb__network_model,
NULL);
+ sprintf(description,
+ "The optimization modes to use for the network. Possible values: ");
+ p = description;
+ while (*(++p) != '\0');
+ for (i = 0; surf_optimization_mode_description[i].name; i++)
+ p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+ surf_optimization_mode_description[i].name);
+ sprintf(p,
+ ".\n (use 'help' as a value to see the long description of each optimization mode)");
+ default_value = xbt_strdup("Lazy");
+ xbt_cfg_register(&_surf_cfg_set,
+ "network/optim", description, xbt_cfgelm_string,
+ &default_value, 1, 1, &_surf_cfg_cb__optimization_mode, NULL);
+
sprintf(description,
"The model to use for the workstation. Possible values: ");
p = description;
while (*(++p) != '\0');
for (i = 0; surf_workstation_model_description[i].name; i++)
- p +=
- sprintf(p, "%s%s", (i == 0 ? "" : ", "),
- surf_workstation_model_description[i].name);
- sprintf(p,".\n (use 'help' as a value to see the long description of each model)");
+ p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+ surf_workstation_model_description[i].name);
+ sprintf(p,
+ ".\n (use 'help' as a value to see the long description of each model)");
default_value = xbt_strdup("CLM03");
xbt_cfg_register(&_surf_cfg_set,
"workstation/model", description, xbt_cfgelm_string,
- &default_value, 1, 1, &_surf_cfg_cb__workstation_model,
- NULL);
+ &default_value, 1, 1,
+ &_surf_cfg_cb__workstation_model, NULL);
xbt_free(description);
xbt_cfg_register(&_surf_cfg_set, "TCP_gamma",
"Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; Use the last given value, which is the max window size)",
- xbt_cfgelm_double, NULL, 1, 1, _surf_cfg_cb__tcp_gamma, NULL);
- xbt_cfg_set_double(_surf_cfg_set, "TCP_gamma", 20000.0);
+ xbt_cfgelm_double, NULL, 1, 1,
+ _surf_cfg_cb__tcp_gamma, NULL);
+ xbt_cfg_setdefault_double(_surf_cfg_set, "TCP_gamma", 20000.0);
+
+ xbt_cfg_register(&_surf_cfg_set, "maxmin/precision",
+ "Minimum retained action value when updating simulation",
+ xbt_cfgelm_double, NULL, 1, 1, _surf_cfg_cb__maxmin_precision, NULL);
+ xbt_cfg_setdefault_double(_surf_cfg_set, "maxmin/precision", 0.00001); // FIXME use setdefault everywhere here!
/* The parameters of network models */
+
+ double_default_value = 0.0;
+ xbt_cfg_register(&_surf_cfg_set, "network/sender_gap",
+ "Minimum gap between two overlapping sends",
+ xbt_cfgelm_double, &double_default_value, 1, 1,
+ _surf_cfg_cb__sender_gap, NULL);
+
double_default_value = 1.0;
xbt_cfg_register(&_surf_cfg_set, "network/latency_factor",
"Correction factor to apply to the provided latency (default value set by network model)",
- xbt_cfgelm_double, &double_default_value, 1, 1, _surf_cfg_cb__latency_factor, NULL);
+ xbt_cfgelm_double, &double_default_value, 1, 1,
+ _surf_cfg_cb__latency_factor, NULL);
double_default_value = 1.0;
xbt_cfg_register(&_surf_cfg_set, "network/bandwidth_factor",
"Correction factor to apply to the provided bandwidth (default value set by network model)",
- xbt_cfgelm_double, &double_default_value, 1, 1, _surf_cfg_cb__bandwidth_factor, NULL);
+ xbt_cfgelm_double, &double_default_value, 1, 1,
+ _surf_cfg_cb__bandwidth_factor, NULL);
double_default_value = 0.0;
xbt_cfg_register(&_surf_cfg_set, "network/weight_S",
"Correction factor to apply to the weight of competing streams(default value set by network model)",
- xbt_cfgelm_double, &double_default_value, 1, 1, _surf_cfg_cb__weight_S, NULL);
+ xbt_cfgelm_double, &double_default_value, 1, 1,
+ _surf_cfg_cb__weight_S, NULL);
/* Inclusion path */
xbt_cfg_register(&_surf_cfg_set, "path",
"Lookup path for inclusions in platform and deployment XML files",
- xbt_cfgelm_string, NULL, 0, 0, _surf_cfg_cb__surf_path,
- NULL);
-
- default_value_int = 0;
- xbt_cfg_register(&_surf_cfg_set, "maxmin_selective_update",
- "Update the constraint set propagating recursively to others constraints",
- xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb__surf_maxmin_selective_update, NULL);
+ xbt_cfgelm_string, NULL, 0, 0,
+ _surf_cfg_cb__surf_path, NULL);
+
+ default_value_int = 0;
+ xbt_cfg_register(&_surf_cfg_set, "cpu/maxmin_selective_update",
+ "Update the constraint set propagating recursively to others constraints (1 by default when optim is set to lazy)",
+ xbt_cfgelm_int, &default_value_int, 0, 1,
+ NULL, NULL);
+ default_value_int = 0;
+ xbt_cfg_register(&_surf_cfg_set, "network/maxmin_selective_update",
+ "Update the constraint set propagating recursively to others constraints (1 by default when optim is set to lazy)",
+ xbt_cfgelm_int, &default_value_int, 0, 1,
+ NULL, NULL);
+
+ /* do model-check */
+ default_value_int = 0;
+ xbt_cfg_register(&_surf_cfg_set, "model-check",
+ "Activate the model-checking of the \"simulated\" system (EXPERIMENTAL -- msg only for now)",
+ xbt_cfgelm_int, &default_value_int, 0, 1,
+ _surf_cfg_cb_model_check, NULL);
+
+ /*
+ FIXME: this function is not setting model-check to it's default value because
+ internally it calls to variable->cb_set that in this case is the function
+ _surf_cfg_cb_model_check which sets it's value to 1 (instead of the default value 0)
+ xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */
+
+ /* do verbose-exit */
+ default_value_int = 0;
+ xbt_cfg_register(&_surf_cfg_set, "verbose-exit",
+ "Activate the \"do nothing\" mode in Ctrl-C",
+ xbt_cfgelm_int, &default_value_int, 0, 1,
+ _surf_cfg_cb_verbose_exit, NULL);
+
+
+ /* context factory */
+ default_value = xbt_strdup("ucontext");
+ xbt_cfg_register(&_surf_cfg_set, "contexts/factory",
+ "Context factory to use in SIMIX (ucontext, thread or raw)",
+ xbt_cfgelm_string, &default_value, 1, 1, _surf_cfg_cb_context_factory, NULL);
+
+ /* stack size of contexts in Ko */
+ default_value_int = 128;
+ xbt_cfg_register(&_surf_cfg_set, "contexts/stack_size",
+ "Stack size of contexts in Ko (ucontext or raw only)",
+ xbt_cfgelm_int, &default_value_int, 1, 1,
+ _surf_cfg_cb_context_stack_size, NULL);
+
+ /* number of parallel threads for user processes */
+ default_value_int = 1;
+ xbt_cfg_register(&_surf_cfg_set, "contexts/nthreads",
+ "Number of parallel threads for user contexts (EXPERIMENTAL)",
+ xbt_cfgelm_int, &default_value_int, 1, 1,
+ _surf_cfg_cb_contexts_nthreads, NULL);
+
+ /* minimal number of user contexts to be run in parallel */
+ default_value_int = 1;
+ xbt_cfg_register(&_surf_cfg_set, "contexts/parallel_threshold",
+ "Minimal number of user contexts to be run in parallel (raw contexts only)",
+ 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 */
+ default_value = xbt_strdup("futex");
+ xbt_cfg_register(&_surf_cfg_set, "contexts/parallel_mode",
+ "Synchronization mode to use when running contexts in parallel",
+ xbt_cfgelm_string, &default_value, 1, 1,
+ _surf_cfg_cb_contexts_parallel_mode, NULL);
+
+ default_value = xbt_strdup("no");
+ xbt_cfg_register(&_surf_cfg_set, "coordinates",
+ "\"yes\" or \"no\" (FIXME: document)",
+ xbt_cfgelm_string, &default_value, 1, 1,
+ _surf_cfg_cb__surf_network_coordinates, NULL);
+ xbt_cfg_setdefault_string(_surf_cfg_set, "coordinates", default_value);
+
+ default_value_int = 0;
+ xbt_cfg_register(&_surf_cfg_set, "network/crosstraffic",
+ "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)",
+ xbt_cfgelm_int, &default_value_int, 0, 1,
+ _surf_cfg_cb__surf_network_crosstraffic, NULL);
+ xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", default_value_int);
#ifdef HAVE_GTNETS
xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter",
- "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_set_double(_surf_cfg_set, "gtnets_jitter", 0.0);
+ "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);
default_value_int = 10;
xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter_seed",
"Use a positive seed to reproduce jitted results, value must be in [1,1e8], default is 10",
- xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb__gtnets_jitter_seed, NULL);
+ xbt_cfgelm_int, &default_value_int, 0, 1,
+ _surf_cfg_cb__gtnets_jitter_seed, NULL);
+#endif
+#ifdef HAVE_NS3
+ xbt_cfg_register(&_surf_cfg_set, "ns3/TcpModel",
+ "The ns3 tcp model can be : NewReno or Reno or Tahoe",
+ xbt_cfgelm_string, NULL, 1, 1,
+ NULL, NULL);
+ xbt_cfg_setdefault_string(_surf_cfg_set, "ns3/TcpModel", "default");
#endif
-
if (!surf_path) {
/* retrieves the current directory of the current process */
const char *initial_path = __surf_get_initial_path();
- xbt_assert0((initial_path),
+ xbt_assert((initial_path),
"__surf_get_initial_path() failed! Can't resolves current Windows directory");
surf_path = xbt_dynar_new(sizeof(char *), NULL);
- xbt_cfg_set_string(_surf_cfg_set, "path", initial_path);
+ xbt_cfg_setdefault_string(_surf_cfg_set, "path", initial_path);
}
surf_config_cmd_line(argc, argv);
} else {
- WARN0("Call to surf_config_init() after initialization ignored");
+ XBT_WARN("Call to surf_config_init() after initialization ignored");
}
}
_surf_init_status = 0;
}
-void surf_config_models_setup(const char *platform_file)
+/* Pick the right models for CPU, net and workstation, and call their model_init_preparse */
+void surf_config_models_setup()
{
char *workstation_model_name;
int workstation_id = -1;
-
- surf_timer_model_init(platform_file);
+ char *network_model_name = NULL;
+ char *cpu_model_name = NULL;
workstation_model_name =
- xbt_cfg_get_string(_surf_cfg_set, "workstation/model");
- char *network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network/model");
- char *cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu/model");
-
- if ((strcmp(network_model_name,"LV08") || strcmp(cpu_model_name,"Cas01"))
- && !strcmp(workstation_model_name, "CLM03")){
- const char *val = "compound";
- INFO0("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_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");
+
+ /* 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
+ * the right net/cpu models.
+ */
+
+ 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"))
+ {
+ 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";
}
- DEBUG1("Workstation model: %s", workstation_model_name);
+ XBT_DEBUG("Workstation model: %s", workstation_model_name);
workstation_id =
- find_model_description(surf_workstation_model_description,
- workstation_model_name);
+ find_model_description(surf_workstation_model_description,
+ workstation_model_name);
if (!strcmp(workstation_model_name, "compound")) {
int network_id = -1;
int cpu_id = -1;
- xbt_assert0(cpu_model_name,
- "Set a cpu model to use with the 'compound' workstation model");
+ xbt_assert(cpu_model_name,
+ "Set a cpu model to use with the 'compound' workstation model");
- xbt_assert0(network_model_name,
- "Set a network model to use with the 'compound' workstation model");
+ xbt_assert(network_model_name,
+ "Set a network model to use with the 'compound' workstation model");
network_id =
- find_model_description(surf_network_model_description,
- network_model_name);
+ find_model_description(surf_network_model_description,
+ network_model_name);
cpu_id =
- find_model_description(surf_cpu_model_description, cpu_model_name);
+ find_model_description(surf_cpu_model_description, cpu_model_name);
- surf_cpu_model_description[cpu_id].model_init_preparse(platform_file);
- surf_network_model_description[network_id].
- model_init_preparse(platform_file);
+ surf_cpu_model_description[cpu_id].model_init_preparse();
+ surf_network_model_description[network_id].model_init_preparse();
}
- DEBUG0("Call workstation_model_init");
- surf_workstation_model_description[workstation_id].model_init_preparse
- (platform_file);
-}
-
-void surf_config_models_create_elms(void)
-{
- char *workstation_model_name =
- xbt_cfg_get_string(_surf_cfg_set, "workstation/model");
- int workstation_id =
- find_model_description(surf_workstation_model_description,
- workstation_model_name);
- if (surf_workstation_model_description[workstation_id].
- model_init_postparse != NULL)
- surf_workstation_model_description[workstation_id].model_init_postparse();
+ XBT_DEBUG("Call workstation_model_init");
+ surf_workstation_model_description[workstation_id].model_init_preparse();
}
