authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-12-30 16:42:32-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-01-02 13:16:17-07:00
loge36718165cdc29b777392a3a343d92ccd1c6acf3
treec174fc245cbc9170730a0cbe57a5f24f3565f7b6
parent67e31807df73ad2da992293fcdf1f6ea7ca67d2a

stage2: add `@import` and `@embedFile` to CacheHash

when using `CacheMode.whole`. Also, I verified that `addDepFilePost` is in fact including the original C source file in addition to the files it depends on.

2 files changed, 77 insertions(+), 3 deletions(-)

src/Cache.zig+54-3
...@@ -47,10 +47,16 @@ pub const hasher_init: Hasher = Hasher.init(&[_]u8{0} ** Hasher.key_length);...@@ -47,10 +47,16 @@ pub const hasher_init: Hasher = Hasher.init(&[_]u8{0} ** Hasher.key_length);
47pub const File = struct {47pub const File = struct {
48 path: ?[]const u8,48 path: ?[]const u8,
49 max_file_size: ?usize,49 max_file_size: ?usize,
50 stat: fs.File.Stat,50 stat: Stat,
51 bin_digest: BinDigest,51 bin_digest: BinDigest,
52 contents: ?[]const u8,52 contents: ?[]const u8,
5353
54 pub const Stat = struct {
55 inode: fs.File.INode,
56 size: u64,
57 mtime: i128,
58 };
59
54 pub fn deinit(self: *File, allocator: Allocator) void {60 pub fn deinit(self: *File, allocator: Allocator) void {
55 if (self.path) |owned_slice| {61 if (self.path) |owned_slice| {
56 allocator.free(owned_slice);62 allocator.free(owned_slice);
...@@ -424,7 +430,11 @@ pub const Manifest = struct {...@@ -424,7 +430,11 @@ pub const Manifest = struct {
424 if (!size_match or !mtime_match or !inode_match) {430 if (!size_match or !mtime_match or !inode_match) {
425 self.manifest_dirty = true;431 self.manifest_dirty = true;
426432
427 cache_hash_file.stat = actual_stat;433 cache_hash_file.stat = .{
434 .size = actual_stat.size,
435 .mtime = actual_stat.mtime,
436 .inode = actual_stat.inode,
437 };
428438
429 if (self.isProblematicTimestamp(cache_hash_file.stat.mtime)) {439 if (self.isProblematicTimestamp(cache_hash_file.stat.mtime)) {
430 // The actual file has an unreliable timestamp, force it to be hashed440 // The actual file has an unreliable timestamp, force it to be hashed
...@@ -530,7 +540,12 @@ pub const Manifest = struct {...@@ -530,7 +540,12 @@ pub const Manifest = struct {
530 const file = try fs.cwd().openFile(ch_file.path.?, .{});540 const file = try fs.cwd().openFile(ch_file.path.?, .{});
531 defer file.close();541 defer file.close();
532542
533 ch_file.stat = try file.stat();543 const actual_stat = try file.stat();
544 ch_file.stat = .{
545 .size = actual_stat.size,
546 .mtime = actual_stat.mtime,
547 .inode = actual_stat.inode,
548 };
534549
535 if (self.isProblematicTimestamp(ch_file.stat.mtime)) {550 if (self.isProblematicTimestamp(ch_file.stat.mtime)) {
536 // The actual file has an unreliable timestamp, force it to be hashed551 // The actual file has an unreliable timestamp, force it to be hashed
...@@ -615,6 +630,42 @@ pub const Manifest = struct {...@@ -615,6 +630,42 @@ pub const Manifest = struct {
615 try self.populateFileHash(new_ch_file);630 try self.populateFileHash(new_ch_file);
616 }631 }
617632
633 /// Like `addFilePost` but when the file contents have already been loaded from disk.
634 /// On success, cache takes ownership of `resolved_path`.
635 pub fn addFilePostContents(
636 self: *Manifest,
637 resolved_path: []const u8,
638 bytes: []const u8,
639 stat: File.Stat,
640 ) error{OutOfMemory}!void {
641 assert(self.manifest_file != null);
642
643 const ch_file = try self.files.addOne(self.cache.gpa);
644 errdefer self.files.shrinkRetainingCapacity(self.files.items.len - 1);
645
646 ch_file.* = .{
647 .path = resolved_path,
648 .max_file_size = null,
649 .stat = stat,
650 .bin_digest = undefined,
651 .contents = null,
652 };
653
654 if (self.isProblematicTimestamp(ch_file.stat.mtime)) {
655 // The actual file has an unreliable timestamp, force it to be hashed
656 ch_file.stat.mtime = 0;
657 ch_file.stat.inode = 0;
658 }
659
660 {
661 var hasher = hasher_init;
662 hasher.update(bytes);
663 hasher.final(&ch_file.bin_digest);
664 }
665
666 self.hash.hasher.update(&ch_file.bin_digest);
667 }
668
618 pub fn addDepFilePost(self: *Manifest, dir: fs.Dir, dep_file_basename: []const u8) !void {669 pub fn addDepFilePost(self: *Manifest, dir: fs.Dir, dep_file_basename: []const u8) !void {
619 assert(self.manifest_file != null);670 assert(self.manifest_file != null);
620671
src/Module.zig+23
...@@ -3380,6 +3380,19 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void {...@@ -3380,6 +3380,19 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void {
3380 error.OutOfMemory => return error.OutOfMemory,3380 error.OutOfMemory => return error.OutOfMemory,
3381 error.AnalysisFail => {},3381 error.AnalysisFail => {},
3382 }3382 }
3383
3384 if (mod.comp.whole_cache_manifest) |man| {
3385 assert(file.source_loaded);
3386 const resolved_path = try file.pkg.root_src_directory.join(gpa, &.{
3387 file.sub_file_path,
3388 });
3389 errdefer gpa.free(resolved_path);
3390 try man.addFilePostContents(resolved_path, file.source, .{
3391 .size = file.stat_size,
3392 .inode = file.stat_inode,
3393 .mtime = file.stat_mtime,
3394 });
3395 }
3383 } else {3396 } else {
3384 new_decl.analysis = .file_failure;3397 new_decl.analysis = .file_failure;
3385 }3398 }
...@@ -3836,6 +3849,16 @@ pub fn embedFile(mod: *Module, cur_file: *File, rel_file_path: []const u8) !*Emb...@@ -3836,6 +3849,16 @@ pub fn embedFile(mod: *Module, cur_file: *File, rel_file_path: []const u8) !*Emb
3836 resolved_root_path, resolved_path, sub_file_path, rel_file_path,3849 resolved_root_path, resolved_path, sub_file_path, rel_file_path,
3837 });3850 });
38383851
3852 if (mod.comp.whole_cache_manifest) |man| {
3853 const copied_resolved_path = try gpa.dupe(u8, resolved_path);
3854 errdefer gpa.free(copied_resolved_path);
3855 try man.addFilePostContents(copied_resolved_path, bytes, .{
3856 .size = stat.size,
3857 .inode = stat.inode,
3858 .mtime = stat.mtime,
3859 });
3860 }
3861
3839 keep_resolved_path = true; // It's now owned by embed_table.3862 keep_resolved_path = true; // It's now owned by embed_table.
3840 gop.value_ptr.* = new_file;3863 gop.value_ptr.* = new_file;
3841 new_file.* = .{3864 new_file.* = .{