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

Remove canary stuff

Browse source
This commit is contained in:
Eelco Dolstra 2014-12-12 10:59:50 +01:00
parent a144eb1415
commit 8aedaf111e
4 changed files with 0 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/libexpr/primops.cc
View file

@ -417,32 +417,6 @@ static void prim_trace(EvalState & state, const Pos & pos, Value * * args, Value
}
#if HAVE_BOEHMGC
void canaryFinalizer(GC_PTR obj, GC_PTR client_data)
{
Value * v = (Value *) obj;
EvalState & state(* (EvalState *) client_data);
printMsg(lvlError, format("canary ‘%1%’ garbage-collected") % v->string.s);
auto i = state.gcCanaries.find(v);
assert(i != state.gcCanaries.end());
state.gcCanaries.erase(i);
}
#endif
void prim_gcCanary(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
string s = state.forceStringNoCtx(*args[0], pos);
state.mkList(v, 1);
Value * canary = v.list.elems[0] = state.allocValue();
#if HAVE_BOEHMGC
state.gcCanaries.insert(canary);
GC_register_finalizer(canary, canaryFinalizer, &state, 0, 0);
#endif
mkString(*canary, s);
}
void prim_valueSize(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
/* We're not forcing the argument on purpose. */
@ -1560,7 +1534,6 @@ void EvalState::createBaseEnv()
// Debugging
addPrimOp("__trace", 2, prim_trace);
addPrimOp("__gcCanary", 1, prim_gcCanary);
addPrimOp("__valueSize", 1, prim_valueSize);
// Paths