From 0d9e050ba719515620a2e320a7b6bba35f1d1df6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Oct 2021 14:29:48 +0200 Subject: parseExperimentalFeature(): Initialize atomically --- src/libutil/experimental-features.cc | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/libutil/experimental-features.cc') diff --git a/src/libutil/experimental-features.cc b/src/libutil/experimental-features.cc index d1235d8a4..b49f47e1d 100644 --- a/src/libutil/experimental-features.cc +++ b/src/libutil/experimental-features.cc @@ -1,4 +1,6 @@ #include "experimental-features.hh" +#include "util.hh" + #include "nlohmann/json.hpp" namespace nix { @@ -14,17 +16,19 @@ std::map stringifiedXpFeatures = { const std::optional parseExperimentalFeature(const std::string_view & name) { using ReverseXpMap = std::map; - static ReverseXpMap * reverseXpMap; - if (!reverseXpMap) { - reverseXpMap = new ReverseXpMap{}; + + static auto reverseXpMap = []() + { + auto reverseXpMap = std::make_unique(); for (auto & [feature, name] : stringifiedXpFeatures) (*reverseXpMap)[name] = feature; - } + return reverseXpMap; + }(); - auto featureIter = reverseXpMap->find(name); - if (featureIter == reverseXpMap->end()) + if (auto feature = get(*reverseXpMap, name)) + return *feature; + else return std::nullopt; - return {featureIter->second}; } std::string_view showExperimentalFeature(const ExperimentalFeature feature) @@ -45,7 +49,7 @@ std::set parseFeatures(const std::set & rawFea MissingExperimentalFeature::MissingExperimentalFeature(ExperimentalFeature feature) : Error("experimental Nix feature '%1%' is disabled; use '--extra-experimental-features %1%' to override", showExperimentalFeature(feature)) , missingFeature(feature) - {} +{} std::ostream & operator <<(std::ostream & str, const ExperimentalFeature & feature) { -- cgit v1.2.3