#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/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 <string_view>
/** @brief Allow other libraries to react to the --help flag, too
*
- * When finding --help on the command line, simgrid usually stops right after displaying its help message.
- * If you are writing a library using simgrid, you may want to display your own help message before everything stops.
- * If so, just call this function before having simgrid parsing the command line, and you will be given the control
+ * When finding --help on the command line, SimGrid usually stops right after displaying its help message.
+ * If you are writing a library using SimGrid, you may want to display your own help message before everything stops.
+ * If so, just call this function before having SimGrid parsing the command line, and you will be given the control
* even if the user is asking for help.
*/
void sg_config_continue_after_help()
XBT_HELP("Please consider using the recent names");
shall_exit = true;
} else if (parse_args && not strcmp(argv[i], "--help-models")) {
- surf_host_model_description.help();
+ simgrid_host_models().help();
XBT_HELP("%s", "");
- surf_cpu_model_description.help();
+ simgrid_cpu_models().help();
XBT_HELP("%s", "");
simgrid_network_models().help();
- XBT_HELP("\nLong description of all optimization levels accepted by the models of this simulator:");
- 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")) {
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") {
- simgrid_plugins().help();
- exit(0);
- }
-
- simgrid_plugins().by_name(value).init();
-}
-
-/* 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") {
- surf_host_model_description.help();
- exit(0);
- }
-
- /* Make sure that the model exists */
- surf_host_model_description.by_name(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") {
- surf_cpu_model_description.help();
- exit(0);
- }
-
- /* Make sure that the model exists */
- surf_cpu_model_description.by_name(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") {
- surf_optimization_mode_description.help();
- exit(0);
- }
-
- /* Make sure that the model exists */
- surf_optimization_mode_description.by_name(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") {
- surf_disk_model_description.help();
- exit(0);
- }
-
- surf_disk_model_description.by_name(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") {
- simgrid_network_models().help();
- exit(0);
- }
-
- 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") {
}
}
-/* 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 simgrid::ModuleGroup& model_description, const std::string& type,
- const std::string& descr)
-{
- 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<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;
}
- simgrid_create_models();
- /* Plugins configuration */
- 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");
-
- 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, 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,
- "optimization mode", "The optimization modes to use for the network");
+ _sg_cfg_init_status = 1;
- 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",
[](int value) { simgrid::kernel::context::Context::guard_size = value * xbt_pagesize; }};
static simgrid::config::Flag<int> cfg_context_nthreads{
- "contexts/nthreads", "Number of parallel threads used to execute user contexts", 1, [](int nthreads) {
-#if HAVE_MMALLOC
- xbt_assert(
- nthreads == 1 || not malloc_use_mmalloc(),
- "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::Context::set_nthreads(nthreads);
- }};
+ "contexts/nthreads", "Number of parallel threads used to execute user contexts", 1,
+ [](int nthreads) { simgrid::kernel::context::Context::set_nthreads(nthreads); }};
/* synchronization mode for parallel user contexts */
#if HAVE_FUTEX_H
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());
