maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Eelco Dolstra 2015-07-23 23:14:07 +02:00
parent c8bb2371eb
commit cb4320c1a0
2 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/eval.cc
View file

@ -261,14 +261,9 @@ EvalState::EvalState(const Strings & _searchPath)
, sLine(symbols.create("line")) , sLine(symbols.create("line"))
, sColumn(symbols.create("column")) , sColumn(symbols.create("column"))
, sFunctor(symbols.create("__functor")) , sFunctor(symbols.create("__functor"))
, repair(false)
, baseEnv(allocEnv(128)) , baseEnv(allocEnv(128))
, staticBaseEnv(false, 0) , staticBaseEnv(false, 0)
, baseEnvDispl(0)
{ {
nrEnvs = nrValuesInEnvs = nrValues = nrListElems = 0;
nrAttrsets = nrAttrsInAttrsets = nrOpUpdates = nrOpUpdateValuesCopied = 0;
nrListConcats = nrPrimOpCalls = nrFunctionCalls = 0;
countCalls = getEnv("NIX_COUNT_CALLS", "0") != "0"; countCalls = getEnv("NIX_COUNT_CALLS", "0") != "0";
restricted = settings.get("restrict-eval", false); restricted = settings.get("restrict-eval", false);

26
src/libexpr/eval.hh
View file

@ -74,7 +74,7 @@ public:
/* If set, force copying files to the Nix store even if they /* If set, force copying files to the Nix store even if they
already exist there. */ already exist there. */
bool repair; bool repair = false;
/* If set, don't allow access to files outside of the Nix search /* If set, don't allow access to files outside of the Nix search
path or to environment variables. */ path or to environment variables. */
@ -183,7 +183,7 @@ public:
private: private:
unsigned int baseEnvDispl; unsigned int baseEnvDispl = 0;
void createBaseEnv(); void createBaseEnv();
@ -240,17 +240,17 @@ public:
private: private:
unsigned long nrEnvs; unsigned long nrEnvs = 0;
unsigned long nrValuesInEnvs; unsigned long nrValuesInEnvs = 0;
unsigned long nrValues; unsigned long nrValues = 0;
unsigned long nrListElems; unsigned long nrListElems = 0;
unsigned long nrAttrsets; unsigned long nrAttrsets = 0;
unsigned long nrAttrsInAttrsets; unsigned long nrAttrsInAttrsets = 0;
unsigned long nrOpUpdates; unsigned long nrOpUpdates = 0;
unsigned long nrOpUpdateValuesCopied; unsigned long nrOpUpdateValuesCopied = 0;
unsigned long nrListConcats; unsigned long nrListConcats = 0;
unsigned long nrPrimOpCalls; unsigned long nrPrimOpCalls = 0;
unsigned long nrFunctionCalls; unsigned long nrFunctionCalls = 0;
bool countCalls; bool countCalls;