chaostheorie/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Memoise checkSourcePath()

Browse source 
This prevents hydra-eval-jobs from statting the same files over and
over again.
This commit is contained in:
Eelco Dolstra 2018-05-22 13:02:14 +02:00
parent 9064dd2f4d
commit 9fd7cf98db
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/eval.cc
View file

@ -352,6 +352,10 @@ Path EvalState::checkSourcePath(const Path & path_)
{ {
if (!allowedPaths) return path_; if (!allowedPaths) return path_;
auto i = resolvedPaths.find(path_);
if (i != resolvedPaths.end())
return i->second;
bool found = false; bool found = false;
for (auto & i : *allowedPaths) { for (auto & i : *allowedPaths) {
@ -369,9 +373,11 @@ Path EvalState::checkSourcePath(const Path & path_)
Path path = canonPath(path_, true); Path path = canonPath(path_, true);
for (auto & i : *allowedPaths) { for (auto & i : *allowedPaths) {
if (isDirOrInDir(path, i)) if (isDirOrInDir(path, i)) {
resolvedPaths[path_] = path;
return path; return path;
} }
}
throw RestrictedPathError("access to path '%1%' is forbidden in restricted mode", path); throw RestrictedPathError("access to path '%1%' is forbidden in restricted mode", path);
} }

4
src/libexpr/eval.hh
View file

@ -7,6 +7,7 @@
#include "hash.hh" #include "hash.hh"
#include <map> #include <map>
#include <unordered_map>
namespace nix { namespace nix {
@ -100,6 +101,9 @@ private:
std::map<std::string, std::pair<bool, std::string>> searchPathResolved; std::map<std::string, std::pair<bool, std::string>> searchPathResolved;
/* Cache used by checkSourcePath(). */
std::unordered_map<Path, Path> resolvedPaths;
public: public:
EvalState(const Strings & _searchPath, ref<Store> store); EvalState(const Strings & _searchPath, ref<Store> store);