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

* new(UseGC) is inexplicably slower than GC_MALLOC, so prefer the

Browse source 
latter.
This commit is contained in:
Eelco Dolstra 2010-10-28 12:50:01 +00:00
parent e11e6fb1c6
commit 0c4828ea05
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/eval.cc
View file

@ -259,7 +259,8 @@ void mkString(Value & v, const string & s, const PathSet & context)
mkString(v, s.c_str()); mkString(v, s.c_str());
if (!context.empty()) { if (!context.empty()) {
unsigned int n = 0; unsigned int n = 0;
v.string.context = NEW const char *[context.size() + 1]; v.string.context = (const char * *)
GC_MALLOC((context.size() + 1) * sizeof(char *));
foreach (PathSet::const_iterator, i, context) foreach (PathSet::const_iterator, i, context)
v.string.context[n++] = GC_STRDUP(i->c_str()); v.string.context[n++] = GC_STRDUP(i->c_str());
v.string.context[n] = 0; v.string.context[n] = 0;
@ -304,7 +305,7 @@ Value * EvalState::lookupVar(Env * env, const VarRef & var)
Value * EvalState::allocValue() Value * EvalState::allocValue()
{ {
nrValues++; nrValues++;
return NEW Value; return (Value *) GC_MALLOC(sizeof(Value));
} }
@ -313,7 +314,6 @@ Env & EvalState::allocEnv(unsigned int size)
nrEnvs++; nrEnvs++;
nrValuesInEnvs += size; nrValuesInEnvs += size;
Env * env = (Env *) GC_MALLOC(sizeof(Env) + size * sizeof(Value *)); Env * env = (Env *) GC_MALLOC(sizeof(Env) + size * sizeof(Value *));
if (!env) throw std::bad_alloc();
/* Clear the values because maybeThunk() expects this. */ /* Clear the values because maybeThunk() expects this. */
for (unsigned i = 0; i < size; ++i) for (unsigned i = 0; i < size; ++i)
@ -335,7 +335,7 @@ void EvalState::mkList(Value & v, unsigned int length)
{ {
v.type = tList; v.type = tList;
v.list.length = length; v.list.length = length;
v.list.elems = NEW Value *[length]; v.list.elems = (Value * *) GC_MALLOC(length * sizeof(Value *));
nrListElems += length; nrListElems += length;
} }