X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78e5edee4cb3845cedd7b603d611129cce6a14e9..aa252590f8b8836497d92ebda9afd9a8fa192e13:/src/surf/surf_config.c diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index 649e6fe00b..455a5a92e3 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -1,6 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2009 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. */ @@ -15,9 +14,7 @@ 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; -#ifdef HAVE_GTNETS -extern double sg_gtnets_jitter; -#endif + /* Parse the command line, looking for options */ static void surf_config_cmd_line(int *argc, char **argv) @@ -36,10 +33,14 @@ static void surf_config_cmd_line(int *argc, char **argv) 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); - remove_it = 1; + printf("\nYou can also use --help-models to see the details of all models known by this simulator.\n"); + 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); exit(0); } if (remove_it) { /*remove this from argv */ @@ -59,7 +60,7 @@ int _surf_init_status = 0; /* 0: beginning of time; 1: pre-inited (cfg_set created); 2: inited (running) */ -/* callback of the workstation_model variable */ +/* callback of the workstation/model variable */ static void _surf_cfg_cb__workstation_model(const char *name, int pos) { char *val; @@ -68,12 +69,17 @@ static void _surf_cfg_cb__workstation_model(const char *name, int pos) "Cannot change the model after the initialization"); val = xbt_cfg_get_string(_surf_cfg_set, name); - /* New Module missing */ + if (!strcmp(val,"help")) { + model_help("workstation",surf_workstation_model_description); + exit(0); + } + + /* Make sure that the model exists */ find_model_description(surf_workstation_model_description, val); } -/* callback of the cpu_model variable */ +/* callback of the cpu/model variable */ static void _surf_cfg_cb__cpu_model(const char *name, int pos) { char *val; @@ -82,6 +88,12 @@ static void _surf_cfg_cb__cpu_model(const char *name, int pos) "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); + exit(0); + } + /* New Module missing */ find_model_description(surf_cpu_model_description, val); } @@ -95,31 +107,58 @@ static void _surf_cfg_cb__network_model(const char *name, int pos) "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); + exit(0); + } + /* New Module missing */ find_model_description(surf_network_model_description, val); } -/* callback of the tcp gamma variable */ -static void _surf_cfg_cb__tcp_gamma(const char *name, int pos) -{ + +/* callbacks of the network models values */ +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) { + sg_latency_factor = xbt_cfg_get_double(_surf_cfg_set, name); +} +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) { + 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); +} -static void _surf_cfg_cb__surf_path(const char *name, int pos) -{ +/* callback of the inclusion path */ +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); } -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 to decide if we want to use the model-checking */ +#include "xbt_modinter.h" +int _surf_do_model_check = 0; /* this variable is used accros the lib */ + +static void _surf_cfg_cb_model_check(const char *name, int pos) { + _surf_do_model_check = 1; + /* Tell modules using mallocators that they shouldn't. MC don't like them */ + xbt_fifo_preinit(); + xbt_dict_preinit(); } #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_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*/ @@ -132,7 +171,8 @@ void surf_config_init(int *argc, char **argv) char *description = xbt_malloc(1024), *p = description; char *default_value; - int default_value_int; + double double_default_value; + int default_value_int; int i; sprintf(description, "The model to use for the CPU. Possible values: "); @@ -142,9 +182,10 @@ void surf_config_init(int *argc, char **argv) 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, + "cpu/model", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__cpu_model, NULL); sprintf(description, @@ -155,9 +196,10 @@ void surf_config_init(int *argc, char **argv) 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, + "network/model", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__network_model, NULL); @@ -169,9 +211,10 @@ void surf_config_init(int *argc, char **argv) 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, + "workstation/model", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__workstation_model, NULL); @@ -180,14 +223,28 @@ void surf_config_init(int *argc, char **argv) default_value = xbt_strdup("Full"); xbt_cfg_register(&_surf_cfg_set, "routing", "Model to use to store the routing information", - xbt_cfgelm_string, &default_value, 1, 1, NULL, - NULL); + xbt_cfgelm_string, &default_value, 1, 1, NULL, NULL); xbt_cfg_register(&_surf_cfg_set, "TCP_gamma", - "Size of the biggest TCP window", xbt_cfgelm_double, - NULL, 1, 1, _surf_cfg_cb__tcp_gamma, NULL); + "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); + /* The parameters of network models */ + 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); + 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); + 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); + + /* 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, @@ -198,11 +255,22 @@ void surf_config_init(int *argc, char **argv) "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); + /* 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); + #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", 1.0); + xbt_cfg_set_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); #endif if (!surf_path) { @@ -217,6 +285,8 @@ void surf_config_init(int *argc, char **argv) surf_config_cmd_line(argc, argv); + } else { + WARN0("Call to surf_config_init() after initialization ignored"); } } @@ -237,15 +307,15 @@ void surf_config_models_setup(const char *platform_file) surf_timer_model_init(platform_file); 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"); + 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); + xbt_cfg_set_string(_surf_cfg_set,"workstation/model",val); workstation_model_name = (char*)"compound"; } @@ -282,7 +352,7 @@ void surf_config_models_setup(const char *platform_file) void surf_config_models_create_elms(void) { char *workstation_model_name = - xbt_cfg_get_string(_surf_cfg_set, "workstation_model"); + xbt_cfg_get_string(_surf_cfg_set, "workstation/model"); int workstation_id = find_model_description(surf_workstation_model_description, workstation_model_name);