#include <xbt/config.hpp>
#include <xbt/file.hpp>
-#include "simgrid/sg_config.hpp"
-#include "src/include/xbt/mmalloc.h"
#include "src/instr/instr_private.hpp"
#include "src/internal_config.h"
#include "src/kernel/context/Context.hpp"
#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/simgrid/sg_config.hpp"
#include "src/smpi/include/smpi_config.hpp"
-#include "src/surf/surf_interface.hpp"
+#include "src/xbt/mmalloc/mmalloc.h"
#include <string_view>
-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<bool> cfg_continue_after_help
{"help-nostop", "Do not stop the execution when --help is found", false};
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);
+ simgrid_host_models().help();
XBT_HELP("%s", "");
- model_help("CPU", surf_cpu_model_description);
+ simgrid_cpu_models().help();
XBT_HELP("%s", "");
- model_help("network", surf_network_model_description);
- 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);
- XBT_HELP("Both network and CPU models have 'Lazy' as default optimization level\n");
+ simgrid_network_models().help();
shall_exit = true;
} else if (parse_args && not strcmp(argv[i], "--help-tracing")) {
TRACE_help();
exit(0);
}
-/* callback of the plugin variable */
-static void _sg_cfg_cb__plugin(const std::string& value)
-{
- xbt_assert(_sg_cfg_init_status < 2, "Cannot load a plugin after the initialization");
-
- if (value.empty())
- return;
-
- if (value == "help") {
- model_help("plugin", surf_plugin_description());
- exit(0);
- }
-
- const auto* plugin = find_model_description(surf_plugin_description(), value);
- plugin->model_init_preparse();
-}
-
-/* callback of the host/model variable */
-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);
- exit(0);
- }
-
- /* Make sure that the model exists */
- find_model_description(surf_host_model_description, value);
-}
-
-/* callback of the cpu/model variable */
-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);
- exit(0);
- }
-
- /* New Module missing */
- find_model_description(surf_cpu_model_description, value);
-}
-
-/* callback of the cpu/model variable */
-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);
- exit(0);
- }
-
- /* New Module missing */
- 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 network_model variable */
-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);
- exit(0);
- }
-
- /* New Module missing */
- find_model_description(surf_network_model_description, value);
-}
-
static void _sg_cfg_cb_contexts_parallel_mode(std::string_view mode_name)
{
if (mode_name == "posix") {
}
}
-/* build description line with possible values */
-static void declare_model_flag(const std::string& name, const std::string& value,
- const std::function<void(std::string const&)>& callback,
- const std::vector<surf_model_description_t>& 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 = ", ";
- }
- description += ".\n (use 'help' as a value to see the long description of each " + type + ")";
- simgrid::config::declare_flag<std::string>(name, description, value, callback);
-}
-
/* create the config set, register what should be and parse the command line*/
void sg_config_init(int *argc, char **argv)
{
XBT_WARN("Call to sg_config_init() after initialization ignored");
return;
}
+ _sg_cfg_init_status = 1;
- /* Plugins configuration */
- 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");
-
- 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",
- "The model to use for the network");
-
- declare_model_flag("network/optim", "Lazy", &_sg_cfg_cb__optimization_mode, surf_optimization_mode_description,
- "optimization mode", "The optimization modes to use for the network");
-
- declare_model_flag("host/model", "default", &_sg_cfg_cb__host_model, surf_host_model_description, "model",
- "The model to use for the host");
+ /* Plugins and models configuration */
+ simgrid_plugins().create_flag("plugin", "The plugins", "", true);
+ simgrid_cpu_models().create_flag("cpu/model", "The model to use for the CPU", "Cas01", false);
+ simgrid_network_models().create_flag("network/model", "The model to use for the network", "LV08", false);
+ simgrid_host_models().create_flag("host/model", "The model to use for the host", "default", false);
+ simgrid_disk_models().create_flag("disk/model", "The model to use for the disk", "S19", false);
- simgrid::config::bind_flag(sg_surf_precision, "surf/precision",
+ simgrid::config::bind_flag(sg_precision_timing, "precision/timing", {"surf/precision"},
"Numerical precision used when updating simulation times (in seconds)");
- simgrid::config::bind_flag(sg_maxmin_precision, "maxmin/precision",
+ simgrid::config::bind_flag(sg_precision_workamount, "precision/work-amount", {"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",
static simgrid::config::Flag<bool> cfg_execution_cutpath{
"exception/cutpath", "Whether to cut all path information from call traces, used e.g. in exceptions.", false};
- _sg_cfg_init_status = 1;
-
sg_config_cmd_line(argc, argv);
xbt_mallocator_initialization_is_done(simgrid::kernel::context::Context::is_parallel());
