X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24c1752e17da13d99d02faa833bf2397a56c12af..6d64c296b8f063bec38fb27e00ad60469080228a:/src/simgrid/sg_config.cpp diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 813dce80bc..2ce0de033a 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -1,22 +1,23 @@ -/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2022. 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. */ /* sg_config: configuration infrastructure for the simulation world */ +#include +#include +#include + #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/context/Context.hpp" #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" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of SimGrid"); @@ -122,12 +123,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 */ @@ -184,19 +185,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) { @@ -214,11 +202,11 @@ static void _sg_cfg_cb__network_model(const std::string& value) static void _sg_cfg_cb_contexts_parallel_mode(const std::string& mode_name) { if (mode_name == "posix") { - SIMIX_context_set_parallel_mode(XBT_PARMAP_POSIX); + simgrid::kernel::context::set_parallel_mode(XBT_PARMAP_POSIX); } else if (mode_name == "futex") { - SIMIX_context_set_parallel_mode(XBT_PARMAP_FUTEX); + simgrid::kernel::context::set_parallel_mode(XBT_PARMAP_FUTEX); } else if (mode_name == "busy_wait") { - SIMIX_context_set_parallel_mode(XBT_PARMAP_BUSY_WAIT); + simgrid::kernel::context::set_parallel_mode(XBT_PARMAP_BUSY_WAIT); } else { xbt_die("Command line setting of the parallel synchronization mode should " "be one of \"posix\", \"futex\" or \"busy_wait\""); @@ -251,7 +239,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"); @@ -259,9 +247,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"); @@ -277,24 +262,32 @@ 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)"); + simgrid::config::bind_flag(sg_bmf_max_iterations, "bmf/max-iterations", + "Maximum number of steps to be performed while searching for a BMF allocation"); + + simgrid::config::declare_flag("bmf/selective-update", + "Update the constraint set propagating recursively to others constraints " + "(off by default)", + false); + /* 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", @@ -318,16 +311,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"}); + 8 * 1024, [](int value) { simgrid::kernel::context::stack_size = value * 1024; }); /* guard size for contexts stacks in memory pages */ #if defined(_WIN32) || (PTH_STACKGROWTH != -1) @@ -337,10 +327,9 @@ void sg_config_init(int *argc, char **argv) #endif 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"}); + [](int value) { simgrid::kernel::context::guard_size = value * xbt_pagesize; }); simgrid::config::declare_flag("contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, - &SIMIX_context_set_nthreads); + &simgrid::kernel::context::set_nthreads); /* synchronization mode for parallel user contexts */ #if HAVE_FUTEX_H @@ -360,17 +349,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( @@ -383,7 +369,7 @@ void sg_config_init(int *argc, char **argv) sg_config_cmd_line(argc, argv); - xbt_mallocator_initialization_is_done(SIMIX_context_is_parallel()); + xbt_mallocator_initialization_is_done(simgrid::kernel::context::is_parallel()); } void sg_config_finalize()