aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/Makefile.am9
-rw-r--r--src/libstore/derivations-ast.def10
-rw-r--r--src/libstore/derivations.cc224
-rw-r--r--src/libstore/derivations.hh15
-rw-r--r--src/libstore/local-store.cc5
-rw-r--r--src/libstore/misc.cc6
6 files changed, 123 insertions, 146 deletions
diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am
index dd6760554..e19256b92 100644
--- a/src/libstore/Makefile.am
+++ b/src/libstore/Makefile.am
@@ -12,17 +12,12 @@ pkginclude_HEADERS = \
libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la ${aterm_lib} ${sqlite_lib}
-BUILT_SOURCES = derivations-ast.cc derivations-ast.hh
-
-EXTRA_DIST = derivations-ast.def derivations-ast.cc schema.sql
+EXTRA_DIST = schema.sql
AM_CXXFLAGS = -Wall \
- -I$(srcdir)/.. ${aterm_include} ${sqlite_include} -I$(srcdir)/../libutil -I${top_srcdir}/externals/sqlite-3.6.22/
+ ${sqlite_include} -I$(srcdir)/.. -I$(srcdir)/../libutil
local-store.lo: schema.sql.hh
%.sql.hh: %.sql
../bin2c/bin2c schema < $< > $@ || (rm $@ && exit 1)
-
-derivations-ast.cc derivations-ast.hh: ../aterm-helper.pl derivations-ast.def
- $(perl) $(srcdir)/../aterm-helper.pl derivations-ast.hh derivations-ast.cc < $(srcdir)/derivations-ast.def
diff --git a/src/libstore/derivations-ast.def b/src/libstore/derivations-ast.def
deleted file mode 100644
index 574529ae7..000000000
--- a/src/libstore/derivations-ast.def
+++ /dev/null
@@ -1,10 +0,0 @@
-init initDerivationsHelpers
-
-Derive | ATermList ATermList ATermList string string ATermList ATermList | ATerm |
-
-| string string | ATerm | EnvBinding |
-| string ATermList | ATerm | DerivationInput |
-| string string string string | ATerm | DerivationOutput |
-
-Closure | ATermList ATermList | ATerm | OldClosure |
-| string ATermList | ATerm | OldClosureElem |
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index bc2ec1f90..e321ae8aa 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -1,22 +1,12 @@
#include "derivations.hh"
#include "store-api.hh"
-#include "aterm.hh"
#include "globals.hh"
#include "util.hh"
-#include "derivations-ast.hh"
-#include "derivations-ast.cc"
-
namespace nix {
-Hash hashTerm(ATerm t)
-{
- return hashString(htSHA256, atPrint(t));
-}
-
-
Path writeDerivation(const Derivation & drv, const string & name)
{
PathSet references;
@@ -27,137 +17,151 @@ Path writeDerivation(const Derivation & drv, const string & name)
(that can be missing (of course) and should not necessarily be
held during a garbage collection). */
string suffix = name + drvExtension;
- string contents = atPrint(unparseDerivation(drv));
+ string contents = unparseDerivation(drv);
return readOnlyMode
? computeStorePathForText(suffix, contents, references)
: store->addTextToStore(suffix, contents, references);
}
-static void checkPath(const string & s)
+static Path parsePath(std::istream & str)
{
+ string s = parseString(str);
if (s.size() == 0 || s[0] != '/')
throw Error(format("bad path `%1%' in derivation") % s);
+ return s;
}
-static void parseStrings(ATermList paths, StringSet & out, bool arePaths)
+static StringSet parseStrings(std::istream & str, bool arePaths)
{
- for (ATermIterator i(paths); i; ++i) {
- if (ATgetType(*i) != AT_APPL)
- throw badTerm("not a path", *i);
- string s = aterm2String(*i);
- if (arePaths) checkPath(s);
- out.insert(s);
- }
+ StringSet res;
+ while (!endOfList(str))
+ res.insert(arePaths ? parsePath(str) : parseString(str));
+ return res;
}
+
-
-/* Shut up warnings. */
-void throwBadDrv(ATerm t) __attribute__ ((noreturn));
-
-void throwBadDrv(ATerm t)
-{
- throw badTerm("not a valid derivation", t);
-}
-
-
-Derivation parseDerivation(ATerm t)
+Derivation parseDerivation(const string & s)
{
Derivation drv;
- ATermList outs, inDrvs, inSrcs, args, bnds;
- ATerm builder, platform;
+ std::istringstream str(s);
+ expect(str, "Derive([");
- if (!matchDerive(t, outs, inDrvs, inSrcs, platform, builder, args, bnds))
- throwBadDrv(t);
-
- for (ATermIterator i(outs); i; ++i) {
- ATerm id, path, hashAlgo, hash;
- if (!matchDerivationOutput(*i, id, path, hashAlgo, hash))
- throwBadDrv(t);
+ /* Parse the list of outputs. */
+ while (!endOfList(str)) {
DerivationOutput out;
- out.path = aterm2String(path);
- checkPath(out.path);
- out.hashAlgo = aterm2String(hashAlgo);
- out.hash = aterm2String(hash);
- drv.outputs[aterm2String(id)] = out;
+ expect(str, "("); string id = parseString(str);
+ expect(str, ","); out.path = parsePath(str);
+ expect(str, ","); out.hashAlgo = parseString(str);
+ expect(str, ","); out.hash = parseString(str);
+ expect(str, ")");
+ drv.outputs[id] = out;
}
- for (ATermIterator i(inDrvs); i; ++i) {
- ATerm drvPath;
- ATermList ids;
- if (!matchDerivationInput(*i, drvPath, ids))
- throwBadDrv(t);
- Path drvPath2 = aterm2String(drvPath);
- checkPath(drvPath2);
- StringSet ids2;
- parseStrings(ids, ids2, false);
- drv.inputDrvs[drvPath2] = ids2;
+ /* Parse the list of input derivations. */
+ expect(str, ",[");
+ while (!endOfList(str)) {
+ expect(str, "(");
+ Path drvPath = parsePath(str);
+ expect(str, ",[");
+ drv.inputDrvs[drvPath] = parseStrings(str, false);
+ expect(str, ")");
}
-
- parseStrings(inSrcs, drv.inputSrcs, true);
- drv.builder = aterm2String(builder);
- drv.platform = aterm2String(platform);
-
- for (ATermIterator i(args); i; ++i) {
- if (ATgetType(*i) != AT_APPL)
- throw badTerm("string expected", *i);
- drv.args.push_back(aterm2String(*i));
+ expect(str, ",["); drv.inputSrcs = parseStrings(str, true);
+ expect(str, ","); drv.platform = parseString(str);
+ expect(str, ","); drv.builder = parseString(str);
+
+ /* Parse the builder arguments. */
+ expect(str, ",[");
+ while (!endOfList(str))
+ drv.args.push_back(parseString(str));
+
+ /* Parse the environment variables. */
+ expect(str, ",[");
+ while (!endOfList(str)) {
+ expect(str, "("); string name = parseString(str);
+ expect(str, ","); string value = parseString(str);
+ expect(str, ")");
+ drv.env[name] = value;
}
+
+ expect(str, ")");
+ return drv;
+}
- for (ATermIterator i(bnds); i; ++i) {
- ATerm s1, s2;
- if (!matchEnvBinding(*i, s1, s2))
- throw badTerm("tuple of strings expected", *i);
- drv.env[aterm2String(s1)] = aterm2String(s2);
- }
- return drv;
+static void printString(string & res, const string & s)
+{
+ res += '"';
+ for (const char * i = s.c_str(); *i; i++)
+ if (*i == '\"' || *i == '\\') { res += "\\"; res += *i; }
+ else if (*i == '\n') res += "\\n";
+ else if (*i == '\r') res += "\\r";
+ else if (*i == '\t') res += "\\t";
+ else res += *i;
+ res += '"';
}
-ATerm unparseDerivation(const Derivation & drv)
+template<class ForwardIterator>
+static void printStrings(string & res, ForwardIterator i, ForwardIterator j)
{
- ATermList outputs = ATempty;
- for (DerivationOutputs::const_reverse_iterator i = drv.outputs.rbegin();
- i != drv.outputs.rend(); ++i)
- outputs = ATinsert(outputs,
- makeDerivationOutput(
- toATerm(i->first),
- toATerm(i->second.path),
- toATerm(i->second.hashAlgo),
- toATerm(i->second.hash)));
-
- ATermList inDrvs = ATempty;
- for (DerivationInputs::const_reverse_iterator i = drv.inputDrvs.rbegin();
- i != drv.inputDrvs.rend(); ++i)
- inDrvs = ATinsert(inDrvs,
- makeDerivationInput(
- toATerm(i->first),
- toATermList(i->second)));
+ res += '[';
+ bool first = true;
+ for ( ; i != j; ++i) {
+ if (first) first = false; else res += ',';
+ printString(res, *i);
+ }
+ res += ']';
+}
+
+
+string unparseDerivation(const Derivation & drv)
+{
+ string s;
+ s.reserve(65536);
+ s += "Derive([";
+
+ bool first = true;
+ foreach (DerivationOutputs::const_iterator, i, drv.outputs) {
+ if (first) first = false; else s += ',';
+ s += '('; printString(s, i->first);
+ s += ','; printString(s, i->second.path);
+ s += ','; printString(s, i->second.hashAlgo);
+ s += ','; printString(s, i->second.hash);
+ s += ')';
+ }
+
+ s += "],[";
+ first = true;
+ foreach (DerivationInputs::const_iterator, i, drv.inputDrvs) {
+ if (first) first = false; else s += ',';
+ s += '('; printString(s, i->first);
+ s += ','; printStrings(s, i->second.begin(), i->second.end());
+ s += ')';
+ }
+
+ s += "],";
+ printStrings(s, drv.inputSrcs.begin(), drv.inputSrcs.end());
+
+ s += ','; printString(s, drv.platform);
+ s += ','; printString(s, drv.builder);
+ s += ','; printStrings(s, drv.args.begin(), drv.args.end());
+
+ s += ",[";
+ first = true;
+ foreach (StringPairs::const_iterator, i, drv.env) {
+ if (first) first = false; else s += ',';
+ s += '('; printString(s, i->first);
+ s += ','; printString(s, i->second);
+ s += ')';
+ }
+
+ s += "])";
- ATermList args = ATempty;
- for (Strings::const_reverse_iterator i = drv.args.rbegin();
- i != drv.args.rend(); ++i)
- args = ATinsert(args, toATerm(*i));
-
- ATermList env = ATempty;
- for (StringPairs::const_reverse_iterator i = drv.env.rbegin();
- i != drv.env.rend(); ++i)
- env = ATinsert(env,
- makeEnvBinding(
- toATerm(i->first),
- toATerm(i->second)));
-
- return makeDerive(
- outputs,
- inDrvs,
- toATermList(drv.inputSrcs),
- toATerm(drv.platform),
- toATerm(drv.builder),
- args,
- env);
+ return s;
}
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index c3f579bee..c14be48af 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -1,12 +1,10 @@
#ifndef __DERIVATIONS_H
#define __DERIVATIONS_H
-typedef union _ATerm * ATerm;
-
-#include "hash.hh"
-
#include <map>
+#include "types.hh"
+
namespace nix {
@@ -53,17 +51,14 @@ struct Derivation
};
-/* Hash an aterm. */
-Hash hashTerm(ATerm t);
-
/* Write a derivation to the Nix store, and return its path. */
Path writeDerivation(const Derivation & drv, const string & name);
/* Parse a derivation. */
-Derivation parseDerivation(ATerm t);
+Derivation parseDerivation(const string & s);
-/* Parse a derivation. */
-ATerm unparseDerivation(const Derivation & drv);
+/* Print a derivation. */
+string unparseDerivation(const Derivation & drv);
/* Check whether a file name ends with the extensions for
derivations. */
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 633b3599e..071f8a223 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -3,7 +3,6 @@
#include "globals.hh"
#include "archive.hh"
#include "pathlocks.hh"
-#include "derivations-ast.hh"
#include "worker-protocol.hh"
#include "derivations.hh"
@@ -446,9 +445,7 @@ unsigned long long LocalStore::addValidPath(const ValidPathInfo & info)
efficiently query whether a path is an output of some
derivation. */
if (isDerivation(info.path)) {
- ATerm t = ATreadFromNamedFile(info.path.c_str());
- if (!t) throw Error(format("cannot read derivation `%1%'") % info.path);
- Derivation drv = parseDerivation(t);
+ Derivation drv = parseDerivation(readFile(info.path));
foreach (DerivationOutputs::iterator, i, drv.outputs) {
SQLiteStmtUse use(stmtAddDerivationOutput);
stmtAddDerivationOutput.bind(id);
diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index f79cb11cc..d52dd6346 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -2,8 +2,6 @@
#include "store-api.hh"
#include "local-store.hh"
-#include <aterm2.h>
-
namespace nix {
@@ -12,9 +10,7 @@ Derivation derivationFromPath(const Path & drvPath)
{
assertStorePath(drvPath);
store->ensurePath(drvPath);
- ATerm t = ATreadFromNamedFile(drvPath.c_str());
- if (!t) throw Error(format("cannot read aterm from `%1%'") % drvPath);
- return parseDerivation(t);
+ return parseDerivation(readFile(drvPath));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 17:51:23 +0000