about summary refs log tree commit diff
path: root/src/libstore/remote-store.cc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-09-06T14·36+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-09-06T14·36+0200
commit936f9d45baf474358346666ed9ad7f56960bb455 (patch)
treed6c91635fee9b27da7875b1b6e9052c04b20b072 /src/libstore/remote-store.cc
parent4b83830d0c742b69b59c698a42948eaa6d214c1d (diff)
Don't apply the CPU affinity hack to nix-shell (and other Perl programs)
As discovered by Todd Veldhuizen, the shell started by nix-shell has
its affinity set to a single CPU.  This is because nix-shell connects
to the Nix daemon, which causes the affinity hack to be applied.  So
we turn this off for Perl programs.
Diffstat (limited to 'src/libstore/remote-store.cc')
-rw-r--r--src/libstore/remote-store.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 3764b4813a4e..3017254baf3b 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -73,7 +73,7 @@ void RemoteStore::openConnection(bool reserveSpace)
         writeInt(PROTOCOL_VERSION, to);
 
         if (GET_PROTOCOL_MINOR(daemonVersion) >= 14) {
-            int cpu = lockToCurrentCPU();
+            int cpu = settings.lockCPU ? lockToCurrentCPU() : -1;
             if (cpu != -1) {
                 writeInt(1, to);
                 writeInt(cpu, to);