Author: eelco
Date: Fri Dec 16 22:31:25 2011
New Revision: 30944
URL: https://nixos.org/websvn/nix/?rev=30944&sc=1
Log:
* importPath() -> importPaths(). Because of buffering of the input
stream it's now necessary for the daemon to process the entire
sequence of exported paths, rather than letting the client do it.
Modified:
nix/trunk/src/libstore/local-store.cc
nix/trunk/src/libstore/local-store.hh
nix/trunk/src/libstore/remote-store.cc
nix/trunk/src/libstore/remote-store.hh
nix/trunk/src/libstore/store-api.hh
nix/trunk/src/libstore/worker-protocol.hh
nix/trunk/src/libutil/serialise.cc
nix/trunk/src/libutil/serialise.hh
nix/trunk/src/nix-store/nix-store.cc
nix/trunk/src/nix-worker/nix-worker.cc
Modified: nix/trunk/src/libstore/local-store.cc
==============================================================================
--- nix/trunk/src/libstore/local-store.cc Fri Dec 16 21:29:46 2011
(r30943)
+++ nix/trunk/src/libstore/local-store.cc Fri Dec 16 22:31:25 2011
(r30944)
@@ -1156,7 +1156,7 @@
PathSet references;
queryReferences(path, references);
- writeStringSet(references, hashAndWriteSink);
+ writeStrings(references, hashAndWriteSink);
Path deriver = queryDeriver(path);
writeString(deriver, hashAndWriteSink);
@@ -1243,7 +1243,7 @@
Path dstPath = readStorePath(hashAndReadSource);
- PathSet references = readStorePaths(hashAndReadSource);
+ PathSet references = readStorePaths<PathSet>(hashAndReadSource);
Path deriver = readString(hashAndReadSource);
if (deriver != "") assertStorePath(deriver);
@@ -1330,6 +1330,19 @@
}
+Paths LocalStore::importPaths(bool requireSignature, Source & source)
+{
+ Paths res;
+ while (true) {
+ unsigned long long n = readLongLong(source);
+ if (n == 0) break;
+ if (n != 1) throw Error("input doesn't look like something created by
`nix-store --export'");
+ res.push_back(importPath(requireSignature, source));
+ }
+ return res;
+}
+
+
void LocalStore::deleteFromStore(const Path & path, unsigned long long &
bytesFreed,
unsigned long long & blocksFreed)
{
Modified: nix/trunk/src/libstore/local-store.hh
==============================================================================
--- nix/trunk/src/libstore/local-store.hh Fri Dec 16 21:29:46 2011
(r30943)
+++ nix/trunk/src/libstore/local-store.hh Fri Dec 16 22:31:25 2011
(r30944)
@@ -146,7 +146,7 @@
void exportPath(const Path & path, bool sign,
Sink & sink);
- Path importPath(bool requireSignature, Source & source);
+ Paths importPaths(bool requireSignature, Source & source);
void buildDerivations(const PathSet & drvPaths);
@@ -259,6 +259,8 @@
Path createTempDirInStore();
+ Path importPath(bool requireSignature, Source & source);
+
void checkDerivationOutputs(const Path & drvPath, const Derivation & drv);
};
Modified: nix/trunk/src/libstore/remote-store.cc
==============================================================================
--- nix/trunk/src/libstore/remote-store.cc Fri Dec 16 21:29:46 2011
(r30943)
+++ nix/trunk/src/libstore/remote-store.cc Fri Dec 16 22:31:25 2011
(r30944)
@@ -27,13 +27,15 @@
}
-PathSet readStorePaths(Source & from)
+template<class T> T readStorePaths(Source & from)
{
- PathSet paths = readStringSet(from);
- foreach (PathSet::iterator, i, paths) assertStorePath(*i);
+ T paths = readStrings<T>(from);
+ foreach (typename T::iterator, i, paths) assertStorePath(*i);
return paths;
}
+template PathSet readStorePaths(Source & from);
+
RemoteStore::RemoteStore()
{
@@ -215,7 +217,7 @@
openConnection();
writeInt(wopQueryValidPaths, to);
processStderr();
- return readStorePaths(from);
+ return readStorePaths<PathSet>(from);
}
@@ -242,7 +244,7 @@
if (reply == 0) return false;
info.deriver = readString(from);
if (info.deriver != "") assertStorePath(info.deriver);
- info.references = readStorePaths(from);
+ info.references = readStorePaths<PathSet>(from);
info.downloadSize = readLongLong(from);
info.narSize = GET_PROTOCOL_MINOR(daemonVersion) >= 7 ? readLongLong(from)
: 0;
return true;
@@ -260,7 +262,7 @@
info.deriver = readString(from);
if (info.deriver != "") assertStorePath(info.deriver);
info.hash = parseHash(htSHA256, readString(from));
- info.references = readStorePaths(from);
+ info.references = readStorePaths<PathSet>(from);
info.registrationTime = readInt(from);
info.narSize = readLongLong(from);
return info;
@@ -285,7 +287,7 @@
writeInt(wopQueryReferences, to);
writeString(path, to);
processStderr();
- PathSet references2 = readStorePaths(from);
+ PathSet references2 = readStorePaths<PathSet>(from);
references.insert(references2.begin(), references2.end());
}
@@ -297,7 +299,7 @@
writeInt(wopQueryReferrers, to);
writeString(path, to);
processStderr();
- PathSet referrers2 = readStorePaths(from);
+ PathSet referrers2 = readStorePaths<PathSet>(from);
referrers.insert(referrers2.begin(), referrers2.end());
}
@@ -320,7 +322,7 @@
writeInt(wopQueryDerivationOutputs, to);
writeString(path, to);
processStderr();
- return readStorePaths(from);
+ return readStorePaths<PathSet>(from);
}
@@ -350,7 +352,7 @@
writeInt(wopAddTextToStore, to);
writeString(name, to);
writeString(s, to);
- writeStringSet(references, to);
+ writeStrings(references, to);
processStderr();
return readStorePath(from);
@@ -369,14 +371,14 @@
}
-Path RemoteStore::importPath(bool requireSignature, Source & source)
+Paths RemoteStore::importPaths(bool requireSignature, Source & source)
{
openConnection();
- writeInt(wopImportPath, to);
+ writeInt(wopImportPaths, to);
/* We ignore requireSignature, since the worker forces it to true
anyway. */
processStderr(0, &source);
- return readStorePath(from);
+ return readStorePaths<Paths>(from);
}
@@ -384,7 +386,7 @@
{
openConnection();
writeInt(wopBuildDerivations, to);
- writeStringSet(drvPaths, to);
+ writeStrings(drvPaths, to);
processStderr();
readInt(from);
}
@@ -451,7 +453,7 @@
writeInt(wopCollectGarbage, to);
writeInt(options.action, to);
- writeStringSet(options.pathsToDelete, to);
+ writeStrings(options.pathsToDelete, to);
writeInt(options.ignoreLiveness, to);
writeLongLong(options.maxFreed, to);
writeInt(options.maxLinks, to);
@@ -463,7 +465,7 @@
processStderr();
- results.paths = readStringSet(from);
+ results.paths = readStrings<PathSet>(from);
results.bytesFreed = readLongLong(from);
results.blocksFreed = readLongLong(from);
}
@@ -474,7 +476,7 @@
openConnection();
writeInt(wopQueryFailedPaths, to);
processStderr();
- return readStorePaths(from);
+ return readStorePaths<PathSet>(from);
}
@@ -482,7 +484,7 @@
{
openConnection();
writeInt(wopClearFailedPaths, to);
- writeStringSet(paths, to);
+ writeStrings(paths, to);
processStderr();
readInt(from);
}
@@ -504,8 +506,7 @@
size_t len = readInt(from);
unsigned char * buf = new unsigned char[len];
AutoDeleteArray<unsigned char> d(buf);
- size_t n = source->read(buf, len);
- writeString(string((const char *) buf, n), to); // !!! inefficient
+ writeString(buf, source->read(buf, len), to);
to.flush();
}
else {
Modified: nix/trunk/src/libstore/remote-store.hh
==============================================================================
--- nix/trunk/src/libstore/remote-store.hh Fri Dec 16 21:29:46 2011
(r30943)
+++ nix/trunk/src/libstore/remote-store.hh Fri Dec 16 22:31:25 2011
(r30944)
@@ -56,7 +56,7 @@
void exportPath(const Path & path, bool sign,
Sink & sink);
- Path importPath(bool requireSignature, Source & source);
+ Paths importPaths(bool requireSignature, Source & source);
void buildDerivations(const PathSet & drvPaths);
Modified: nix/trunk/src/libstore/store-api.hh
==============================================================================
--- nix/trunk/src/libstore/store-api.hh Fri Dec 16 21:29:46 2011 (r30943)
+++ nix/trunk/src/libstore/store-api.hh Fri Dec 16 22:31:25 2011 (r30944)
@@ -169,9 +169,9 @@
virtual void exportPath(const Path & path, bool sign,
Sink & sink) = 0;
- /* Import a NAR dump created by exportPath() into the Nix
- store. */
- virtual Path importPath(bool requireSignature, Source & source) = 0;
+ /* Import a sequence of NAR dumps created by exportPaths() into
+ the Nix store. */
+ virtual Paths importPaths(bool requireSignature, Source & source) = 0;
/* Ensure that the output paths of the derivation are valid. If
they are already valid, this is a no-op. Otherwise, validity
Modified: nix/trunk/src/libstore/worker-protocol.hh
==============================================================================
--- nix/trunk/src/libstore/worker-protocol.hh Fri Dec 16 21:29:46 2011
(r30943)
+++ nix/trunk/src/libstore/worker-protocol.hh Fri Dec 16 22:31:25 2011
(r30944)
@@ -29,7 +29,6 @@
wopSyncWithGC = 13,
wopFindRoots = 14,
wopExportPath = 16,
- wopImportPath = 17,
wopQueryDeriver = 18,
wopSetOptions = 19,
wopCollectGarbage = 20,
@@ -39,6 +38,7 @@
wopQueryFailedPaths = 24,
wopClearFailedPaths = 25,
wopQueryPathInfo = 26,
+ wopImportPaths = 27,
} WorkerOp;
@@ -58,7 +58,7 @@
Path readStorePath(Source & from);
-PathSet readStorePaths(Source & from);
+template<class T> T readStorePaths(Source & from);
}
Modified: nix/trunk/src/libutil/serialise.cc
==============================================================================
--- nix/trunk/src/libutil/serialise.cc Fri Dec 16 21:29:46 2011 (r30943)
+++ nix/trunk/src/libutil/serialise.cc Fri Dec 16 22:31:25 2011 (r30944)
@@ -163,13 +163,16 @@
}
-void writeStringSet(const StringSet & ss, Sink & sink)
+template<class T> void writeStrings(const T & ss, Sink & sink)
{
writeInt(ss.size(), sink);
- for (StringSet::iterator i = ss.begin(); i != ss.end(); ++i)
+ foreach (typename T::const_iterator, i, ss)
writeString(*i, sink);
}
+template void writeStrings(const Paths & ss, Sink & sink);
+template void writeStrings(const PathSet & ss, Sink & sink);
+
void readPadding(size_t len, Source & source)
{
@@ -234,14 +237,17 @@
}
-StringSet readStringSet(Source & source)
+template<class T> T readStrings(Source & source)
{
unsigned int count = readInt(source);
- StringSet ss;
+ T ss;
while (count--)
- ss.insert(readString(source));
+ ss.insert(ss.end(), readString(source));
return ss;
}
+template Paths readStrings(Source & source);
+template PathSet readStrings(Source & source);
+
}
Modified: nix/trunk/src/libutil/serialise.hh
==============================================================================
--- nix/trunk/src/libutil/serialise.hh Fri Dec 16 21:29:46 2011 (r30943)
+++ nix/trunk/src/libutil/serialise.hh Fri Dec 16 22:31:25 2011 (r30944)
@@ -116,14 +116,14 @@
void writeLongLong(unsigned long long n, Sink & sink);
void writeString(const unsigned char * buf, size_t len, Sink & sink);
void writeString(const string & s, Sink & sink);
-void writeStringSet(const StringSet & ss, Sink & sink);
+template<class T> void writeStrings(const T & ss, Sink & sink);
void readPadding(size_t len, Source & source);
unsigned int readInt(Source & source);
unsigned long long readLongLong(Source & source);
size_t readString(unsigned char * buf, size_t max, Source & source);
string readString(Source & source);
-StringSet readStringSet(Source & source);
+template<class T> T readStrings(Source & source);
MakeError(SerialisationError, Error)
Modified: nix/trunk/src/nix-store/nix-store.cc
==============================================================================
--- nix/trunk/src/nix-store/nix-store.cc Fri Dec 16 21:29:46 2011
(r30943)
+++ nix/trunk/src/nix-store/nix-store.cc Fri Dec 16 22:31:25 2011
(r30944)
@@ -600,12 +600,10 @@
if (!opArgs.empty()) throw UsageError("no arguments expected");
FdSource source(STDIN_FILENO);
- while (true) {
- unsigned long long n = readLongLong(source);
- if (n == 0) break;
- if (n != 1) throw Error("input doesn't look like something created by
`nix-store --export'");
- cout << format("%1%\n") % store->importPath(requireSignature, source)
<< std::flush;
- }
+ Paths paths = store->importPaths(requireSignature, source);
+
+ foreach (Paths::iterator, i, paths)
+ cout << format("%1%\n") % *i << std::flush;
}
Modified: nix/trunk/src/nix-worker/nix-worker.cc
==============================================================================
--- nix/trunk/src/nix-worker/nix-worker.cc Fri Dec 16 21:29:46 2011
(r30943)
+++ nix/trunk/src/nix-worker/nix-worker.cc Fri Dec 16 22:31:25 2011
(r30944)
@@ -327,7 +327,7 @@
store->queryReferrers(path, paths);
else paths = store->queryDerivationOutputs(path);
stopWork();
- writeStringSet(paths, to);
+ writeStrings(paths, to);
break;
}
@@ -377,7 +377,7 @@
case wopAddTextToStore: {
string suffix = readString(from);
string s = readString(from);
- PathSet refs = readStorePaths(from);
+ PathSet refs = readStorePaths<PathSet>(from);
startWork();
Path path = store->addTextToStore(suffix, s, refs);
stopWork();
@@ -396,19 +396,17 @@
break;
}
- case wopImportPath: {
+ case wopImportPaths: {
startWork();
- if (GET_PROTOCOL_MINOR(clientVersion) < 9)
- throw Error("import not supported; upgrade your client");
TunnelSource source(from);
- Path path = store->importPath(true, source);
+ Paths paths = store->importPaths(true, source);
stopWork();
- writeString(path, to);
+ writeStrings(paths, to);
break;
}
case wopBuildDerivations: {
- PathSet drvs = readStorePaths(from);
+ PathSet drvs = readStorePaths<PathSet>(from);
startWork();
store->buildDerivations(drvs);
stopWork();
@@ -466,7 +464,7 @@
case wopCollectGarbage: {
GCOptions options;
options.action = (GCOptions::GCAction) readInt(from);
- options.pathsToDelete = readStorePaths(from);
+ options.pathsToDelete = readStorePaths<PathSet>(from);
options.ignoreLiveness = readInt(from);
options.maxFreed = readLongLong(from);
options.maxLinks = readInt(from);
@@ -484,7 +482,7 @@
store->collectGarbage(options, results);
stopWork();
- writeStringSet(results.paths, to);
+ writeStrings(results.paths, to);
writeLongLong(results.bytesFreed, to);
writeLongLong(results.blocksFreed, to);
@@ -522,7 +520,7 @@
writeInt(res ? 1 : 0, to);
if (res) {
writeString(info.deriver, to);
- writeStringSet(info.references, to);
+ writeStrings(info.references, to);
writeLongLong(info.downloadSize, to);
if (GET_PROTOCOL_MINOR(clientVersion) >= 7)
writeLongLong(info.narSize, to);
@@ -534,7 +532,7 @@
startWork();
PathSet paths = store->queryValidPaths();
stopWork();
- writeStringSet(paths, to);
+ writeStrings(paths, to);
break;
}
@@ -542,12 +540,12 @@
startWork();
PathSet paths = store->queryFailedPaths();
stopWork();
- writeStringSet(paths, to);
+ writeStrings(paths, to);
break;
}
case wopClearFailedPaths: {
- PathSet paths = readStringSet(from);
+ PathSet paths = readStrings<PathSet>(from);
startWork();
store->clearFailedPaths(paths);
stopWork();
@@ -562,7 +560,7 @@
stopWork();
writeString(info.deriver, to);
writeString(printHash(info.hash), to);
- writeStringSet(info.references, to);
+ writeStrings(info.references, to);
writeInt(info.registrationTime, to);
writeLongLong(info.narSize, to);
break;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
