lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Don't call GC_expand_hp unless we're actually using the garbage

Browse source 
collector.
This commit is contained in:
Eelco Dolstra 2011-02-09 22:59:50 +00:00
parent f1462c208b
commit 5a6b039802
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/libexpr/eval.cc
View file

@ -151,6 +151,24 @@ EvalState::EvalState()
createBaseEnv();
allowUnsafeEquality = getEnv("NIX_NO_UNSAFE_EQ", "") == "";
#if HAVE_BOEHMGC
static bool gcInitialised = true;
if (gcInitialised) {
/* Set the initial heap size to something fairly big (384 MiB)
so that in most cases we don't need to garbage collect at
all. (Collection has a fairly significant overhead.) The
heap size can be overriden through libgc's
GC_INITIAL_HEAP_SIZE environment variable. We should
probably also provide a nix.conf setting for this. Note
that GC_expand_hp() causes a lot of virtual, but not
physical (resident) memory to be allocated. This might be
a problem on systems that don't overcommit. */
if (!getenv("GC_INITIAL_HEAP_SIZE"))
GC_expand_hp(384 * 1024 * 1024);
gcInitialised = true;
}
#endif
}

12
src/libmain/shared.cc
View file

@ -356,18 +356,6 @@ int main(int argc, char * * argv)
GC_INIT();
GC_oom_fn = oomHandler;
/* Set the initial heap size to something fairly big (384 MiB) so
that in most cases we don't need to garbage collect at all.
(Collection has a fairly significant overhead, some.) The heap
size can be overriden through libgc's GC_INITIAL_HEAP_SIZE
environment variable. We should probably also provide a
nix.conf setting for this. Note that GC_expand_hp() causes a
lot of virtual, but not physical (resident) memory to be
allocated. This might be a problem on systems that don't
overcommit. */
if (!getenv("GC_INITIAL_HEAP_SIZE"))
GC_expand_hp(384 * 1024 * 1024);
#endif
try {