X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..4367be44d90771509ffdde0249f9aa372b2901a7:/src/simgrid/sg_config.cpp diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 1cbf235da9..2341736fbf 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2020. 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. */ @@ -7,11 +7,13 @@ #include "simgrid/sg_config.hpp" #include "simgrid/instr.h" +#include "simgrid/version.h" #include "src/instr/instr_private.hpp" #include "src/internal_config.h" #include "src/kernel/lmm/maxmin.hpp" #include "src/mc/mc_config.hpp" #include "src/mc/mc_replay.hpp" +#include "src/smpi/include/smpi_config.hpp" #include "src/surf/surf_interface.hpp" #include "surf/surf.hpp" #include "xbt/config.hpp" @@ -45,11 +47,10 @@ int _sg_cfg_init_status = 0; static void sg_config_cmd_line(int *argc, char **argv) { bool shall_exit = false; - int i; - int j; bool parse_args = true; // Stop parsing the parameters once we found '--' - for (j = i = 1; i < *argc; i++) { + int j = 1; + for (int i = j; i < *argc; i++) { if (not strcmp("--", argv[i])) { parse_args = false; // Remove that '--' from the arguments @@ -171,8 +172,20 @@ static void _sg_cfg_cb__optimization_mode(const std::string& value) find_model_description(surf_optimization_mode_description, value); } +static void _sg_cfg_cb__disk_model(const std::string& value) +{ + xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); + + if (value == "help") { + model_help("disk", surf_disk_model_description); + exit(0); + } + + find_model_description(surf_disk_model_description, value); +} + /* callback of the cpu/model variable */ -static void _sg_cfg_cb__storage_mode(const std::string& value) +static void _sg_cfg_cb__storage_model(const std::string& value) { xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); @@ -243,7 +256,10 @@ void sg_config_init(int *argc, char **argv) declare_model_flag("cpu/model", "Cas01", &_sg_cfg_cb__cpu_model, surf_cpu_model_description, "model", "The model to use for the CPU"); - declare_model_flag("storage/model", "default", &_sg_cfg_cb__storage_mode, surf_storage_model_description, "model", + declare_model_flag("disk/model", "default", &_sg_cfg_cb__disk_model, surf_disk_model_description, "model", + "The model to use for the disk"); + + declare_model_flag("storage/model", "default", &_sg_cfg_cb__storage_model, surf_storage_model_description, "model", "The model to use for the storage"); declare_model_flag("network/model", "LV08", &_sg_cfg_cb__network_model, surf_network_model_description, "model", @@ -299,9 +315,6 @@ void sg_config_init(int *argc, char **argv) "no"); simgrid::config::alias("network/maxmin-selective-update", {"network/maxmin_selective_update"}); - extern bool _sg_do_verbose_exit; - simgrid::config::bind_flag(_sg_do_verbose_exit, "verbose-exit", "Activate the \"do nothing\" mode in Ctrl-C"); - simgrid::config::declare_flag("contexts/stack-size", "Stack size of contexts in KiB (not with threads)", 8 * 1024, [](int value) { smx_context_stack_size = value * 1024; }); simgrid::config::alias("contexts/stack-size", {"contexts/stack_size"}); @@ -353,113 +366,11 @@ void sg_config_init(int *argc, char **argv) "contention (default value based on Stampede cluster profiling)", "0.965;0.925;1.35"); simgrid::config::alias("smpi/IB-penalty-factors", {"smpi/IB_penalty_factors"}); - -#if HAVE_SMPI - simgrid::config::declare_flag("smpi/host-speed", "Speed of the host running the simulation (in flop/s). " - "Used to bench the operations.", - 20000.0); - simgrid::config::alias("smpi/host-speed", {"smpi/running_power", "smpi/running-power"}); - - simgrid::config::declare_flag("smpi/keep-temps", "Whether we should keep the generated temporary files.", - false); - - simgrid::config::declare_flag("smpi/display-timing", "Whether we should display the timing after simulation.", - false); - simgrid::config::alias("smpi/display-timing", {"smpi/display_timing"}); - - simgrid::config::declare_flag( - "smpi/simulate-computation", "Whether the computational part of the simulated application should be simulated.", - true); - simgrid::config::alias("smpi/simulate-computation", {"smpi/simulate_computation"}); - - simgrid::config::declare_flag( - "smpi/shared-malloc", "Whether SMPI_SHARED_MALLOC is enabled. Disable it for debugging purposes.", "global"); - simgrid::config::alias("smpi/shared-malloc", {"smpi/use_shared_malloc", "smpi/use-shared-malloc"}); - simgrid::config::declare_flag("smpi/shared-malloc-blocksize", - "Size of the bogus file which will be created for global shared allocations", - 1UL << 20); - simgrid::config::declare_flag("smpi/shared-malloc-hugepage", - "Path to a mounted hugetlbfs, to use huge pages with shared malloc.", ""); - - simgrid::config::declare_flag( - "smpi/cpu-threshold", "Minimal computation time (in seconds) not discarded, or -1 for infinity.", 1e-6); - simgrid::config::alias("smpi/cpu-threshold", {"smpi/cpu_threshold"}); - - simgrid::config::declare_flag( - "smpi/async-small-thresh", - "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver", 0); - simgrid::config::alias("smpi/async-small-thresh", {"smpi/async_small_thres", "smpi/async_small_thresh"}); - - simgrid::config::declare_flag("smpi/trace-call-location", - "Should filename and linenumber of MPI calls be traced?", false); - - simgrid::config::declare_flag( - "smpi/send-is-detached-thresh", - "Threshold of message size where MPI_Send stops behaving like MPI_Isend and becomes MPI_Ssend", 65536); - simgrid::config::alias("smpi/send-is-detached-thresh", - {"smpi/send_is_detached_thres", "smpi/send_is_detached_thresh"}); - - const char* default_privatization = std::getenv("SMPI_PRIVATIZATION"); - if (default_privatization == nullptr) - default_privatization = "no"; - - simgrid::config::declare_flag( - "smpi/privatization", "How we should privatize global variable at runtime (no, yes, mmap, dlopen).", - default_privatization); - simgrid::config::alias("smpi/privatization", {"smpi/privatize_global_variables", "smpi/privatize-global-variables"}); - - simgrid::config::declare_flag( - "smpi/privatize-libs", "Add libraries (; separated) to privatize (libgfortran for example). You need to provide the full names of the files (libgfortran.so.4), or its full path", ""); - - simgrid::config::declare_flag("smpi/grow-injected-times", - "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.", - true); - -#if HAVE_PAPI - simgrid::config::declare_flag("smpi/papi-events", - "This switch enables tracking the specified counters with PAPI", ""); -#endif - simgrid::config::declare_flag("smpi/comp-adjustment-file", - "A file containing speedups or slowdowns for some parts of the code.", ""); - simgrid::config::declare_flag( - "smpi/os", "Small messages timings (MPI_Send minimum time for small messages)", "0:0:0:0:0"); - simgrid::config::declare_flag( - "smpi/ois", "Small messages timings (MPI_Isend minimum time for small messages)", "0:0:0:0:0"); - simgrid::config::declare_flag( - "smpi/or", "Small messages timings (MPI_Recv minimum time for small messages)", "0:0:0:0:0"); - - simgrid::config::declare_flag("smpi/iprobe-cpu-usage", - "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).", - 1.0); - - simgrid::config::declare_flag("smpi/coll-selector", "Which collective selector to use", "default"); - simgrid::config::alias("smpi/coll-selector", {"smpi/coll_selector"}); - simgrid::config::declare_flag("smpi/gather", "Which collective to use for gather", ""); - simgrid::config::declare_flag("smpi/allgather", "Which collective to use for allgather", ""); - simgrid::config::declare_flag("smpi/barrier", "Which collective to use for barrier", ""); - simgrid::config::declare_flag("smpi/reduce_scatter", "Which collective to use for reduce_scatter", ""); - simgrid::config::alias("smpi/reduce_scatter", {"smpi/reduce-scatter"}); - simgrid::config::declare_flag("smpi/scatter", "Which collective to use for scatter", ""); - simgrid::config::declare_flag("smpi/allgatherv", "Which collective to use for allgatherv", ""); - simgrid::config::declare_flag("smpi/allreduce", "Which collective to use for allreduce", ""); - simgrid::config::declare_flag("smpi/alltoall", "Which collective to use for alltoall", ""); - simgrid::config::declare_flag("smpi/alltoallv", "Which collective to use for alltoallv", ""); - simgrid::config::declare_flag("smpi/bcast", "Which collective to use for bcast", ""); - simgrid::config::declare_flag("smpi/reduce", "Which collective to use for reduce", ""); -#endif // HAVE_SMPI - /* Others */ simgrid::config::declare_flag( "exception/cutpath", "Whether to cut all path information from call traces, used e.g. in exceptions.", false); - extern bool _sg_do_clean_atexit; - simgrid::config::bind_flag(_sg_do_clean_atexit, "clean-atexit", {"clean_atexit"}, - "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end."); - if (surf_path.empty()) simgrid::config::set_default("path", "./");