X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/59d583b361923a665cac4daa80565eb2224e9d25..f8babb62e07e0f0a89dda9e3d0d64db0fcb4e87e:/src/simgrid/sg_config.cpp diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 99640f5560..d7e6bdb895 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-2021. 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. */ @@ -47,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 @@ -123,12 +122,12 @@ static void _sg_cfg_cb__plugin(const std::string& value) return; if (value == "help") { - model_help("plugin", *surf_plugin_description); + model_help("plugin", surf_plugin_description()); exit(0); } - int plugin_id = find_model_description(*surf_plugin_description, value); - (*surf_plugin_description)[plugin_id].model_init_preparse(); + const auto* plugin = find_model_description(surf_plugin_description(), value); + plugin->model_init_preparse(); } /* callback of the host/model variable */ @@ -185,19 +184,6 @@ static void _sg_cfg_cb__disk_model(const std::string& value) find_model_description(surf_disk_model_description, value); } -/* callback of the cpu/model variable */ -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"); - - if (value == "help") { - model_help("storage", surf_storage_model_description); - exit(0); - } - - find_model_description(surf_storage_model_description, value); -} - /* callback of the network_model variable */ static void _sg_cfg_cb__network_model(const std::string& value) { @@ -252,7 +238,7 @@ void sg_config_init(int *argc, char **argv) } /* Plugins configuration */ - declare_model_flag("plugin", "", &_sg_cfg_cb__plugin, *surf_plugin_description, "plugin", "The plugins"); + declare_model_flag("plugin", "", &_sg_cfg_cb__plugin, surf_plugin_description(), "plugin", "The plugins"); declare_model_flag("cpu/model", "Cas01", &_sg_cfg_cb__cpu_model, surf_cpu_model_description, "model", "The model to use for the CPU"); @@ -260,9 +246,6 @@ void sg_config_init(int *argc, char **argv) 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", "The model to use for the network"); @@ -278,26 +261,36 @@ void sg_config_init(int *argc, char **argv) simgrid::config::bind_flag(sg_maxmin_precision, "maxmin/precision", "Numerical precision used when computing resource sharing (in flops/sec or bytes/sec)"); - simgrid::config::bind_flag(sg_concurrency_limit, "maxmin/concurrency-limit", {"maxmin/concurrency_limit"}, + simgrid::config::bind_flag(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)"); /* The parameters of network models */ sg_latency_factor = 13.01; // comes from the default LV08 network model - simgrid::config::bind_flag(sg_latency_factor, "network/latency-factor", {"network/latency_factor"}, + simgrid::config::bind_flag(sg_latency_factor, "network/latency-factor", "Correction factor to apply to the provided latency (default value set by network model)"); sg_bandwidth_factor = 0.97; // comes from the default LV08 network model simgrid::config::bind_flag( - sg_bandwidth_factor, "network/bandwidth-factor", {"network/bandwidth_factor"}, + sg_bandwidth_factor, "network/bandwidth-factor", "Correction factor to apply to the provided bandwidth (default value set by network model)"); sg_weight_S_parameter = 20537; // comes from the default LV08 network model simgrid::config::bind_flag( - sg_weight_S_parameter, "network/weight-S", {"network/weight_S"}, + sg_weight_S_parameter, "network/weight-S", "Correction factor to apply to the weight of competing streams (default value set by network model)"); + simgrid::config::declare_flag("network/loopback-lat", + "For network models with an implicit loopback link (L07, CM02, LV08), " + "latency of the loopback link. 0 by default", + 0); + + simgrid::config::declare_flag("network/loopback-bw", + "For network models with an implicit loopback link (L07, CM02, LV08), " + "bandwidth of the loopback link. 10GBps by default", + 10e9); + /* Inclusion path */ simgrid::config::declare_flag("path", "Lookup path for inclusions in platform and deployment XML files", "", [](std::string const& path) { @@ -309,16 +302,13 @@ void sg_config_init(int *argc, char **argv) "Update the constraint set propagating recursively to others constraints " "(off by default unless optim is set to lazy)", "no"); - simgrid::config::alias("cpu/maxmin-selective-update", {"cpu/maxmin_selective_update"}); simgrid::config::declare_flag("network/maxmin-selective-update", "Update the constraint set propagating " "recursively to others constraints (off by " "default unless optim is set to lazy)", "no"); - simgrid::config::alias("network/maxmin-selective-update", {"network/maxmin_selective_update"}); 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"}); /* guard size for contexts stacks in memory pages */ #if defined(_WIN32) || (PTH_STACKGROWTH != -1) @@ -329,15 +319,9 @@ void sg_config_init(int *argc, char **argv) simgrid::config::declare_flag("contexts/guard-size", "Guard size for contexts stacks in memory pages", default_guard_size, [](int value) { smx_context_guard_size = value * xbt_pagesize; }); - simgrid::config::alias("contexts/guard-size", {"contexts/guard_size"}); simgrid::config::declare_flag("contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, &SIMIX_context_set_nthreads); - simgrid::config::declare_flag("contexts/parallel-threshold", - "Minimal number of user contexts to be run in parallel (raw contexts only)", 2, - &SIMIX_context_set_parallel_threshold); - simgrid::config::alias("contexts/parallel-threshold", {"contexts/parallel_threshold"}); - /* synchronization mode for parallel user contexts */ #if HAVE_FUTEX_H std::string default_synchro_mode = "futex"; @@ -356,17 +340,14 @@ void sg_config_init(int *argc, char **argv) "meaning if(size >=thresholdN ) return valueN.", "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"); - simgrid::config::alias("smpi/bw-factor", {"smpi/bw_factor"}); simgrid::config::declare_flag("smpi/lat-factor", "Latency factors for smpi.", "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"); - simgrid::config::alias("smpi/lat-factor", {"smpi/lat_factor"}); simgrid::config::declare_flag("smpi/IB-penalty-factors", "Correction factor to communications using Infiniband model with " "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"}); /* Others */ simgrid::config::declare_flag(