about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2008-12-16T12·23+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2008-12-16T12·23+0000
commit60ec75048ae0e0bc72ea2fe47e8b48fcf40a2b86 (patch)
tree62eae8ecd36cf56fe4f5c3aa5a62c1113ee45c76
parent6f6bb1fdea9dcd4c6f6c0b8059b05d56ea7c16f3 (diff)
* Pass --use-atime / --max-atime to the daemon.
-rw-r--r--src/libstore/remote-store.cc4
-rw-r--r--src/libstore/worker-protocol.hh2
-rw-r--r--src/nix-worker/nix-worker.cc4
3 files changed, 9 insertions, 1 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 585e6bd9c7cd..d892e3e62bfa 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -426,6 +426,10 @@ void RemoteStore::collectGarbage(const GCOptions & options, GCResults & results)
     writeInt(options.ignoreLiveness, to);
     writeLongLong(options.maxFreed, to);
     writeInt(options.maxLinks, to);
+    if (GET_PROTOCOL_MINOR(daemonVersion) >= 5) {
+        writeInt(options.useAtime, to);
+        writeInt(options.maxAtime, to);
+    }
     
     processStderr();
     
diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh
index a1fa45cf64ea..e44c1e36b56f 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 0x104
+#define PROTOCOL_VERSION 0x105
 #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 674aae0b10fe..f0f821bdd750 100644
--- a/src/nix-worker/nix-worker.cc
+++ b/src/nix-worker/nix-worker.cc
@@ -452,6 +452,10 @@ static void performOp(unsigned int clientVersion,
         options.ignoreLiveness = readInt(from);
         options.maxFreed = readLongLong(from);
         options.maxLinks = readInt(from);
+        if (GET_PROTOCOL_MINOR(clientVersion) >= 5) {
+            options.useAtime = readInt(from);
+            options.maxAtime = readInt(from);
+        }
 
         GCResults results;