Author: eelco
Date: Wed Oct 20 11:38:30 2010
New Revision: 24380
URL: https://svn.nixos.org/websvn/nix/?rev=24380&sc=1
Log:
* Use the Boehm garbage collector to reclaim unused memory in the Nix
expression evaluator.
Modified:
nix/branches/gc/src/libexpr/Makefile.am
nix/branches/gc/src/libexpr/eval.cc
nix/branches/gc/src/libexpr/eval.hh
nix/branches/gc/src/nix-env/Makefile.am
nix/branches/gc/src/nix-instantiate/Makefile.am
Modified: nix/branches/gc/src/libexpr/Makefile.am
==============================================================================
--- nix/branches/gc/src/libexpr/Makefile.am Wed Oct 20 10:53:45 2010
(r24379)
+++ nix/branches/gc/src/libexpr/Makefile.am Wed Oct 20 11:38:30 2010
(r24380)
@@ -20,7 +20,8 @@
AM_CXXFLAGS = \
-I$(srcdir)/.. \
- -I$(srcdir)/../libutil -I$(srcdir)/../libstore
+ -I$(srcdir)/../libutil -I$(srcdir)/../libstore \
+ -I/home/eelco/Dev/nix/boehmgc/include
# Parser generation.
Modified: nix/branches/gc/src/libexpr/eval.cc
==============================================================================
--- nix/branches/gc/src/libexpr/eval.cc Wed Oct 20 10:53:45 2010 (r24379)
+++ nix/branches/gc/src/libexpr/eval.cc Wed Oct 20 11:38:30 2010 (r24380)
@@ -8,6 +8,9 @@
#include <cstring>
+#include <gc/gc.h>
+#include <gc/gc_cpp.h>
+
#define LocalNoInline(f) static f __attribute__((noinline)); f
#define LocalNoInlineNoReturn(f) static f __attribute__((noinline, noreturn));
f
@@ -147,7 +150,7 @@
v.type = tPrimOp;
v.primOp.arity = arity;
v.primOp.fun = primOp;
- v.primOp.name = strdup(name2.c_str());
+ v.primOp.name = GC_strdup(name2.c_str());
staticBaseEnv.vars[symbols.create(name)] = baseEnvDispl;
baseEnv.values[baseEnvDispl++] = v;
(*baseEnv.values[0].attrs)[symbols.create(name2)].value = v;
@@ -218,7 +221,7 @@
void mkString(Value & v, const char * s)
{
v.type = tString;
- v.string.s = strdup(s);
+ v.string.s = GC_strdup(s);
v.string.context = 0;
}
@@ -228,9 +231,10 @@
mkString(v, s.c_str());
if (!context.empty()) {
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)
- v.string.context[n++] = strdup(i->c_str());
+ v.string.context[n++] = GC_strdup(i->c_str());
v.string.context[n] = 0;
}
}
@@ -239,7 +243,7 @@
void mkPath(Value & v, const char * s)
{
v.type = tPath;
- v.path = strdup(s);
+ v.path = GC_strdup(s);
}
@@ -264,7 +268,7 @@
Value * EvalState::allocValues(unsigned int count)
{
nrValues += count;
- return new Value[count]; // !!! check destructor
+ return (Value *) GC_MALLOC(count * sizeof(Value));
}
@@ -272,7 +276,7 @@
{
nrEnvs++;
nrValuesInEnvs += size;
- Env * env = (Env *) malloc(sizeof(Env) + size * sizeof(Value));
+ Env * env = (Env *) GC_MALLOC(sizeof(Env) + size * sizeof(Value));
return *env;
}
@@ -281,7 +285,7 @@
{
v.type = tList;
v.list.length = length;
- v.list.elems = new Value *[length];
+ v.list.elems = (Value * *) GC_MALLOC(length * sizeof(Value *));
nrListElems += length;
}
@@ -289,7 +293,7 @@
void EvalState::mkAttrs(Value & v)
{
v.type = tAttrs;
- v.attrs = new Bindings;
+ v.attrs = new (UseGC) Bindings;
}
@@ -1089,6 +1093,7 @@
bool showStats = getEnv("NIX_SHOW_STATS", "0") != "0";
Verbosity v = showStats ? lvlInfo : lvlDebug;
printMsg(v, "evaluation statistics:");
+ printMsg(v, format(" size of a value: %1%") % sizeof(Value));
printMsg(v, format(" expressions evaluated: %1%") % nrEvaluated);
printMsg(v, format(" stack space used: %1% bytes") % (&x - deepestStack));
printMsg(v, format(" max eval() nesting depth: %1%") % maxRecursionDepth);
Modified: nix/branches/gc/src/libexpr/eval.hh
==============================================================================
--- nix/branches/gc/src/libexpr/eval.hh Wed Oct 20 10:53:45 2010 (r24379)
+++ nix/branches/gc/src/libexpr/eval.hh Wed Oct 20 11:38:30 2010 (r24380)
@@ -7,6 +7,8 @@
#include <map>
+#include <gc/gc_allocator.h>
+
namespace nix {
@@ -16,7 +18,7 @@
struct Value;
struct Attr;
-typedef std::map<Symbol, Attr> Bindings;
+typedef std::map<Symbol, Attr, std::less<Symbol>, gc_allocator<std::pair<const
Symbol, Attr> > > Bindings;
typedef enum {
@@ -313,6 +315,7 @@
char * deepestStack; /* for measuring stack usage */
friend class RecursionCounter;
+ friend class ExprOpUpdate;
};
Modified: nix/branches/gc/src/nix-env/Makefile.am
==============================================================================
--- nix/branches/gc/src/nix-env/Makefile.am Wed Oct 20 10:53:45 2010
(r24379)
+++ nix/branches/gc/src/nix-env/Makefile.am Wed Oct 20 11:38:30 2010
(r24380)
@@ -4,7 +4,8 @@
nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la @ADDITIONAL_NETWORK_LIBS@
+ ../boost/format/libformat.la @ADDITIONAL_NETWORK_LIBS@ \
+ -L/home/eelco/Dev/nix/boehmgc/lib -lgc
nix-env.o: help.txt.hh
@@ -14,4 +15,5 @@
AM_CXXFLAGS = \
-I$(srcdir)/.. \
-I$(srcdir)/../libutil -I$(srcdir)/../libstore \
- -I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr
+ -I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr \
+ -I/home/eelco/Dev/nix/boehmgc/include
Modified: nix/branches/gc/src/nix-instantiate/Makefile.am
==============================================================================
--- nix/branches/gc/src/nix-instantiate/Makefile.am Wed Oct 20 10:53:45
2010 (r24379)
+++ nix/branches/gc/src/nix-instantiate/Makefile.am Wed Oct 20 11:38:30
2010 (r24380)
@@ -3,7 +3,8 @@
nix_instantiate_SOURCES = nix-instantiate.cc help.txt
nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la @ADDITIONAL_NETWORK_LIBS@
+ ../boost/format/libformat.la @ADDITIONAL_NETWORK_LIBS@ \
+ -L/home/eelco/Dev/nix/boehmgc/lib -lgc
nix-instantiate.o: help.txt.hh
@@ -12,4 +13,6 @@
AM_CXXFLAGS = \
-I$(srcdir)/.. -I$(srcdir)/../libutil -I$(srcdir)/../libstore \
- -I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr
+ -I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr \
+ -I/home/eelco/Dev/nix/boehmgc/include
+
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
