diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-08-24T09·56+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-08-24T09·56+0000 |
| commit | 955d11aae738f7f9c56c51e8ab2eabdf8732aab1 (patch) | |
| tree | c6a447018ba865580700e727997bb079aba4a0f4 /src | |
| parent | 5c5ab2bc12472f63a33cc841dcdc57f1ed8ddea5 (diff) | |
| parent | c67eccc26d42bce9496024ac77eaa7e4ff725d01 (diff) | |
* Sync with the trunk.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/remote-store.cc | 3 | ||||
| -rw-r--r-- | src/libstore/worker-protocol.hh | 2 | ||||
| -rw-r--r-- | src/nix-worker/nix-worker.cc | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 93319ebb8e49..8f162daeee42 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -198,6 +198,9 @@ void RemoteStore::setOptions() writeInt(logType, to); writeInt(printBuildTrace, to); } + if (GET_PROTOCOL_MINOR(daemonVersion) >= 6) { + writeInt(buildCores, to); + } processStderr(); } diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh index 392a69acf654..a4dc690b74d9 100644 --- a/src/libstore/worker-protocol.hh +++ b/src/libstore/worker-protocol.hh @@ -8,7 +8,7 @@ namespace nix { #define WORKER_MAGIC_1 0x6e697863 #define WORKER_MAGIC_2 0x6478696f -#define PROTOCOL_VERSION 0x105 +#define PROTOCOL_VERSION 0x106 #define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00) #define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff) diff --git a/src/nix-worker/nix-worker.cc b/src/nix-worker/nix-worker.cc index b292b83ed52c..9be733d8c748 100644 --- a/src/nix-worker/nix-worker.cc +++ b/src/nix-worker/nix-worker.cc @@ -502,6 +502,9 @@ static void performOp(unsigned int clientVersion, logType = (LogType) readInt(from); printBuildTrace = readInt(from) != 0; } + if (GET_PROTOCOL_MINOR(clientVersion) >= 6) { + buildCores = readInt(from); + } startWork(); stopWork(); break; |