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

* Fix compiling without Boehm.

Browse source 
* Fix the stats.
This commit is contained in:
Eelco Dolstra 2010-10-23 22:58:24 +00:00
parent 02934b1200
commit a247d20604
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libexpr/eval.cc
View file

@ -13,11 +13,15 @@
#include <gc/gc.h> #include <gc/gc.h>
#include <gc/gc_cpp.h> #include <gc/gc_cpp.h>
#define NEW (UseGC)
#else #else
#define GC_STRDUP strdup #define GC_STRDUP strdup
#define GC_MALLOC malloc #define GC_MALLOC malloc
#define NEW new
#endif #endif
@ -159,7 +163,7 @@ void EvalState::addPrimOp(const string & name,
string name2 = string(name, 0, 2) == "__" ? string(name, 2) : name; string name2 = string(name, 0, 2) == "__" ? string(name, 2) : name;
Symbol sym = symbols.create(name); Symbol sym = symbols.create(name);
v->type = tPrimOp; v->type = tPrimOp;
v->primOp = new (UseGC) PrimOp(primOp, arity, sym); v->primOp = NEW PrimOp(primOp, arity, sym);
staticBaseEnv.vars[sym] = baseEnvDispl; staticBaseEnv.vars[sym] = baseEnvDispl;
baseEnv.values[baseEnvDispl++] = v; baseEnv.values[baseEnvDispl++] = v;
(*baseEnv.values[0]->attrs)[symbols.create(name2)].value = v; (*baseEnv.values[0]->attrs)[symbols.create(name2)].value = v;
@ -320,11 +324,7 @@ void EvalState::mkAttrs(Value & v)
{ {
clearValue(v); clearValue(v);
v.type = tAttrs; v.type = tAttrs;
#if HAVE_BOEHMGC v.attrs = NEW Bindings;
v.attrs = new (UseGC) Bindings;
#else
v.attrs = new Bindings;
#endif
nrAttrsets++; nrAttrsets++;
} }
@ -1133,12 +1133,10 @@ void EvalState::printStats()
printMsg(v, format(" stack space per eval() level: %1% bytes") printMsg(v, format(" stack space per eval() level: %1% bytes")
% ((&x - deepestStack) / (float) maxRecursionDepth)); % ((&x - deepestStack) / (float) maxRecursionDepth));
printMsg(v, format(" environments allocated: %1% (%2% bytes)") printMsg(v, format(" environments allocated: %1% (%2% bytes)")
% nrEnvs % (nrEnvs * sizeof(Env))); % nrEnvs % (nrEnvs * sizeof(Env) + nrValuesInEnvs * sizeof(Value *)));
printMsg(v, format(" values allocated in environments: %1% (%2% bytes)")
% nrValuesInEnvs % (nrValuesInEnvs * sizeof(Value)));
printMsg(v, format(" list elements: %1% (%2% bytes)") printMsg(v, format(" list elements: %1% (%2% bytes)")
% nrListElems % (nrListElems * sizeof(Value *))); % nrListElems % (nrListElems * sizeof(Value *)));
printMsg(v, format(" misc. values allocated: %1% (%2% bytes)") printMsg(v, format(" values allocated: %1% (%2% bytes)")
% nrValues % (nrValues * sizeof(Value))); % nrValues % (nrValues * sizeof(Value)));
printMsg(v, format(" attribute sets allocated: %1%") % nrAttrsets); printMsg(v, format(" attribute sets allocated: %1%") % nrAttrsets);
printMsg(v, format(" right-biased unions: %1%") % nrOpUpdates); printMsg(v, format(" right-biased unions: %1%") % nrOpUpdates);