/* sg_config: configuration infrastructure for the simulation world */
#include "simgrid/sg_config.hpp"
-#include "instr/instr_interface.hpp"
#include "simgrid/instr.h"
+#include "src/instr/instr_private.hpp"
#include "src/internal_config.h"
#include "src/kernel/lmm/maxmin.hpp"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
-#include "xbt/config.h"
#include "xbt/config.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of SimGrid");
char *opt = strchr(argv[i], '=');
opt++;
- xbt_cfg_set_parse(opt);
+ simgrid::config::set_parse(opt);
XBT_DEBUG("Did apply '%s' as config setting", opt);
} else if (not strcmp(argv[i], "--version")) {
printf("%s\n", SIMGRID_VERSION_STRING);
shall_exit = 1;
} else if (not strcmp(argv[i], "--cfg-help") || not strcmp(argv[i], "--help")) {
printf("Description of the configuration accepted by this simulator:\n");
- xbt_cfg_help();
+ simgrid::config::help();
printf(
"\n"
"Each of these configurations can be used by adding\n"
shall_exit = 1;
} else if (not strcmp(argv[i], "--help-aliases")) {
printf("Here is a list of all deprecated option names, with their replacement.\n");
- xbt_cfg_aliases();
+ simgrid::config::show_aliases();
printf("Please consider using the recent names\n");
shall_exit = 1;
} else if (not strcmp(argv[i], "--help-models")) {
if (not _sg_cfg_init_status)
return; /* Not initialized yet. Nothing to do */
- xbt_cfg_free(&simgrid_config);
+ simgrid::config::finalize();
_sg_cfg_init_status = 0;
}