From e76db741f886560cbf49a0dd833b35489c778ac1 Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Tue, 15 Mar 2022 23:24:36 +0100 Subject: [PATCH] take 2 on declare_flag, not sure it's better... a bit weird --- include/xbt/config.hpp | 16 ---------------- src/simgrid/sg_config.cpp | 33 +++++++++++++++++---------------- 2 files changed, 17 insertions(+), 32 deletions(-) diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp index 494d89ce8a..47cbe7c30f 100644 --- a/include/xbt/config.hpp +++ b/include/xbt/config.hpp @@ -307,20 +307,4 @@ XBT_PUBLIC void help(); } // namespace config } // namespace simgrid -/******************************** Configuration of Simgrid **************************************/ -extern XBT_PUBLIC simgrid::config::Flag _sg_context_stack_size; -extern XBT_PUBLIC simgrid::config::Flag _sg_context_guard_size; -extern XBT_PUBLIC simgrid::config::Flag _sg_context_nthreads; -extern XBT_PUBLIC simgrid::config::Flag _sg_context_synchro; - -extern XBT_PUBLIC simgrid::config::Flag _sg_cpu_maxmin_selective_update; - -extern XBT_PUBLIC simgrid::config::Flag _sg_bmf_selective_update; - -extern XBT_PUBLIC simgrid::config::Flag _sg_network_loopback_bandwidth; -extern XBT_PUBLIC simgrid::config::Flag _sg_network_loopback_latency; -extern XBT_PUBLIC simgrid::config::Flag _sg_network_maxmin_selective_update; - -extern XBT_PUBLIC simgrid::config::Flag _sg_execution_cutpath; - #endif diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 0259c1c5aa..311823adc8 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -295,24 +295,24 @@ void sg_config_init(int *argc, char **argv) 10e9}; /* Inclusion path */ - simgrid::config::declare_flag("path", "Lookup path for inclusions in platform and deployment XML files", - "", [](std::string const& path) { - if (not path.empty()) - surf_path.push_back(path); - }); + simgrid::config::Flag cfg_path{"path", "Lookup path for inclusions in platform and deployment XML files", + "", [](std::string const& path) { + if (not path.empty()) + surf_path.push_back(path); + }}; - simgrid::config::Flag _sg_cpu_maxmin_selective_update{ + simgrid::config::Flag cfg_cpu_maxmin_selective_update{ "cpu/maxmin-selective-update", "Update the constraint set propagating recursively to others constraints " "(off by default unless optim is set to lazy)", false}; - simgrid::config::Flag _sg_network_maxmin_selective_update{"network/maxmin-selective-update", + simgrid::config::Flag cfg_network_maxmin_selective_update{"network/maxmin-selective-update", "Update the constraint set propagating " "recursively to others constraints (off by " "default unless optim is set to lazy)", false}; - simgrid::config::Flag _sg_context_stack_size{ + simgrid::config::Flag cfg_context_stack_size{ "contexts/stack-size", "Stack size of contexts in KiB (not with threads)", 8 * 1024, [](int value) { simgrid::kernel::context::stack_size = value * 1024; }}; @@ -322,10 +322,10 @@ void sg_config_init(int *argc, char **argv) #else int default_guard_size = 1; #endif - simgrid::config::Flag _sg_context_guard_size{ + simgrid::config::Flag cfg_context_guard_size{ "contexts/guard-size", "Guard size for contexts stacks in memory pages", default_guard_size, [](int value) { simgrid::kernel::context::guard_size = value * xbt_pagesize; }}; - simgrid::config::Flag _sg_context_nthreads{"contexts/nthreads", + simgrid::config::Flag cfg_context_nthreads{"contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, &simgrid::kernel::context::set_nthreads}; @@ -335,7 +335,7 @@ void sg_config_init(int *argc, char **argv) #else // No futex on mac and posix is unimplemented yet std::string default_synchro_mode = "busy_wait"; #endif - simgrid::config::Flag _sg_context_synchro{"contexts/synchro", + simgrid::config::Flag cfg_context_synchro{"contexts/synchro", "Synchronization mode to use when running contexts in " "parallel (either futex, posix or busy_wait)", default_synchro_mode, &_sg_cfg_cb_contexts_parallel_mode}; @@ -352,13 +352,14 @@ void sg_config_init(int *argc, char **argv) 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::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::Flag cfg_smpi_IB_penalty_factors{ + "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"}; /* Others */ - simgrid::config::Flag _sg_execution_cutpath{ + simgrid::config::Flag cfg_execution_cutpath{ "exception/cutpath", "Whether to cut all path information from call traces, used e.g. in exceptions.", false}; if (surf_path.empty()) -- 2.20.1