From 76feaf016a7e9a9b019148df5ff84a63e48dbda7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 Oct 2010 15:48:00 +0000 Subject: [PATCH] * Keep some more stats. --- src/libexpr/eval.cc | 9 +++++++++ src/libexpr/eval.hh | 3 +++ 2 files changed, 12 insertions(+) diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index ba331749f..46978f6d0 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -119,6 +119,7 @@ EvalState::EvalState() { nrEnvs = nrValuesInEnvs = nrValues = nrListElems = 0; nrEvaluated = recursionDepth = maxRecursionDepth = 0; + nrAttrsets = nrOpUpdates = nrOpUpdateValuesCopied = 0; deepestStack = (char *) -1; createBaseEnv(); @@ -294,6 +295,7 @@ void EvalState::mkAttrs(Value & v) { v.type = tAttrs; v.attrs = new (UseGC) Bindings; + nrAttrsets++; } @@ -758,6 +760,8 @@ void ExprOpUpdate::eval(EvalState & state, Env & env, Value & v) state.evalAttrs(env, e1, v1); state.evalAttrs(env, e2, v2); + state.nrOpUpdates++; + if (v1.attrs->size() == 0) { v = v2; return; } if (v2.attrs->size() == 0) { v = v1; return; } @@ -768,6 +772,8 @@ void ExprOpUpdate::eval(EvalState & state, Env & env, Value & v) mkCopy(a.value, i->second.value); a.pos = i->second.pos; } + + state.nrOpUpdateValuesCopied += v.attrs->size(); } @@ -1107,6 +1113,9 @@ void EvalState::printStats() % nrListElems % (nrListElems * sizeof(Value *))); printMsg(v, format(" misc. values allocated: %1% (%2% bytes)") % nrValues % (nrValues * sizeof(Value))); + printMsg(v, format(" attribute sets allocated: %1%") % nrAttrsets); + printMsg(v, format(" right-biased unions: %1%") % nrOpUpdates); + printMsg(v, format(" values copied in right-biased unions: %1%") % nrOpUpdateValuesCopied); printMsg(v, format(" symbols in symbol table: %1%") % symbols.size()); } diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index d74a03506..9144d99a4 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -310,6 +310,9 @@ private: unsigned long nrValues; unsigned long nrListElems; unsigned long nrEvaluated; + unsigned long nrAttrsets; + unsigned long nrOpUpdates; + unsigned long nrOpUpdateValuesCopied; unsigned int recursionDepth; unsigned int maxRecursionDepth; char * deepestStack; /* for measuring stack usage */