maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* More operations.

Browse source 
* addToStore() and friends: don't do a round-trip to the worker if
  we're only interested in the path (i.e., in read-only mode).
This commit is contained in:
Eelco Dolstra 2006-12-01 18:00:01 +00:00
parent 0565b5f2b3
commit b0d8e05be1
5 changed files with 116 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/nix-worker/main.cc
View file

@ -37,11 +37,15 @@ void processConnection(Source & from, Sink & to)
debug("greeting exchanged");
bool quit = false;
unsigned int opCount = 0;
do {
WorkerOp op = (WorkerOp) readInt(from);
opCount++;
switch (op) {
case wopQuit:
@ -75,13 +79,26 @@ void processConnection(Source & from, Sink & to)
break;
}
case wopAddToStore: {
case wopAddToStore:
case wopAddToStoreFixed: {
/* !!! uberquick hack */
string baseName = readString(from);
bool recursive = false;
string hashAlgo;
if (op == wopAddToStoreFixed) {
recursive = readInt(from) == 1;
hashAlgo = readString(from);
}
Path tmp = createTempDir();
Path tmp2 = tmp + "/" + baseName;
restorePath(tmp2, from);
writeString(store->addToStore(tmp2), to);
if (op == wopAddToStoreFixed)
writeString(store->addToStoreFixed(recursive, hashAlgo, tmp2), to);
else
writeString(store->addToStore(tmp2), to);
deletePath(tmp);
break;
}
@ -113,6 +130,8 @@ void processConnection(Source & from, Sink & to)
}
} while (!quit);
printMsg(lvlError, format("%1% worker operations") % opCount);
}