authorgravatar for leroycepearson@geemili.xyzLeRoyce Pearson <leroycepearson@geemili.xyz> 2020-04-14 19:33:02-06:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-05-25 13:48:43-04:00
log05edfe983ce59c1fe1b1c652065651714ce59c52
tree879f035ff8e440eff6842f30302046acc0aea3da
parentaf730c64bd760a2fee7418b5d4b8912e3aec4eed

Add `addFilePost` and `addFilePostFetch` functions

1 files changed, 39 insertions(+), 6 deletions(-)

lib/std/cache_hash.zig+39-6
......@@ -180,7 +180,8 @@ pub const CacheHash = struct {
180180 }
181181
182182 var actual_digest: [BIN_DIGEST_LEN]u8 = undefined;
183 try hash_file(self.alloc, &actual_digest, &this_file);
183 const contents = try hash_file(self.alloc, &actual_digest, &this_file);
184 self.alloc.free(contents);
184185
185186 if (!mem.eql(u8, &cache_hash_file.bin_digest, &actual_digest)) {
186187 mem.copy(u8, &cache_hash_file.bin_digest, &actual_digest);
......@@ -211,7 +212,7 @@ pub const CacheHash = struct {
211212 self.manifest_dirty = true;
212213 while (idx < input_file_count) : (idx += 1) {
213214 var cache_hash_file = &self.files.items[idx];
214 self.populate_file_hash(cache_hash_file) catch |err| {
215 const contents = self.populate_file_hash(cache_hash_file) catch |err| {
215216 self.manifest_file.?.close();
216217 self.manifest_file = null;
217218 return error.CacheUnavailable;
......@@ -223,7 +224,7 @@ pub const CacheHash = struct {
223224 return self.final();
224225 }
225226
226 pub fn populate_file_hash(self: *@This(), cache_hash_file: *File) !void {
227 fn populate_file_hash_fetch(self: *@This(), otherAlloc: *mem.Allocator, cache_hash_file: *File) ![]u8 {
227228 debug.assert(cache_hash_file.path != null);
228229
229230 const this_file = try fs.cwd().openFile(cache_hash_file.path.?, .{});
......@@ -236,8 +237,38 @@ pub const CacheHash = struct {
236237 cache_hash_file.stat.inode = 0;
237238 }
238239
239 try hash_file(self.alloc, &cache_hash_file.bin_digest, &this_file);
240 const contents = try hash_file(otherAlloc, &cache_hash_file.bin_digest, &this_file);
240241 self.blake3.update(&cache_hash_file.bin_digest);
242
243 return contents;
244 }
245
246 fn populate_file_hash(self: *@This(), cache_hash_file: *File) !void {
247 const contents = try self.populate_file_hash_fetch(self.alloc, cache_hash_file);
248 self.alloc.free(contents);
249 }
250
251 /// Add a file as a dependency of process being cached, after the initial hash has been
252 /// calculated. Returns the contents of the file, allocated with the given allocator.
253 pub fn addFilePostFetch(self: *@This(), otherAlloc: *mem.Allocator, file_path: []const u8) ![]u8 {
254 debug.assert(self.manifest_file != null);
255
256 var cache_hash_file = try self.files.addOne();
257 cache_hash_file.path = try fs.path.resolve(self.alloc, &[_][]const u8{file_path});
258
259 const contents = self.populate_file_hash_fetch(otherAlloc, cache_hash_file) catch |err| {
260 self.manifest_file.close();
261 return err;
262 };
263
264 return contents;
265 }
266
267 /// Add a file as a dependency of process being cached, after the initial hash has been
268 /// calculated.
269 pub fn addFilePost(self: *@This(), file_path: []const u8) !void {
270 const contents = try self.addFilePostFetch(self.alloc, file_path);
271 self.alloc.free(contents);
241272 }
242273
243274 /// Returns a base64 encoded hash of the inputs.
......@@ -294,15 +325,17 @@ pub const CacheHash = struct {
294325 }
295326};
296327
297fn hash_file(alloc: *Allocator, bin_digest: []u8, handle: *const fs.File) !void {
328/// Hash the file, and return the contents as an array
329fn hash_file(alloc: *Allocator, bin_digest: []u8, handle: *const fs.File) ![]u8 {
298330 var blake3 = Blake3.init();
299331
300332 const contents = try handle.inStream().readAllAlloc(alloc, 64 * 1024);
301 defer alloc.free(contents);
302333
303334 blake3.update(contents);
304335
305336 blake3.final(bin_digest);
337
338 return contents;
306339}
307340
308341/// If the wall clock time, rounded to the same precision as the