From 62f72eb9e1a4421a9d4ea3e06f467e49869c0e51 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 12 Aug 2012 23:41:48 -0400 Subject: [PATCH] Add some more evaluations stats --- src/libexpr/eval.cc | 7 +++++++ src/libexpr/eval.hh | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 2d41eba0e..a1a227c8a 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -144,6 +144,7 @@ EvalState::EvalState() { nrEnvs = nrValuesInEnvs = nrValues = nrListElems = 0; nrAttrsets = nrOpUpdates = nrOpUpdateValuesCopied = 0; + nrListConcats = nrPrimOpCalls = nrFunctionCalls = 0; countCalls = getEnv("NIX_COUNT_CALLS", "0") != "0"; #if HAVE_BOEHMGC @@ -705,6 +706,7 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v) vArgs[n--] = arg->primOpApp.right; /* And call the primop. */ + nrPrimOpCalls++; if (countCalls) primOpCalls[primOp->primOp->name]++; try { primOp->primOp->fun(*this, vArgs, v); @@ -766,6 +768,7 @@ void EvalState::callFunction(Value & fun, Value & arg, Value & v) throwTypeError("function at %1% called with unexpected argument", fun.lambda.fun->pos); } + nrFunctionCalls++; if (countCalls) functionCalls[fun.lambda.fun->pos]++; try { @@ -909,6 +912,7 @@ void ExprOpUpdate::eval(EvalState & state, Env & env, Value & v) void ExprOpConcatLists::eval(EvalState & state, Env & env, Value & v) { + state.nrListConcats++; Value v1; e1->eval(state, env, v1); state.forceList(v1); Value v2; e2->eval(state, env, v2); @@ -1215,6 +1219,7 @@ void EvalState::printStats() % nrEnvs % (nrEnvs * sizeof(Env) + nrValuesInEnvs * sizeof(Value *))); printMsg(v, format(" list elements: %1% (%2% bytes)") % nrListElems % (nrListElems * sizeof(Value *))); + printMsg(v, format(" list concatenations: %1%") % nrListConcats); printMsg(v, format(" values allocated: %1% (%2% bytes)") % nrValues % (nrValues * sizeof(Value))); printMsg(v, format(" attribute sets allocated: %1%") % nrAttrsets); @@ -1224,6 +1229,8 @@ void EvalState::printStats() printMsg(v, format(" number of thunks: %1%") % nrThunks); printMsg(v, format(" number of thunks avoided: %1%") % nrAvoided); printMsg(v, format(" number of attr lookups: %1%") % nrLookups); + printMsg(v, format(" number of primop calls: %1%") % nrPrimOpCalls); + printMsg(v, format(" number of function calls: %1%") % nrFunctionCalls); if (countCalls) { diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index 540f1e200..4e66c4dfc 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -236,7 +236,7 @@ public: void printStats(); private: - + unsigned long nrEnvs; unsigned long nrValuesInEnvs; unsigned long nrValues; @@ -244,6 +244,9 @@ private: unsigned long nrAttrsets; unsigned long nrOpUpdates; unsigned long nrOpUpdateValuesCopied; + unsigned long nrListConcats; + unsigned long nrPrimOpCalls; + unsigned long nrFunctionCalls; bool countCalls; @@ -257,6 +260,7 @@ private: AttrSelects attrSelects; friend class ExprOpUpdate; + friend class ExprOpConcatLists; friend class ExprSelect; friend void prim_getAttr(EvalState & state, Value * * args, Value & v); };