lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Cache parse trees

Browse source 
This prevents EvalState::resetFileCache() from parsing everything all
over again.
This commit is contained in:
Eelco Dolstra 2018-06-11 16:06:01 +02:00
parent 6ad0a2f749
commit 24c6806994
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/eval.cc
View file

@ -332,7 +332,6 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
EvalState::~EvalState() EvalState::~EvalState()
{ {
fileEvalCache.clear();
} }
@ -711,7 +710,17 @@ void EvalState::evalFile(const Path & path_, Value & v)
} }
printTalkative("evaluating file '%1%'", path2); printTalkative("evaluating file '%1%'", path2);
Expr * e = parseExprFromFile(checkSourcePath(path2)); Expr * e = nullptr;
auto j = fileParseCache.find(path2);
if (j != fileParseCache.end())
e = j->second;
if (!e)
e = parseExprFromFile(checkSourcePath(path2));
fileParseCache[path2] = e;
try { try {
eval(e, v); eval(e, v);
} catch (Error & e) { } catch (Error & e) {

8
src/libexpr/eval.hh
View file

@ -90,6 +90,14 @@ public:
private: private:
SrcToStore srcToStore; SrcToStore srcToStore;
/* A cache from path names to parse trees. */
#if HAVE_BOEHMGC
typedef std::map<Path, Expr *, std::less<Path>, traceable_allocator<std::pair<const Path, Expr *> > > FileParseCache;
#else
typedef std::map<Path, Expr *> FileParseCache;
#endif
FileParseCache fileParseCache;
/* A cache from path names to values. */ /* A cache from path names to values. */
#if HAVE_BOEHMGC #if HAVE_BOEHMGC
typedef std::map<Path, Value, std::less<Path>, traceable_allocator<std::pair<const Path, Value> > > FileEvalCache; typedef std::map<Path, Value, std::less<Path>, traceable_allocator<std::pair<const Path, Value> > > FileEvalCache;