X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8461d5fbbf4d4f12a92d4a1f3924cf2f8e040e4c..846279ff21bca796cbd1eb12ace540ff5ad0abb6:/src/surf/surf_config.c diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index dc156cb08d..6cd40b291d 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -44,8 +44,14 @@ static void surf_config_cmd_line(int *argc, char **argv) exit(0); } else if (!strncmp(argv[i], "--help-models", strlen("--help-models") + 1)) { model_help("workstation", surf_workstation_model_description); + printf("\n"); model_help("CPU", surf_cpu_model_description); + printf("\n"); model_help("network", surf_network_model_description); + printf("\nLong description of all optimization levels accepted by the models of this simulator:\n"); + for (i = 0; surf_optimization_mode_description[i].name; i++) + 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); #ifdef HAVE_TRACING } else if (!strncmp(argv[i], "--help-tracing", strlen("--help-tracing") + 1)) { @@ -178,12 +184,6 @@ 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) { @@ -226,7 +226,7 @@ static void _surf_cfg_cb_context_stack_size(const char *name, int pos) static void _surf_cfg_cb_contexts_nthreads(const char *name, int pos) { - SIMIX_context_set_nthreads(xbt_cfg_get_int(_surf_cfg_set, name)); + SIMIX_context_set_nthreads(xbt_cfg_get_string(_surf_cfg_set, name)); } static void _surf_cfg_cb_contexts_parallel_threshold(const char *name, int pos) @@ -247,11 +247,16 @@ static void _surf_cfg_cb_contexts_parallel_mode(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) { @@ -263,16 +268,16 @@ static void _surf_cfg_cb__surf_network_coordinates(const char *name, } } else if (!strcmp(val, "no")) { if (COORD_HOST_LEVEL) - XBT_WARN("Setting of whether to use coordinate cannot be disabled once set."); + xbt_die("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\""); + xbt_die("Command line setting of whether to use coordinates must be either \"yes\" or \"no\""); } } -static void _surf_cfg_cb__surf_network_fullduplex(const char *name, +static void _surf_cfg_cb__surf_network_crosstraffic(const char *name, int pos) { - sg_network_fullduplex = xbt_cfg_get_int(_surf_cfg_set, name); + sg_network_crosstraffic = xbt_cfg_get_int(_surf_cfg_set, name); } #ifdef HAVE_GTNETS @@ -310,8 +315,7 @@ void surf_config_init(int *argc, char **argv) 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, + xbt_cfg_register(&_surf_cfg_set, "cpu/model", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__cpu_model, NULL); sprintf(description, @@ -324,8 +328,7 @@ void surf_config_init(int *argc, char **argv) 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, + xbt_cfg_register(&_surf_cfg_set, "cpu/optim", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__optimization_mode, NULL); sprintf(description, @@ -338,8 +341,7 @@ void surf_config_init(int *argc, char **argv) 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, + xbt_cfg_register(&_surf_cfg_set, "network/model", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__network_model, NULL); @@ -353,8 +355,7 @@ void surf_config_init(int *argc, char **argv) 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, + xbt_cfg_register(&_surf_cfg_set, "network/optim", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__optimization_mode, NULL); sprintf(description, @@ -366,27 +367,21 @@ void surf_config_init(int *argc, char **argv) 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 = xbt_strdup("default"); + xbt_cfg_register(&_surf_cfg_set, "workstation/model", description, xbt_cfgelm_string, &default_value, 1, 1, &_surf_cfg_cb__workstation_model, NULL); xbt_free(description); - 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_cfg_register(&_surf_cfg_set, "TCP_gamma", + xbt_cfg_register(&_surf_cfg_set, "network/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_setdefault_double(_surf_cfg_set, "TCP_gamma", 20000.0); + xbt_cfg_setdefault_double(_surf_cfg_set, "network/TCP_gamma", 20000.0); xbt_cfg_register(&_surf_cfg_set, "maxmin/precision", - "Minimum retained action value when updating simulation", + "Numerical precision used when updating simulation models (epsilon in double comparisons)", 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! @@ -421,10 +416,15 @@ void surf_config_init(int *argc, char **argv) _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_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, - _surf_cfg_cb__surf_maxmin_selective_update, NULL); + 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; @@ -440,7 +440,7 @@ void surf_config_init(int *argc, char **argv) xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */ /* do verbose-exit */ - default_value_int = 0; + default_value_int = 1; xbt_cfg_register(&_surf_cfg_set, "verbose-exit", "Activate the \"do nothing\" mode in Ctrl-C", xbt_cfgelm_int, &default_value_int, 0, 1, @@ -456,54 +456,65 @@ void surf_config_init(int *argc, char **argv) /* 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)", + "Stack size of contexts in Kib (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; + default_value = xbt_strdup("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, + "Number of parallel threads used to execute user contexts", + xbt_cfgelm_string, &default_value, 1, 1, _surf_cfg_cb_contexts_nthreads, NULL); /* minimal number of user contexts to be run in parallel */ - default_value_int = 1; + default_value_int = 2; 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 */ + /* synchronization mode for parallel user contexts */ +#ifdef HAVE_FUTEX_H default_value = xbt_strdup("futex"); - xbt_cfg_register(&_surf_cfg_set, "contexts/parallel_mode", - "Synchronization mode to use when running contexts in parallel", +#else //No futex on mac and posix is unimplememted yet + default_value = xbt_strdup("busy_wait"); +#endif + xbt_cfg_register(&_surf_cfg_set, "contexts/synchro", + "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)", 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, "coordinates", - "\"yes\" or \"no\" (FIXME: document)", + xbt_cfg_register(&_surf_cfg_set, "network/coordinates", + "\"yes\" or \"no\", specifying whether we use a coordinate-based routing (as Vivaldi)", xbt_cfgelm_string, &default_value, 1, 1, _surf_cfg_cb__surf_network_coordinates, NULL); - xbt_cfg_setdefault_string(_surf_cfg_set, "coordinates", default_value); + xbt_cfg_setdefault_string(_surf_cfg_set, "network/coordinates", default_value); default_value_int = 0; - xbt_cfg_register(&_surf_cfg_set, "fullduplex", + 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_fullduplex, NULL); - xbt_cfg_setdefault_int(_surf_cfg_set, "fullduplex", default_value_int); + _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", + 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_setdefault_double(_surf_cfg_set, "gtnets_jitter", 0.0); default_value_int = 10; - xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter_seed", + 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); @@ -515,6 +526,45 @@ void surf_config_init(int *argc, char **argv) NULL, NULL); xbt_cfg_setdefault_string(_surf_cfg_set, "ns3/TcpModel", "default"); #endif + +//SMPI + double default_reference_speed = 20000.0; + xbt_cfg_register(&_surf_cfg_set, "smpi/running_power", + "Power of the host running the simulation (in flop/s). Used to bench the operations.", + xbt_cfgelm_double, &default_reference_speed, 1, 1, NULL, + NULL); + + int default_display_timing = 0; + xbt_cfg_register(&_surf_cfg_set, "smpi/display_timing", + "Boolean indicating whether we should display the timing after simulation.", + xbt_cfgelm_int, &default_display_timing, 1, 1, NULL, + NULL); + + double default_threshold = 1e-6; + xbt_cfg_register(&_surf_cfg_set, "smpi/cpu_threshold", + "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 + 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 + + if (!surf_path) { /* retrieves the current directory of the current process */ const char *initial_path = __surf_get_initial_path();