X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4be09b960d9ed540ca5224f2e70603d2f2b86f6a..57970de8f4fd548711e2cea76502ba692595fa4a:/src/simgrid/sg_config.cpp diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 466ae7379d..6de9f2fcd9 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -20,12 +20,10 @@ #include "simgrid/simix.h" #include "simgrid/sg_config.h" #include "simgrid_config.h" /* what was compiled in? */ -#if HAVE_SMPI -#include "smpi/smpi_interface.h" -#endif #include "mc/mc.h" #include "simgrid/instr.h" #include "src/mc/mc_replay.h" +#include "src/surf/surf_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of SimGrid"); @@ -47,7 +45,8 @@ int _sg_cfg_exit_asap = 0; static void sg_config_cmd_line(int *argc, char **argv) { int shall_exit = 0; - int i, j; + int i; + int j; for (j = i = 1; i < *argc; i++) { if (!strncmp(argv[i], "--cfg=", strlen("--cfg="))) { @@ -143,21 +142,6 @@ static void _sg_cfg_cb__host_model(const char *name) find_model_description(surf_host_model_description, val); } -/* callback of the vm/model variable */ -static void _sg_cfg_cb__vm_model(const char *name) -{ - xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); - - char *val = xbt_cfg_get_string(name); - if (!strcmp(val, "help")) { - model_help("vm", surf_vm_model_description); - sg_cfg_exit_early(); - } - - /* Make sure that the model exists */ - find_model_description(surf_vm_model_description, val); -} - /* callback of the cpu/model variable */ static void _sg_cfg_cb__cpu_model(const char *name) { @@ -216,64 +200,6 @@ static void _sg_cfg_cb__network_model(const char *name) /* New Module missing */ find_model_description(surf_network_model_description, val); } - -#if HAVE_SMPI -/* callback of the mpi collectives: simply check that this is a valid name. It will be picked up in smpi_global.cpp */ -static void _check_coll(const char *category, - s_mpi_coll_description_t * table, - const char *name) -{ - xbt_assert(_sg_cfg_init_status < 2, "Cannot change the collective algorithm after the initialization"); - - char *val = xbt_cfg_get_string(name); - if (val && !strcmp(val, "help")) { - coll_help(category, table); - sg_cfg_exit_early(); - } - - find_coll_description(table, val, category); -} -static void _check_coll_gather(const char *name){ - _check_coll("gather", mpi_coll_gather_description, name); -} -static void _check_coll_allgather(const char *name){ - _check_coll("allgather", mpi_coll_allgather_description, name); -} -static void _check_coll_allgatherv(const char *name){ - _check_coll("allgatherv", mpi_coll_allgatherv_description, name); -} -static void _check_coll_allreduce(const char *name) -{ - _check_coll("allreduce", mpi_coll_allreduce_description, name); -} -static void _check_coll_alltoall(const char *name) -{ - _check_coll("alltoall", mpi_coll_alltoall_description, name); -} -static void _check_coll_alltoallv(const char *name) -{ - _check_coll("alltoallv", mpi_coll_alltoallv_description, name); -} -static void _check_coll_bcast(const char *name) -{ - _check_coll("bcast", mpi_coll_bcast_description, name); -} -static void _check_coll_reduce(const char *name) -{ - _check_coll("reduce", mpi_coll_reduce_description, name); -} -static void _check_coll_reduce_scatter(const char *name){ - _check_coll("reduce_scatter", mpi_coll_reduce_scatter_description, name); -} -static void _check_coll_scatter(const char *name){ - _check_coll("scatter", mpi_coll_scatter_description, name); -} -static void _check_coll_barrier(const char *name){ - _check_coll("barrier", mpi_coll_barrier_description, name); -} - -#endif - /* callback to decide if we want to use the model-checking */ #include "src/xbt_modinter.h" @@ -283,7 +209,7 @@ static void _sg_cfg_cb_model_check_replay(const char *name) { MC_record_path = nullptr; } -#if HAVE_MC +#if SIMGRID_HAVE_MC extern int _sg_do_model_check_record; static void _sg_cfg_cb_model_check_record(const char *name) { _sg_do_model_check_record = xbt_cfg_get_boolean(name); @@ -342,21 +268,6 @@ static void _sg_cfg_cb_contexts_parallel_mode(const char *name) } } -static void _sg_cfg_cb__surf_network_coordinates(const char *name) -{ - static int already_set = 0; - int val = xbt_cfg_get_boolean(name); - if (val) { - if (!already_set) { - COORD_HOST_LEVEL = sg_host_extension_create(xbt_dynar_free_voidp); - COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp); - } - already_set = 1; - } else - if (already_set) - xbt_die("Setting of whether to use coordinate cannot be disabled once set."); -} - static void _sg_cfg_cb__surf_network_crosstraffic(const char *name) { sg_network_crosstraffic = xbt_cfg_get_boolean(name); @@ -382,8 +293,8 @@ static void describe_model(char *result,int resultsize, /* create the config set, register what should be and parse the command line*/ void sg_config_init(int *argc, char **argv) { - int descsize = 1024; - char description[1024]; + const int descsize = 1024; + char description[descsize]; /* Create the configuration support */ if (_sg_cfg_init_status == 0) { /* Only create stuff if not already inited */ @@ -410,20 +321,20 @@ void sg_config_init(int *argc, char **argv) describe_model(description,descsize, surf_host_model_description, "model", "The model to use for the host"); xbt_cfg_register_string("host/model", "default", &_sg_cfg_cb__host_model, description); - describe_model(description,descsize, surf_vm_model_description, "model", "The model to use for the vm"); - xbt_cfg_register_string("vm/model", "default", &_sg_cfg_cb__vm_model, description); - sg_tcp_gamma = 4194304.0; simgrid::config::bindFlag(sg_tcp_gamma, { "network/TCP-gamma", "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)"); - sg_surf_precision = 0.00001; simgrid::config::bindFlag(sg_surf_precision, "surf/precision", "Numerical precision used when updating simulation times (in seconds)"); - sg_maxmin_precision = 0.00001; simgrid::config::bindFlag(sg_maxmin_precision, "maxmin/precision", - "Numerical precision used when computing resource sharing (in ops/sec or bytes/sec)"); + "Numerical precision used when computing resource sharing (in flops/sec or bytes/sec)"); + + simgrid::config::bindFlag(sg_concurrency_limit, "maxmin/concurrency-limit", + "Maximum number of concurrent variables in the maxmim system. Also limits the number of " + "processes on each host, at higher level. (default: -1 means no such limitation)"); + xbt_cfg_register_alias("maxmin/concurrency-limit", "maxmin/concurrency_limit"); /* The parameters of network models */ @@ -451,8 +362,7 @@ void sg_config_init(int *argc, char **argv) "", [](std::string const& path) { if (path[0] != '\0') { - char* copy = xbt_strdup(path.c_str()); - xbt_dynar_push(surf_path, ©); + surf_path.push_back(path); } }); @@ -466,7 +376,7 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register_string("model-check/replay", nullptr, _sg_cfg_cb_model_check_replay, "Model-check path to replay (as reported by SimGrid when a violation is reported)"); -#if HAVE_MC +#if SIMGRID_HAVE_MC /* do model-checking-record */ xbt_cfg_register_boolean("model-check/record", "no", _sg_cfg_cb_model_check_record, "Record the model-checking paths"); @@ -540,9 +450,6 @@ void sg_config_init(int *argc, char **argv) "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)"); #endif - xbt_cfg_register_boolean("network/coordinates", "no", _sg_cfg_cb__surf_network_coordinates, - "Whether we use a coordinate-based routing (as Vivaldi)"); - xbt_cfg_register_boolean("network/crosstraffic", "yes", _sg_cfg_cb__surf_network_crosstraffic, "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)"); @@ -562,8 +469,11 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register_alias("smpi/IB-penalty-factors","smpi/IB_penalty_factors"); #if HAVE_SMPI - xbt_cfg_register_double("smpi/running-power", 20000.0, nullptr, "Power of the host running the simulation (in flop/s). Used to bench the operations."); - xbt_cfg_register_alias("smpi/running-power","smpi/running_power"); + xbt_cfg_register_double("smpi/host-speed", 20000.0, nullptr, "Speed of the host running the simulation (in flop/s). Used to bench the operations."); + xbt_cfg_register_alias("smpi/host-speed","smpi/running_power"); + xbt_cfg_register_alias("smpi/host-speed","smpi/running-power"); + + xbt_cfg_register_boolean("smpi/keep-temps", "no", nullptr, "Whether we should keep the generated temporary files."); xbt_cfg_register_boolean("smpi/display-timing", "no", nullptr, "Whether we should display the timing after simulation."); xbt_cfg_register_alias("smpi/display-timing", "smpi/display_timing"); @@ -571,8 +481,13 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register_boolean("smpi/simulate-computation", "yes", nullptr, "Whether the computational part of the simulated application should be simulated."); xbt_cfg_register_alias("smpi/simulate-computation","smpi/simulate_computation"); - xbt_cfg_register_boolean("smpi/use-shared-malloc", "yes", nullptr, "Whether SMPI_SHARED_MALLOC is enabled. Disable it for debugging purposes."); - xbt_cfg_register_alias("smpi/use-shared-malloc", "smpi/use_shared_malloc"); + xbt_cfg_register_string("smpi/shared-malloc", "global", nullptr, + "Whether SMPI_SHARED_MALLOC is enabled. Disable it for debugging purposes."); + xbt_cfg_register_alias("smpi/shared-malloc", "smpi/use-shared-malloc"); + xbt_cfg_register_alias("smpi/shared-malloc", "smpi/use_shared_malloc"); + xbt_cfg_register_double("smpi/shared-malloc-blocksize", 1UL << 20, nullptr, "Size of the bogus file which will be created for global shared allocations"); + xbt_cfg_register_string("smpi/shared-malloc-hugepage", "", nullptr, + "Path to a mounted hugetlbfs, to use huge pages with shared malloc."); xbt_cfg_register_double("smpi/cpu-threshold", 1e-6, nullptr, "Minimal computation time (in seconds) not discarded, or -1 for infinity."); xbt_cfg_register_alias("smpi/cpu-threshold", "smpi/cpu_threshold"); @@ -589,8 +504,17 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register_alias("smpi/send-is-detached-thresh","smpi/send_is_detached_thresh"); xbt_cfg_register_alias("smpi/send-is-detached-thresh","smpi/send_is_detached_thres"); - xbt_cfg_register_boolean("smpi/privatize-global-variables", "no", nullptr, "Whether we should privatize global variable at runtime."); - xbt_cfg_register_alias("smpi/privatize-global-variables", "smpi/privatize_global_variables"); + const char* default_privatization = std::getenv("SMPI_PRIVATIZATION"); + if (default_privatization == nullptr) + default_privatization = "no"; + + xbt_cfg_register_string("smpi/privatization", default_privatization, nullptr, + "How we should privatize global variable at runtime (no, yes, mmap, dlopen)."); + + xbt_cfg_register_alias("smpi/privatization", "smpi/privatize-global-variables"); + xbt_cfg_register_alias("smpi/privatization", "smpi/privatize_global_variables"); + + xbt_cfg_register_boolean("smpi/grow-injected-times", "yes", nullptr, "Whether we want to make the injected time in MPI_Iprobe and MPI_Test grow, to allow faster simulation. This can make simulation less precise, though."); #if HAVE_PAPI xbt_cfg_register_string("smpi/papi-events", nullptr, nullptr, "This switch enables tracking the specified counters with PAPI"); @@ -600,22 +524,32 @@ void sg_config_init(int *argc, char **argv) xbt_cfg_register_string("smpi/ois", "0:0:0:0:0", nullptr, "Small messages timings (MPI_Isend minimum time for small messages)"); xbt_cfg_register_string("smpi/or", "0:0:0:0:0", nullptr, "Small messages timings (MPI_Recv minimum time for small messages)"); + xbt_cfg_register_double("smpi/iprobe-cpu-usage", 1, nullptr, "Maximum usage of CPUs by MPI_Iprobe() calls. We've observed that MPI_Iprobes consume significantly less power than the maximum of a specific application. This value is then (Iprobe_Usage/Max_Application_Usage)."); + xbt_cfg_register_string("smpi/coll-selector", "default", nullptr, "Which collective selector to use"); xbt_cfg_register_alias("smpi/coll-selector","smpi/coll_selector"); - xbt_cfg_register_string("smpi/gather", nullptr, &_check_coll_gather, "Which collective to use for gather"); - xbt_cfg_register_string("smpi/allgather", nullptr, &_check_coll_allgather, "Which collective to use for allgather"); - xbt_cfg_register_string("smpi/barrier", nullptr, &_check_coll_barrier, "Which collective to use for barrier"); - xbt_cfg_register_string("smpi/reduce-scatter",nullptr, &_check_coll_reduce_scatter, "Which collective to use for reduce_scatter"); - xbt_cfg_register_alias("smpi/reduce-scatter","smpi/reduce_scatter"); - xbt_cfg_register_string("smpi/scatter", nullptr, &_check_coll_scatter, "Which collective to use for scatter"); - xbt_cfg_register_string("smpi/allgatherv", nullptr, &_check_coll_allgatherv, "Which collective to use for allgatherv"); - xbt_cfg_register_string("smpi/allreduce", nullptr, &_check_coll_allreduce, "Which collective to use for allreduce"); - xbt_cfg_register_string("smpi/alltoall", nullptr, &_check_coll_alltoall, "Which collective to use for alltoall"); - xbt_cfg_register_string("smpi/alltoallv", nullptr, &_check_coll_alltoallv,"Which collective to use for alltoallv"); - xbt_cfg_register_string("smpi/bcast", nullptr, &_check_coll_bcast, "Which collective to use for bcast"); - xbt_cfg_register_string("smpi/reduce", nullptr, &_check_coll_reduce, "Which collective to use for reduce"); + xbt_cfg_register_string("smpi/gather", nullptr, nullptr, "Which collective to use for gather"); + xbt_cfg_register_string("smpi/allgather", nullptr, nullptr, "Which collective to use for allgather"); + xbt_cfg_register_string("smpi/barrier", nullptr, nullptr, "Which collective to use for barrier"); + xbt_cfg_register_string("smpi/reduce_scatter",nullptr, nullptr, "Which collective to use for reduce_scatter"); + xbt_cfg_register_alias("smpi/reduce_scatter","smpi/reduce-scatter"); + xbt_cfg_register_string("smpi/scatter", nullptr, nullptr, "Which collective to use for scatter"); + xbt_cfg_register_string("smpi/allgatherv", nullptr, nullptr, "Which collective to use for allgatherv"); + xbt_cfg_register_string("smpi/allreduce", nullptr, nullptr, "Which collective to use for allreduce"); + xbt_cfg_register_string("smpi/alltoall", nullptr, nullptr, "Which collective to use for alltoall"); + xbt_cfg_register_string("smpi/alltoallv", nullptr, nullptr,"Which collective to use for alltoallv"); + xbt_cfg_register_string("smpi/bcast", nullptr, nullptr, "Which collective to use for bcast"); + xbt_cfg_register_string("smpi/reduce", nullptr, nullptr, "Which collective to use for reduce"); #endif // HAVE_SMPI + /* Storage */ + + sg_storage_max_file_descriptors = 1024; + simgrid::config::bindFlag(sg_storage_max_file_descriptors, "storage/max_file_descriptors", + "Maximum number of concurrently opened files per host. Default is 1024"); + + /* Others */ + xbt_cfg_register_boolean("exception/cutpath", "no", nullptr, "Whether to cut all path information from call traces, used e.g. in exceptions."); @@ -623,12 +557,11 @@ void sg_config_init(int *argc, char **argv) "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end."); xbt_cfg_register_alias("clean-atexit","clean_atexit"); - if (!surf_path) { + if (surf_path.empty()) { /* retrieves the current directory of the current process */ const char *initial_path = __surf_get_initial_path(); xbt_assert((initial_path), "__surf_get_initial_path() failed! Can't resolve current Windows directory"); - surf_path = xbt_dynar_new(sizeof(char *), &xbt_free_ref); xbt_cfg_setdefault_string("path", initial_path); } @@ -642,7 +575,7 @@ void sg_config_init(int *argc, char **argv) } } -void sg_config_finalize(void) +void sg_config_finalize() { if (!_sg_cfg_init_status) return; /* Not initialized yet. Nothing to do */