Remove lazy lookup in getHome

this seems to break in Musl/Static with:

terminate called after throwing an instance of 'std::bad_function_call'
  what():  bad_function_call
This commit is contained in:
Matthew Bauer 2020-06-25 17:20:29 -04:00 committed by John Ericson
parent 70719a9dd8
commit da77331cb7
2 changed files with 3 additions and 51 deletions

View file

@ -1,48 +0,0 @@
#include <exception>
#include <functional>
#include <mutex>
namespace nix {
/* A helper class for lazily-initialized variables.
Lazy<T> var([]() { return value; });
declares a variable of type T that is initialized to 'value' (in a
thread-safe way) on first use, that is, when var() is first
called. If the initialiser code throws an exception, then all
subsequent calls to var() will rethrow that exception. */
template<typename T>
class Lazy
{
typedef std::function<T()> Init;
Init init;
std::once_flag done;
T value;
std::exception_ptr ex;
public:
Lazy(Init init) : init(init)
{ }
const T & operator () ()
{
std::call_once(done, [&]() {
try {
value = init();
} catch (...) {
ex = std::current_exception();
}
});
if (ex) std::rethrow_exception(ex);
return value;
}
};
}

View file

@ -1,4 +1,3 @@
#include "lazy.hh"
#include "util.hh" #include "util.hh"
#include "affinity.hh" #include "affinity.hh"
#include "sync.hh" #include "sync.hh"
@ -511,7 +510,8 @@ std::string getUserName()
} }
static Lazy<Path> getHome2([]() { static Path getHome2()
{
auto homeDir = getEnv("HOME"); auto homeDir = getEnv("HOME");
if (!homeDir) { if (!homeDir) {
std::vector<char> buf(16384); std::vector<char> buf(16384);
@ -523,7 +523,7 @@ static Lazy<Path> getHome2([]() {
homeDir = pw->pw_dir; homeDir = pw->pw_dir;
} }
return *homeDir; return *homeDir;
}); };
Path getHome() { return getHome2(); } Path getHome() { return getHome2(); }