wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-05 16:31:47 +02:00
Code Activity

Simplify ConfigRegistrations

Browse source
This commit is contained in:
Eelco Dolstra 2025-05-05 08:45:50 +02:00 • committed by Jörg Thalheim
parent f59ccb468e
commit 47989a2124
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libutil/config-global.cc
View file

@ -6,7 +6,7 @@ namespace nix {
bool GlobalConfig::set(const std::string & name, const std::string & value) bool GlobalConfig::set(const std::string & name, const std::string & value)
{ {
for (auto & config : *configRegistrations) for (auto & config : configRegistrations())
if (config->set(name, value)) if (config->set(name, value))
return true; return true;
@ -17,20 +17,20 @@ bool GlobalConfig::set(const std::string & name, const std::string & value)
void GlobalConfig::getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly) void GlobalConfig::getSettings(std::map<std::string, SettingInfo> & res, bool overriddenOnly)
{ {
for (auto & config : *configRegistrations) for (auto & config : configRegistrations())
config->getSettings(res, overriddenOnly); config->getSettings(res, overriddenOnly);
} }
void GlobalConfig::resetOverridden() void GlobalConfig::resetOverridden()
{ {
for (auto & config : *configRegistrations) for (auto & config : configRegistrations())
config->resetOverridden(); config->resetOverridden();
} }
nlohmann::json GlobalConfig::toJSON() nlohmann::json GlobalConfig::toJSON()
{ {
auto res = nlohmann::json::object(); auto res = nlohmann::json::object();
for (const auto & config : *configRegistrations) for (const auto & config : configRegistrations())
res.update(config->toJSON()); res.update(config->toJSON());
return res; return res;
} }
@ -47,19 +47,15 @@ std::string GlobalConfig::toKeyValue()
void GlobalConfig::convertToArgs(Args & args, const std::string & category) void GlobalConfig::convertToArgs(Args & args, const std::string & category)
{ {
for (auto & config : *configRegistrations) for (auto & config : configRegistrations())
config->convertToArgs(args, category); config->convertToArgs(args, category);
} }
GlobalConfig globalConfig; GlobalConfig globalConfig;
GlobalConfig::ConfigRegistrations * GlobalConfig::configRegistrations;
GlobalConfig::Register::Register(Config * config) GlobalConfig::Register::Register(Config * config)
{ {
if (!configRegistrations) configRegistrations().emplace_back(config);
configRegistrations = new ConfigRegistrations;
configRegistrations->emplace_back(config);
} }
ExperimentalFeatureSettings experimentalFeatureSettings; ExperimentalFeatureSettings experimentalFeatureSettings;

7
src/libutil/include/nix/util/config-global.hh
View file

@ -8,7 +8,12 @@ namespace nix {
struct GlobalConfig : public AbstractConfig struct GlobalConfig : public AbstractConfig
{ {
typedef std::vector<Config *> ConfigRegistrations; typedef std::vector<Config *> ConfigRegistrations;
static ConfigRegistrations * configRegistrations;
static ConfigRegistrations & configRegistrations()
{
static ConfigRegistrations configRegistrations;
return configRegistrations;
}
bool set(const std::string & name, const std::string & value) override; bool set(const std::string & name, const std::string & value) override;