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

* Make --cores work when building through the Nix daemon.

Browse source
This commit is contained in:
Eelco Dolstra 2010-08-12 09:21:50 +00:00
parent 750be19ae8
commit 6846ed8b44
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/remote-store.cc
View file

@ -198,6 +198,9 @@ void RemoteStore::setOptions()
writeInt(logType, to); writeInt(logType, to);
writeInt(printBuildTrace, to); writeInt(printBuildTrace, to);
} }
if (GET_PROTOCOL_MINOR(daemonVersion) >= 6) {
writeInt(buildCores, to);
}
processStderr(); processStderr();
} }

2
src/libstore/worker-protocol.hh
View file

@ -8,7 +8,7 @@ namespace nix {
#define WORKER_MAGIC_1 0x6e697863 #define WORKER_MAGIC_1 0x6e697863
#define WORKER_MAGIC_2 0x6478696f #define WORKER_MAGIC_2 0x6478696f
#define PROTOCOL_VERSION 0x105 #define PROTOCOL_VERSION 0x106
#define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00) #define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00)
#define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff) #define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff)

3
src/nix-worker/nix-worker.cc
View file

@ -500,6 +500,9 @@ static void performOp(unsigned int clientVersion,
logType = (LogType) readInt(from); logType = (LogType) readInt(from);
printBuildTrace = readInt(from) != 0; printBuildTrace = readInt(from) != 0;
} }
if (GET_PROTOCOL_MINOR(clientVersion) >= 6) {
buildCores = readInt(from);
}
startWork(); startWork();
stopWork(); stopWork();
break; break;