NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

Merge pull request #10854 from DeterminateSystems/thread-safe-RegexCache

Browse source 
Make RegexCache thread-safe
This commit is contained in:
Robert Hensing 2024-06-08 18:07:35 +02:00 committed by GitHub
parent e1b3716d50 fbbca59453
commit 0ab9369572
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/libexpr/primops.cc
View file

@ -4062,17 +4062,23 @@ static RegisterPrimOp primop_convertHash({
struct RegexCache struct RegexCache
{ {
// TODO use C++20 transparent comparison when available struct State
std::unordered_map<std::string_view, std::regex> cache; {
std::list<std::string> keys; // TODO use C++20 transparent comparison when available
std::unordered_map<std::string_view, std::regex> cache;
std::list<std::string> keys;
};
Sync<State> state_;
std::regex get(std::string_view re) std::regex get(std::string_view re)
{ {
auto it = cache.find(re); auto state(state_.lock());
if (it != cache.end()) auto it = state->cache.find(re);
if (it != state->cache.end())
return it->second; return it->second;
keys.emplace_back(re); state->keys.emplace_back(re);
return cache.emplace(keys.back(), std::regex(keys.back(), std::regex::extended)).first->second; return state->cache.emplace(state->keys.back(), std::regex(state->keys.back(), std::regex::extended)).first->second;
} }
}; };