-/* 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 <simgrid/instr.h>
+#include <simgrid/version.h>
+#include <xbt/config.hpp>
+
#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");
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 */
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)
{
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\"");
}
/* 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");
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");
"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");
+
/* The parameters of network models */
sg_latency_factor = 13.01; // comes from the default LV08 network model
"no");
simgrid::config::declare_flag<int>("contexts/stack-size", "Stack size of contexts in KiB (not with threads)",
- 8 * 1024, [](int value) { smx_context_stack_size = value * 1024; });
+ 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)
#endif
simgrid::config::declare_flag<int>("contexts/guard-size", "Guard size for contexts stacks in memory pages",
default_guard_size,
- [](int value) { smx_context_guard_size = value * xbt_pagesize; });
+ [](int value) { simgrid::kernel::context::guard_size = value * xbt_pagesize; });
simgrid::config::declare_flag<int>("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
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()
