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

* Cache result of fstatePaths(). TODO: do this in fstore.cc.

Browse source
This commit is contained in:
Eelco Dolstra 2003-08-05 12:29:47 +00:00
parent fd30f52cfc
commit 4ce652640b
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/fix.cc
View file

@ -9,12 +9,14 @@
typedef ATerm Expr; typedef ATerm Expr;
typedef map<ATerm, ATerm> NormalForms; typedef map<ATerm, ATerm> NormalForms;
typedef map<FSId, Strings> PkgPaths;
typedef map<FSId, Hash> PkgHashes; typedef map<FSId, Hash> PkgHashes;
struct EvalState struct EvalState
{ {
Strings searchDirs; Strings searchDirs;
NormalForms normalForms; NormalForms normalForms;
PkgPaths pkgPaths;
PkgHashes pkgHashes; /* normalised package hashes */ PkgHashes pkgHashes; /* normalised package hashes */
}; };
@ -106,7 +108,20 @@ static Expr substExprMany(ATermList formals, ATermList args, Expr body)
} }
Hash hashPackage(EvalState & state, FState fs) static Strings fstatePathsCached(EvalState & state, const FSId & id)
{
PkgPaths::iterator i = state.pkgPaths.find(id);
if (i != state.pkgPaths.end())
return i->second;
else {
Strings paths = fstatePaths(id);
state.pkgPaths[id] = paths;
return paths;
}
}
static Hash hashPackage(EvalState & state, FState fs)
{ {
if (fs.type == FState::fsDerive) { if (fs.type == FState::fsDerive) {
for (FSIds::iterator i = fs.derive.inputs.begin(); for (FSIds::iterator i = fs.derive.inputs.begin();
@ -214,7 +229,7 @@ static Expr evalExpr2(EvalState & state, Expr e)
if (ATmatch(value, "FSId(<str>)", &s1)) { if (ATmatch(value, "FSId(<str>)", &s1)) {
FSId id = parseHash(s1); FSId id = parseHash(s1);
Strings paths = fstatePaths(id); Strings paths = fstatePathsCached(state, id);
if (paths.size() != 1) abort(); if (paths.size() != 1) abort();
string path = *(paths.begin()); string path = *(paths.begin());
fs.derive.inputs.push_back(id); fs.derive.inputs.push_back(id);