X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f8bd00dedfc33fa6df079a039afd88c845bfeb20..7e5babd61cf6c92d3d3a87a6d66d559ed0422777:/src/simgrid/sg_config.cpp diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp index 7d00fcf714..fa7446e55c 100644 --- a/src/simgrid/sg_config.cpp +++ b/src/simgrid/sg_config.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2023. 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. */ @@ -8,6 +8,7 @@ #include #include #include +#include #include "simgrid/sg_config.hpp" #include "src/include/xbt/mmalloc.h" @@ -18,12 +19,13 @@ #include "src/kernel/resource/NetworkModel.hpp" #include "src/mc/mc_config.hpp" #include "src/mc/mc_replay.hpp" +#include "src/simgrid/module.hpp" #include "src/smpi/include/smpi_config.hpp" #include "src/surf/surf_interface.hpp" #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of SimGrid"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(config, kernel, "About the configuration of SimGrid"); static simgrid::config::Flag cfg_continue_after_help {"help-nostop", "Do not stop the execution when --help is found", false}; @@ -93,14 +95,13 @@ static void sg_config_cmd_line(int *argc, char **argv) XBT_HELP("Please consider using the recent names"); shall_exit = true; } else if (parse_args && not strcmp(argv[i], "--help-models")) { - model_help("host", surf_host_model_description); + surf_host_model_description.help(); XBT_HELP("%s", ""); - model_help("CPU", surf_cpu_model_description); + surf_cpu_model_description.help(); XBT_HELP("%s", ""); - model_help("network", surf_network_model_description); + simgrid_network_models().help(); XBT_HELP("\nLong description of all optimization levels accepted by the models of this simulator:"); - for (auto const& item : surf_optimization_mode_description) - XBT_HELP(" %s: %s", item.name, item.description); + surf_optimization_mode_description.help(); XBT_HELP("Both network and CPU models have 'Lazy' as default optimization level\n"); shall_exit = true; } else if (parse_args && not strcmp(argv[i], "--help-tracing")) { @@ -127,12 +128,11 @@ static void _sg_cfg_cb__plugin(const std::string& value) return; if (value == "help") { - model_help("plugin", surf_plugin_description()); + simgrid_plugins().help(); exit(0); } - const auto* plugin = find_model_description(surf_plugin_description(), value); - plugin->model_init_preparse(); + simgrid_plugins().by_name(value).init(); } /* callback of the host/model variable */ @@ -141,12 +141,12 @@ static void _sg_cfg_cb__host_model(const std::string& value) xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); if (value == "help") { - model_help("host", surf_host_model_description); + surf_host_model_description.help(); exit(0); } /* Make sure that the model exists */ - find_model_description(surf_host_model_description, value); + surf_host_model_description.by_name(value); } /* callback of the cpu/model variable */ @@ -155,12 +155,12 @@ static void _sg_cfg_cb__cpu_model(const std::string& value) xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); if (value == "help") { - model_help("CPU", surf_cpu_model_description); + surf_cpu_model_description.help(); exit(0); } - /* New Module missing */ - find_model_description(surf_cpu_model_description, value); + /* Make sure that the model exists */ + surf_cpu_model_description.by_name(value); } /* callback of the cpu/model variable */ @@ -169,12 +169,12 @@ static void _sg_cfg_cb__optimization_mode(const std::string& value) xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); if (value == "help") { - model_help("optimization", surf_optimization_mode_description); + surf_optimization_mode_description.help(); exit(0); } - /* New Module missing */ - find_model_description(surf_optimization_mode_description, value); + /* Make sure that the model exists */ + surf_optimization_mode_description.by_name(value); } static void _sg_cfg_cb__disk_model(const std::string& value) @@ -182,11 +182,11 @@ 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); + surf_disk_model_description.help(); exit(0); } - find_model_description(surf_disk_model_description, value); + surf_disk_model_description.by_name(value); } /* callback of the network_model variable */ @@ -195,22 +195,21 @@ static void _sg_cfg_cb__network_model(const std::string& value) xbt_assert(_sg_cfg_init_status < 2, "Cannot change the model after the initialization"); if (value == "help") { - model_help("network", surf_network_model_description); + simgrid_network_models().help(); exit(0); } - /* New Module missing */ - find_model_description(surf_network_model_description, value); + simgrid_network_models().by_name(value); // Simply ensure that it exists } static void _sg_cfg_cb_contexts_parallel_mode(std::string_view mode_name) { if (mode_name == "posix") { - simgrid::kernel::context::set_parallel_mode(XBT_PARMAP_POSIX); + simgrid::kernel::context::Context::parallel_mode = XBT_PARMAP_POSIX; } else if (mode_name == "futex") { - simgrid::kernel::context::set_parallel_mode(XBT_PARMAP_FUTEX); + simgrid::kernel::context::Context::parallel_mode = XBT_PARMAP_FUTEX; } else if (mode_name == "busy_wait") { - simgrid::kernel::context::set_parallel_mode(XBT_PARMAP_BUSY_WAIT); + simgrid::kernel::context::Context::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\""); @@ -220,15 +219,11 @@ static void _sg_cfg_cb_contexts_parallel_mode(std::string_view mode_name) /* build description line with possible values */ static void declare_model_flag(const std::string& name, const std::string& value, const std::function& callback, - const std::vector& model_description, const std::string& type, + const simgrid::ModuleGroup& model_description, const std::string& type, const std::string& descr) { - std::string description = descr + ". Possible values: "; - std::string sep = ""; - for (auto const& item : model_description) { - description += sep + item.name; - sep = ", "; - } + std::string description = descr + ". Possible values (other compilation flags may activate more " + + model_description.get_kind() + "): " + model_description.existing_values(); description += ".\n (use 'help' as a value to see the long description of each " + type + ")"; simgrid::config::declare_flag(name, description, value, callback); } @@ -241,9 +236,9 @@ void sg_config_init(int *argc, char **argv) XBT_WARN("Call to sg_config_init() after initialization ignored"); return; } - + simgrid_create_models(); /* Plugins configuration */ - declare_model_flag("plugin", "", &_sg_cfg_cb__plugin, surf_plugin_description(), "plugin", "The plugins"); + declare_model_flag("plugin", "", &_sg_cfg_cb__plugin, simgrid_plugins(), "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"); @@ -251,7 +246,7 @@ void sg_config_init(int *argc, char **argv) declare_model_flag("disk/model", "S19", &_sg_cfg_cb__disk_model, surf_disk_model_description, "model", "The model to use for the disk"); - declare_model_flag("network/model", "LV08", &_sg_cfg_cb__network_model, surf_network_model_description, "model", + declare_model_flag("network/model", "LV08", &_sg_cfg_cb__network_model, simgrid_network_models(), "model", "The model to use for the network"); declare_model_flag("network/optim", "Lazy", &_sg_cfg_cb__optimization_mode, surf_optimization_mode_description, @@ -285,9 +280,9 @@ void sg_config_init(int *argc, char **argv) /* Inclusion path */ static simgrid::config::Flag cfg_path{ - "path", "Lookup path for inclusions in platform and deployment XML files", "", [](std::string const& 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::xbt::path_push(path); }}; static simgrid::config::Flag cfg_cpu_maxmin_selective_update{ @@ -303,17 +298,17 @@ void sg_config_init(int *argc, char **argv) static 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; }}; + [](int value) { simgrid::kernel::context::Context::stack_size = value * 1024; }}; /* guard size for contexts stacks in memory pages */ -#if defined(_WIN32) || (PTH_STACKGROWTH != -1) +#if (PTH_STACKGROWTH != -1) int default_guard_size = 0; #else int default_guard_size = 1; #endif static 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; }}; + [](int value) { simgrid::kernel::context::Context::guard_size = value * xbt_pagesize; }}; static simgrid::config::Flag cfg_context_nthreads{ "contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, [](int nthreads) { @@ -323,7 +318,7 @@ void sg_config_init(int *argc, char **argv) "Parallel simulation is forbidden in the verified program, as there is no protection against race " "conditions in mmalloc itself. Please don't be so greedy and show some mercy for our implementation."); #endif - simgrid::kernel::context::set_nthreads(nthreads); + simgrid::kernel::context::Context::set_nthreads(nthreads); }}; /* synchronization mode for parallel user contexts */ @@ -349,14 +344,11 @@ void sg_config_init(int *argc, char **argv) static 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()) - simgrid::config::set_default("path", "./"); - _sg_cfg_init_status = 1; sg_config_cmd_line(argc, argv); - xbt_mallocator_initialization_is_done(simgrid::kernel::context::is_parallel()); + xbt_mallocator_initialization_is_done(simgrid::kernel::context::Context::is_parallel()); } void sg_config_finalize()