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

Simplify getRootCgroup()

Browse source 
Static local initializers are atomic in C++.
This commit is contained in:
Parker Hoyes 2024-09-04 18:11:16 +00:00
parent 4c88deef38
commit 03484641a1
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libutil/linux/cgroup.cc
View file

@ -6,7 +6,6 @@
#include <chrono>
#include <cmath>
#include <mutex>
#include <regex>
#include <unordered_set>
#include <thread>
@ -158,22 +157,10 @@ std::string getCurrentCgroup()
return ourCgroup;
}
static std::optional<std::string> rootCgroup;
static std::mutex rootCgroupMutex;
std::string getRootCgroup()
{
{
std::lock_guard<std::mutex> guard(rootCgroupMutex);
if (rootCgroup)
return *rootCgroup;
}
auto current = getCurrentCgroup();
std::lock_guard<std::mutex> guard(rootCgroupMutex);
if (rootCgroup)
return *rootCgroup;
rootCgroup = current;
return current;
static std::string rootCgroup = getCurrentCgroup();
return rootCgroup;
}
}