XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
XBT_EXPORT_NO_IMPORT(xbt_cfg_t) simgrid_config = nullptr;
+extern "C" {
+ XBT_PUBLIC(void) sg_config_finalize();
+}
namespace simgrid {
namespace config {
XBT_PUBLIC(void) declareFlag(const char* name, const char* description,
T value, std::function<void(const T&)> callback)
{
- if (simgrid_config == nullptr)
+ if (simgrid_config == nullptr) {
simgrid_config = xbt_cfg_new();
+ atexit(sg_config_finalize);
+ }
simgrid_config->registerOption<T>(
name, description, std::move(value), std::move(callback));
}
// ***** C bindings *****
-xbt_cfg_t xbt_cfg_new(void) { return new simgrid::config::Config(); }
+xbt_cfg_t xbt_cfg_new() { return new simgrid::config::Config(); }
void xbt_cfg_free(xbt_cfg_t * cfg) { delete *cfg; }
void xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg)
void xbt_cfg_register_int(const char *name, int default_value,xbt_cfg_cb_t cb_set, const char *desc)
{
- if (simgrid_config == nullptr)
+ if (simgrid_config == nullptr) {
simgrid_config = xbt_cfg_new();
+ atexit(&sg_config_finalize);
+ }
simgrid_config->registerOption<int>(name, desc, default_value, cb_set);
}
void xbt_cfg_register_string(const char *name, const char *default_value, xbt_cfg_cb_t cb_set, const char *desc)
{
- if (simgrid_config == nullptr)
+ if (simgrid_config == nullptr) {
simgrid_config = xbt_cfg_new();
+ atexit(sg_config_finalize);
+ }
simgrid_config->registerOption<std::string>(name, desc,
default_value ? default_value : "", cb_set);
}
void xbt_cfg_register_boolean(const char *name, const char*default_value,xbt_cfg_cb_t cb_set, const char *desc)
{
- if (simgrid_config == nullptr)
+ if (simgrid_config == nullptr) {
simgrid_config = xbt_cfg_new();
+ atexit(sg_config_finalize);
+ }
simgrid_config->registerOption<bool>(name, desc, simgrid::config::parseBool(default_value), cb_set);
}
void xbt_cfg_register_alias(const char *realname, const char *aliasname)
{
- if (simgrid_config == nullptr)
+ if (simgrid_config == nullptr) {
simgrid_config = xbt_cfg_new();
+ atexit(sg_config_finalize);
+ }
simgrid_config->alias(realname, aliasname);
}
-void xbt_cfg_aliases(void) { simgrid_config->showAliases(); }
-void xbt_cfg_help(void) { simgrid_config->help(); }
+void xbt_cfg_aliases() { simgrid_config->showAliases(); }
+void xbt_cfg_help() { simgrid_config->help(); }
/*----[ Setting ]---------------------------------------------------------*/
/* don't free(optionlist_cpy) if the assert fails, 'name' points inside it */
*(val++) = '\0';
- if (strncmp(name, "contexts/", strlen("contexts/")) && strncmp(name, "path", strlen("path")))
+ if (strncmp(name, "path", strlen("path")))
XBT_INFO("Configuration change: Set '%s' to '%s'", name, val);
try {
free(optionlist_cpy);
return;
+ /* Do not THROWF from a C++ exception catching context, or some cleanups will be missing */
on_missing_key:
free(optionlist_cpy);
THROWF(not_found_error, 0, "Could not set variables %s", options);
on_exception:
free(optionlist_cpy);
THROWF(unknown_error, 0, "Could not set variables %s", options);
- return;
}
// Horrible mess to translate C++ exceptions to C exceptions: