X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d9a2608433e246294b7c4b339371fd4d3530ba6..283236f8e2414d7c30d46e6d1aea0e8882699dd1:/src/simgrid/sg_config.c diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c index c39e34efbf..1726748132 100644 --- a/src/simgrid/sg_config.c +++ b/src/simgrid/sg_config.c @@ -11,24 +11,22 @@ #include "xbt/log.h" #include "xbt/mallocator.h" #include "xbt/str.h" -#include "surf/surf_private.h" -#include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */ +#include "xbt/lib.h" +#include "xbt/sysdep.h" +#include "surf/surf.h" +#include "surf/maxmin.h" +#include "instr/instr_interface.h" #include "simgrid/simix.h" #include "simgrid/sg_config.h" -#include "mc/mc.h" +#include "smpi/smpi_interface.h" +#include "mc/mc.h" +#include "instr/instr.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of simgrid"); xbt_cfg_t _sg_cfg_set = NULL; -int _sg_do_model_check = 0; -int _surf_mc_checkpoint=0; -char* _surf_mc_property_file=NULL; -int _surf_mc_timeout=0; -int _surf_mc_max_depth=1000; -int _surf_mc_visited=0; - int _sg_init_status = 0; /* 0: beginning of time (config cannot be changed yet); 1: initialized: cfg_set created (config can now be changed); 2: configured: command line parsed and config part of platform file was integrated also, platform construction ongoing or done. @@ -101,7 +99,6 @@ static void sg_config_cmd_line(int *argc, char **argv) } } - /* callback of the workstation/model variable */ static void _sg_cfg_cb__workstation_model(const char *name, int pos) { @@ -229,6 +226,67 @@ static void _sg_cfg_cb__weight_S(const char *name, int pos) sg_weight_S_parameter = xbt_cfg_get_double(_sg_cfg_set, name); } +#ifdef HAVE_SMPI +/* callback of the mpi collectives */ +static void _sg_cfg_cb__coll(const char *category, + s_mpi_coll_description_t * table, + const char *name, int pos) +{ + char *val; + + xbt_assert(_sg_init_status == 1, + "Cannot change the model after the initialization"); + + val = xbt_cfg_get_string(_sg_cfg_set, name); + + if (!strcmp(val, "help")) { + coll_help(category, table); + exit(0); + } + + /* New Module missing */ + find_coll_description(table, val); +} +static void _sg_cfg_cb__coll_gather(const char *name, int pos){ + _sg_cfg_cb__coll("gather", mpi_coll_gather_description, name, pos); +} +static void _sg_cfg_cb__coll_allgather(const char *name, int pos){ + _sg_cfg_cb__coll("allgather", mpi_coll_allgather_description, name, pos); +} +static void _sg_cfg_cb__coll_allgatherv(const char *name, int pos){ + _sg_cfg_cb__coll("allgatherv", mpi_coll_allgatherv_description, name, pos); +} +static void _sg_cfg_cb__coll_allreduce(const char *name, int pos) +{ + _sg_cfg_cb__coll("allreduce", mpi_coll_allreduce_description, name, pos); +} +static void _sg_cfg_cb__coll_alltoall(const char *name, int pos) +{ + _sg_cfg_cb__coll("alltoall", mpi_coll_alltoall_description, name, pos); +} +static void _sg_cfg_cb__coll_alltoallv(const char *name, int pos) +{ + _sg_cfg_cb__coll("alltoallv", mpi_coll_alltoallv_description, name, pos); +} +static void _sg_cfg_cb__coll_bcast(const char *name, int pos) +{ + _sg_cfg_cb__coll("bcast", mpi_coll_bcast_description, name, pos); +} +static void _sg_cfg_cb__coll_reduce(const char *name, int pos) +{ + _sg_cfg_cb__coll("reduce", mpi_coll_reduce_description, name, pos); +} +static void _sg_cfg_cb__coll_reduce_scatter(const char *name, int pos){ + _sg_cfg_cb__coll("reduce_scatter", mpi_coll_reduce_scatter_description, name, pos); +} +static void _sg_cfg_cb__coll_scatter(const char *name, int pos){ + _sg_cfg_cb__coll("scatter", mpi_coll_scatter_description, name, pos); +} +static void _sg_cfg_cb__coll_barrier(const char *name, int pos){ + _sg_cfg_cb__coll("barrier", mpi_coll_barrier_description, name, pos); +} +#endif + /* callback of the inclusion path */ static void _sg_cfg_cb__surf_path(const char *name, int pos) { @@ -238,14 +296,16 @@ static void _sg_cfg_cb__surf_path(const char *name, int pos) /* callback to decide if we want to use the model-checking */ #include "xbt_modinter.h" +#ifdef HAVE_MC extern int _sg_do_model_check; /* this variable lives in xbt_main until I find a right location for it */ +#endif static void _sg_cfg_cb_model_check(const char *name, int pos) { - _sg_do_model_check = xbt_cfg_get_int(_sg_cfg_set, name); - -#ifndef HAVE_MC - if (_sg_do_model_check) { +#ifdef HAVE_MC + _sg_do_model_check = xbt_cfg_get_boolean(_sg_cfg_set, name); +#else + if (xbt_cfg_get_boolean(_sg_cfg_set, name)) { xbt_die("You tried to activate the model-checking from the command line, but it was not compiled in. Change your settings in cmake, recompile and try again"); } #endif @@ -255,7 +315,7 @@ extern int _sg_do_verbose_exit; static void _sg_cfg_cb_verbose_exit(const char *name, int pos) { - _sg_do_verbose_exit = xbt_cfg_get_int(_sg_cfg_set, name); + _sg_do_verbose_exit = xbt_cfg_get_boolean(_sg_cfg_set, name); } @@ -297,32 +357,24 @@ static void _sg_cfg_cb_contexts_parallel_mode(const char *name, int pos) } } -static void _sg_cfg_cb_surf_nthreads(const char *name, int pos) -{ - surf_set_nthreads(xbt_cfg_get_int(_sg_cfg_set, name)); -} - static void _sg_cfg_cb__surf_network_coordinates(const char *name, int pos) { - char *val = xbt_cfg_get_string(_sg_cfg_set, name); - if (!strcmp(val, "yes")) { + int val = xbt_cfg_get_boolean(_sg_cfg_set, name); + if (val) { 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")) { + } else if (COORD_HOST_LEVEL) xbt_die("Setting of whether to use coordinate cannot be disabled once set."); - } else { - xbt_die("Command line setting of whether to use coordinates must be either \"yes\" or \"no\""); - } } static void _sg_cfg_cb__surf_network_crosstraffic(const char *name, int pos) { - sg_network_crosstraffic = xbt_cfg_get_int(_sg_cfg_set, name); + sg_network_crosstraffic = xbt_cfg_get_boolean(_sg_cfg_set, name); } #ifdef HAVE_GTNETS @@ -457,17 +509,16 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register(&_sg_cfg_set, "maxmin/precision", "Numerical precision used when updating simulation models (epsilon in double comparisons)", xbt_cfgelm_double, NULL, 1, 1, _sg_cfg_cb__maxmin_precision, NULL); - xbt_cfg_setdefault_double(_sg_cfg_set, "maxmin/precision", 0.00001); // FIXME use setdefault everywhere here! + xbt_cfg_setdefault_double(_sg_cfg_set, "maxmin/precision", 0.00001); /* The parameters of network models */ - double_default_value = 0.0; xbt_cfg_register(&_sg_cfg_set, "network/sender_gap", "Minimum gap between two overlapping sends", - xbt_cfgelm_double, &double_default_value, 1, 1, + xbt_cfgelm_double, NULL, 1, 1, /* default is set in network.c */ _sg_cfg_cb__sender_gap, NULL); - double_default_value = 1.0; + double_default_value = 1.0; // FIXME use setdefault everywhere here! xbt_cfg_register(&_sg_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, @@ -477,10 +528,10 @@ void sg_config_init(int *argc, char **argv) "Correction factor to apply to the provided bandwidth (default value set by network model)", xbt_cfgelm_double, &double_default_value, 1, 1, _sg_cfg_cb__bandwidth_factor, NULL); - double_default_value = 0.0; + xbt_cfg_register(&_sg_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, + "Correction factor to apply to the weight of competing streams (default value set by network model)", + xbt_cfgelm_double, NULL, 1, 1, /* default is set in network.c */ _sg_cfg_cb__weight_S, NULL); /* Inclusion path */ @@ -489,32 +540,34 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_string, NULL, 0, 0, _sg_cfg_cb__surf_path, NULL); - default_value_int = 0; + default_value = xbt_strdup("off"); xbt_cfg_register(&_sg_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, + "Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)", + xbt_cfgelm_boolean, &default_value, 0, 1, NULL, NULL); - default_value_int = 0; + default_value = xbt_strdup("off"); xbt_cfg_register(&_sg_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, + "Update the constraint set propagating recursively to others constraints (off by default when optim is set to lazy)", + xbt_cfgelm_boolean, &default_value, 0, 1, NULL, NULL); #ifdef HAVE_MC /* do model-checking */ + default_value = xbt_strdup("off"); xbt_cfg_register(&_sg_cfg_set, "model-check", "Verify the system through model-checking instead of simulating it (EXPERIMENTAL)", - xbt_cfgelm_int, NULL, 0, 1, + xbt_cfgelm_boolean, NULL, 0, 1, _sg_cfg_cb_model_check, NULL); - xbt_cfg_setdefault_int(_sg_cfg_set, "model-check", 0); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check", default_value); /* do stateful model-checking */ + default_value = xbt_strdup("off"); xbt_cfg_register(&_sg_cfg_set, "model-check/checkpoint", - "Specify the amount of steps between checkpoints during stateful model-checking (default: 0 => stateless verification). " - "If value=1, one checkpoint is saved for each step => faster verification, but huge memory consumption; higher values are good compromises between speed and memory consumption.", - xbt_cfgelm_int, NULL, 0, 1, + "Specify the amount of steps between checkpoints during stateful model-checking (default: off => stateless verification). " + "If value=on, one checkpoint is saved for each step => faster verification, but huge memory consumption; higher values are good compromises between speed and memory consumption.", + xbt_cfgelm_boolean, NULL, 0, 1, _mc_cfg_cb_checkpoint, NULL); - xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/checkpoint", 0); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/checkpoint", default_value); /* do liveness model-checking */ xbt_cfg_register(&_sg_cfg_set, "model-check/property", @@ -531,11 +584,12 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_setdefault_string(_sg_cfg_set, "model-check/reduction", "dpor"); /* Enable/disable timeout for wait requests with model-checking */ + default_value = xbt_strdup("off"); xbt_cfg_register(&_sg_cfg_set, "model-check/timeout", "Enable/Disable timeout for wait requests", - xbt_cfgelm_int, NULL, 0, 1, + xbt_cfgelm_boolean, NULL, 0, 1, _mc_cfg_cb_timeout, NULL); - xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/timeout", 0); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/timeout", default_value); /* Set max depth exploration */ xbt_cfg_register(&_sg_cfg_set, "model-check/max_depth", @@ -550,13 +604,20 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_int, NULL, 0, 1, _mc_cfg_cb_visited, NULL); xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/visited", 0); + + /* Set file name for dot output of graph state */ + xbt_cfg_register(&_sg_cfg_set, "model-check/dot_output", + "Specify the name of dot file corresponding to graph state", + xbt_cfgelm_string, NULL, 0, 1, + _mc_cfg_cb_dot_output, NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "model-check/dot_output", ""); #endif /* do verbose-exit */ - default_value_int = 1; + default_value = xbt_strdup("on"); xbt_cfg_register(&_sg_cfg_set, "verbose-exit", "Activate the \"do nothing\" mode in Ctrl-C", - xbt_cfgelm_int, &default_value_int, 0, 1, + xbt_cfgelm_boolean, &default_value, 0, 1, _sg_cfg_cb_verbose_exit, NULL); @@ -598,26 +659,19 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_string, &default_value, 1, 1, _sg_cfg_cb_contexts_parallel_mode, NULL); - /* number of parallel threads for Surf */ - default_value_int = surf_get_nthreads(); - xbt_cfg_register(&_sg_cfg_set, "surf/nthreads", - "Number of parallel threads used to update Surf models", - xbt_cfgelm_int, &default_value_int, 1, 1, - _sg_cfg_cb_surf_nthreads, NULL); - default_value = xbt_strdup("no"); xbt_cfg_register(&_sg_cfg_set, "network/coordinates", "\"yes\" or \"no\", specifying whether we use a coordinate-based routing (as Vivaldi)", - xbt_cfgelm_string, &default_value, 1, 1, + xbt_cfgelm_boolean, &default_value, 1, 1, _sg_cfg_cb__surf_network_coordinates, NULL); - xbt_cfg_setdefault_string(_sg_cfg_set, "network/coordinates", default_value); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/coordinates", default_value); - default_value_int = 0; + default_value = xbt_strdup("no"); xbt_cfg_register(&_sg_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, + xbt_cfgelm_boolean, &default_value, 0, 1, _sg_cfg_cb__surf_network_crosstraffic, NULL); - xbt_cfg_setdefault_int(_sg_cfg_set, "network/crosstraffic", default_value_int); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", default_value); #ifdef HAVE_GTNETS xbt_cfg_register(&_sg_cfg_set, "gtnets/jitter", @@ -640,18 +694,19 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_setdefault_string(_sg_cfg_set, "ns3/TcpModel", "default"); #endif -//SMPI +#ifdef HAVE_SMPI double default_reference_speed = 20000.0; xbt_cfg_register(&_sg_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; + default_value = xbt_strdup("no"); xbt_cfg_register(&_sg_cfg_set, "smpi/display_timing", "Boolean indicating whether we should display the timing after simulation.", - xbt_cfgelm_int, &default_display_timing, 1, 1, NULL, + xbt_cfgelm_boolean, &default_value, 1, 1, NULL, NULL); + xbt_cfg_setdefault_boolean(_sg_cfg_set, "smpi/display_timing", default_value); double default_threshold = 1e-6; xbt_cfg_register(&_sg_cfg_set, "smpi/cpu_threshold", @@ -665,6 +720,12 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_int, &default_small_messages_threshold, 1, 1, NULL, NULL); + int default_send_is_detached_threshold = 65536; + xbt_cfg_register(&_sg_cfg_set, "smpi/send_is_detached_thres", + "Threshold of message size where MPI_Send stops behaving like MPI_Isend and becomes MPI_Ssend", + xbt_cfgelm_int, &default_send_is_detached_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; @@ -681,8 +742,90 @@ void sg_config_init(int *argc, char **argv) xbt_cfgelm_string, NULL, 1, 1, NULL, NULL); xbt_cfg_setdefault_string(_sg_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 + xbt_cfg_register(&_sg_cfg_set, "smpi/os", + "Small messages timings (MPI_Send minimum time for small messages)", + xbt_cfgelm_string, NULL, 1, 1, NULL, + NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/os", "1:0:0:0:0"); + + xbt_cfg_register(&_sg_cfg_set, "smpi/ois", + "Small messages timings (MPI_Isend minimum time for small messages)", + xbt_cfgelm_string, NULL, 1, 1, NULL, + NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/ois", "1:0:0:0:0"); + + xbt_cfg_register(&_sg_cfg_set, "smpi/or", + "Small messages timings (MPI_Recv minimum time for small messages)", + xbt_cfgelm_string, NULL, 1, 1, NULL, + NULL); + xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/or", "1:0:0:0:0"); + double default_iprobe_time = 1e-4; + xbt_cfg_register(&_sg_cfg_set, "smpi/iprobe", + "Minimum time to inject inside a call to MPI_Iprobe", + xbt_cfgelm_double, &default_iprobe_time, 1, 1, NULL, + NULL); + default_value = xbt_strdup("default"); + xbt_cfg_register(&_sg_cfg_set, "smpi/coll_selector", + "Which collective selector to use", + xbt_cfgelm_string, &default_value, 1, 1, NULL, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/gather", + "Which collective to use for gather", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_gather, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/allgather", + "Which collective to use for allgather", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_allgather, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/barrier", + "Which collective to use for barrier", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_barrier, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/reduce_scatter", + "Which collective to use for reduce_scatter", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_reduce_scatter, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/scatter", + "Which collective to use for scatter", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_scatter, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/allgatherv", + "Which collective to use for allgatherv", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_allgatherv, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/allreduce", + "Which collective to use for allreduce", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_allreduce, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/alltoall", + "Which collective to use for alltoall", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_alltoall, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/alltoallv", + "Which collective to use for alltoallv", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_alltoallv, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/bcast", + "Which collective to use for bcast", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_bcast, + NULL); + + xbt_cfg_register(&_sg_cfg_set, "smpi/reduce", + "Which collective to use for reduce", + xbt_cfgelm_string, NULL, 1, 1, &_sg_cfg_cb__coll_reduce, + NULL); +#endif // HAVE_SMPI if (!surf_path) { /* retrieves the current directory of the current process */ @@ -779,12 +922,12 @@ void surf_config_models_setup() /* ********************************************************************* */ /* TUTORIAL: New model */ - int new_model_id = -1; + /*FIXME:UPDATE: int new_model_id = -1; char *new_model_name = NULL; new_model_name = xbt_cfg_get_string(_sg_cfg_set, "new_model/model"); XBT_DEBUG("Call new model_init"); new_model_id = find_model_description(surf_new_model_description, new_model_name); - surf_new_model_description[new_model_id].model_init_preparse(); + surf_new_model_description[new_model_id].model_init_preparse();*/ /* ********************************************************************* */ } @@ -800,6 +943,10 @@ char* sg_cfg_get_string(const char* name) { return xbt_cfg_get_string(_sg_cfg_set,name); } +int sg_cfg_get_boolean(const char* name) +{ + return xbt_cfg_get_boolean(_sg_cfg_set,name); +} void sg_cfg_get_peer(const char *name, char **peer, int *port) { xbt_cfg_get_peer(_sg_cfg_set,name, peer, port);