mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix/libexpr): Use gc_cpp to allocate Value instances

Browse source
This commit is contained in:
Vincent Ambo 2020-05-22 16:57:48 +01:00
parent b3c9166b23
commit 618f9a6f07
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
third_party/nix/src/libexpr/eval.cc vendored
View file

@ -5,7 +5,10 @@
#include <cstring>
#include <fstream>
#include <iostream>
#include <new>
#include <gc/gc.h>
#include <gc/gc_cpp.h>
#include <glog/logging.h>
#include <sys/resource.h>
#include <sys/time.h>
@ -21,22 +24,11 @@
#include "store-api.hh"
#include "util.hh"
#if HAVE_BOEHMGC
#include <gc/gc.h>
#include <gc/gc_cpp.h>
#endif
namespace nix {
static char* dupString(const char* s) {
char* t;
#if HAVE_BOEHMGC
t = GC_STRDUP(s);
#else
t = strdup(s);
#endif
if (t == nullptr) {
throw std::bad_alloc();
}
@ -617,21 +609,13 @@ inline Value* EvalState::lookupVar(Env* env, const ExprVar& var, bool noEval) {
var.pos);
}
for (size_t l = env->prevWith; l != 0u; --l, env = env->up) {
;
}
}
}
std::atomic<uint64_t> nrValuesFreed{0};
void finalizeValue(void* obj, void* data) { nrValuesFreed++; }
Value* EvalState::allocValue() {
nrValues++;
auto v = (Value*)allocBytes(sizeof(Value));
// GC_register_finalizer_no_order(v, finalizeValue, nullptr, nullptr,
// nullptr);
return v;
return new (GC) Value;
}
Env& EvalState::allocEnv(size_t size) {