mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 11:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use regular file for caching stage 1 hash digest instead of symlink, fix zig build caching on Windows

Browse Source 
Fix #6500
This commit is contained in:
mlarouche 2020-10-09 16:50:43 -04:00
parent 04b0ffdd13
commit 57912964af
7 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/std/fs.zig
View File

@ -1490,6 +1490,15 @@ pub const Dir = struct {
return os.windows.ReadLink(self.fd, sub_path_w, buffer); return os.windows.ReadLink(self.fd, sub_path_w, buffer);
} }
/// Read all of file contents using a preallocated buffer
pub fn readFile(self: Dir, file_path: []const u8, buffer: []u8) ![]u8 {
var file = try self.openFile(file_path, .{});
defer file.close();
const end_index = try file.readAll(buffer);
return buffer[0..end_index];
}
/// On success, caller owns returned buffer. /// On success, caller owns returned buffer.
/// If the file is larger than `max_bytes`, returns `error.FileTooBig`. /// If the file is larger than `max_bytes`, returns `error.FileTooBig`.
pub fn readFileAlloc(self: Dir, allocator: *mem.Allocator, file_path: []const u8, max_bytes: usize) ![]u8 { pub fn readFileAlloc(self: Dir, allocator: *mem.Allocator, file_path: []const u8, max_bytes: usize) ![]u8 {

8
src/Compilation.zig
View File

@ -2605,8 +2605,8 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node
// We use an extra hex-encoded byte here to store some flags. // We use an extra hex-encoded byte here to store some flags.
var prev_digest_buf: [digest.len + 2]u8 = undefined; var prev_digest_buf: [digest.len + 2]u8 = undefined;
const prev_digest: []u8 = directory.handle.readLink(id_symlink_basename, &prev_digest_buf) catch |err| blk: { const prev_digest: []u8 = directory.handle.readFile(id_symlink_basename, &prev_digest_buf) catch |err| blk: {
log.debug("stage1 {} new_digest={} readlink error: {}", .{ mod.root_pkg.root_src_path, digest, @errorName(err) }); log.debug("stage1 {} new_digest={} readFile error: {}", .{ mod.root_pkg.root_src_path, digest, @errorName(err) });
// Handle this as a cache miss. // Handle this as a cache miss.
break :blk prev_digest_buf[0..0]; break :blk prev_digest_buf[0..0];
}; };
@ -2792,8 +2792,8 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node
log.debug("saved digest + flags: '{s}' (byte = {}) have_winmain_crt_startup={}", .{ log.debug("saved digest + flags: '{s}' (byte = {}) have_winmain_crt_startup={}", .{
digest_plus_flags, stage1_flags_byte, mod.stage1_flags.have_winmain_crt_startup, digest_plus_flags, stage1_flags_byte, mod.stage1_flags.have_winmain_crt_startup,
}); });
directory.handle.symLink(&digest_plus_flags, id_symlink_basename, .{}) catch |err| { directory.handle.writeFile(id_symlink_basename, &digest_plus_flags) catch |err| {
log.warn("failed to save stage1 hash digest symlink: {}", .{@errorName(err)}); log.warn("failed to save stage1 hash digest file: {}", .{@errorName(err)});
}; };
// Again failure here only means an unnecessary cache miss. // Again failure here only means an unnecessary cache miss.
man.writeManifest() catch |err| { man.writeManifest() catch |err| {

8
src/link.zig
View File

@ -466,8 +466,8 @@ pub const File = struct {
const digest = ch.final(); const digest = ch.final();
var prev_digest_buf: [digest.len]u8 = undefined; var prev_digest_buf: [digest.len]u8 = undefined;
const prev_digest: []u8 = directory.handle.readLink(id_symlink_basename, &prev_digest_buf) catch |err| b: { const prev_digest: []u8 = directory.handle.readFile(id_symlink_basename, &prev_digest_buf) catch |err| b: {
log.debug("archive new_digest={} readlink error: {}", .{ digest, @errorName(err) }); log.debug("archive new_digest={} readFile error: {}", .{ digest, @errorName(err) });
break :b prev_digest_buf[0..0]; break :b prev_digest_buf[0..0];
}; };
if (mem.eql(u8, prev_digest, &digest)) { if (mem.eql(u8, prev_digest, &digest)) {
@ -512,8 +512,8 @@ pub const File = struct {
const bad = llvm.WriteArchive(full_out_path_z, object_files.items.ptr, object_files.items.len, os_type); const bad = llvm.WriteArchive(full_out_path_z, object_files.items.ptr, object_files.items.len, os_type);
if (bad) return error.UnableToWriteArchive; if (bad) return error.UnableToWriteArchive;
directory.handle.symLink(&digest, id_symlink_basename, .{}) catch |err| { directory.handle.writeFile(id_symlink_basename, &digest) catch |err| {
std.log.warn("failed to save archive hash digest symlink: {}", .{@errorName(err)}); std.log.warn("failed to save archive hash digest file: {}", .{@errorName(err)});
}; };
ch.writeManifest() catch |err| { ch.writeManifest() catch |err| {

10
src/link/Coff.zig
View File

@ -854,8 +854,8 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void {
_ = try man.hit(); _ = try man.hit();
digest = man.final(); digest = man.final();
var prev_digest_buf: [digest.len]u8 = undefined; var prev_digest_buf: [digest.len]u8 = undefined;
const prev_digest: []u8 = directory.handle.readLink(id_symlink_basename, &prev_digest_buf) catch |err| blk: { const prev_digest: []u8 = directory.handle.readFile(id_symlink_basename, &prev_digest_buf) catch |err| blk: {
log.debug("COFF LLD new_digest={} readlink error: {}", .{ digest, @errorName(err) }); log.debug("COFF LLD new_digest={} readFile error: {}", .{ digest, @errorName(err) });
// Handle this as a cache miss. // Handle this as a cache miss.
break :blk prev_digest_buf[0..0]; break :blk prev_digest_buf[0..0];
}; };
@ -1180,10 +1180,10 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void {
} }
if (!self.base.options.disable_lld_caching) { if (!self.base.options.disable_lld_caching) {
// Update the dangling symlink with the digest. If it fails we can continue; it only // Update the dangling file with the digest. If it fails we can continue; it only
// means that the next invocation will have an unnecessary cache miss. // means that the next invocation will have an unnecessary cache miss.
directory.handle.symLink(&digest, id_symlink_basename, .{}) catch |err| { directory.handle.writeFile(id_symlink_basename, &digest) catch |err| {
std.log.warn("failed to save linking hash digest symlink: {}", .{@errorName(err)}); std.log.warn("failed to save linking hash digest file: {}", .{@errorName(err)});
}; };
// Again failure here only means an unnecessary cache miss. // Again failure here only means an unnecessary cache miss.
man.writeManifest() catch |err| { man.writeManifest() catch |err| {

10
src/link/Elf.zig
View File

@ -1326,8 +1326,8 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
digest = man.final(); digest = man.final();
var prev_digest_buf: [digest.len]u8 = undefined; var prev_digest_buf: [digest.len]u8 = undefined;
const prev_digest: []u8 = directory.handle.readLink(id_symlink_basename, &prev_digest_buf) catch |err| blk: { const prev_digest: []u8 = directory.handle.readFile(id_symlink_basename, &prev_digest_buf) catch |err| blk: {
log.debug("ELF LLD new_digest={} readlink error: {}", .{ digest, @errorName(err) }); log.debug("ELF LLD new_digest={} readFile error: {}", .{ digest, @errorName(err) });
// Handle this as a cache miss. // Handle this as a cache miss.
break :blk prev_digest_buf[0..0]; break :blk prev_digest_buf[0..0];
}; };
@ -1647,10 +1647,10 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
} }
if (!self.base.options.disable_lld_caching) { if (!self.base.options.disable_lld_caching) {
// Update the dangling symlink with the digest. If it fails we can continue; it only // Update the dangling file with the digest. If it fails we can continue; it only
// means that the next invocation will have an unnecessary cache miss. // means that the next invocation will have an unnecessary cache miss.
directory.handle.symLink(&digest, id_symlink_basename, .{}) catch |err| { directory.handle.writeFile(id_symlink_basename, &digest) catch |err| {
std.log.warn("failed to save linking hash digest symlink: {}", .{@errorName(err)}); std.log.warn("failed to save linking hash digest file: {}", .{@errorName(err)});
}; };
// Again failure here only means an unnecessary cache miss. // Again failure here only means an unnecessary cache miss.
man.writeManifest() catch |err| { man.writeManifest() catch |err| {

10
src/link/MachO.zig
View File

@ -419,8 +419,8 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void {
digest = man.final(); digest = man.final();
var prev_digest_buf: [digest.len]u8 = undefined; var prev_digest_buf: [digest.len]u8 = undefined;
const prev_digest: []u8 = directory.handle.readLink(id_symlink_basename, &prev_digest_buf) catch |err| blk: { const prev_digest: []u8 = directory.handle.readFile(id_symlink_basename, &prev_digest_buf) catch |err| blk: {
log.debug("MachO LLD new_digest={} readlink error: {}", .{ digest, @errorName(err) }); log.debug("MachO LLD new_digest={} readFile error: {}", .{ digest, @errorName(err) });
// Handle this as a cache miss. // Handle this as a cache miss.
break :blk prev_digest_buf[0..0]; break :blk prev_digest_buf[0..0];
}; };
@ -674,10 +674,10 @@ fn linkWithLLD(self: *MachO, comp: *Compilation) !void {
} }
if (!self.base.options.disable_lld_caching) { if (!self.base.options.disable_lld_caching) {
// Update the dangling symlink with the digest. If it fails we can continue; it only // Update the dangling file with the digest. If it fails we can continue; it only
// means that the next invocation will have an unnecessary cache miss. // means that the next invocation will have an unnecessary cache miss.
directory.handle.symLink(&digest, id_symlink_basename, .{}) catch |err| { directory.handle.writeFile(id_symlink_basename, &digest) catch |err| {
std.log.warn("failed to save linking hash digest symlink: {}", .{@errorName(err)}); std.log.warn("failed to save linking hash digest file: {}", .{@errorName(err)});
}; };
// Again failure here only means an unnecessary cache miss. // Again failure here only means an unnecessary cache miss.
man.writeManifest() catch |err| { man.writeManifest() catch |err| {

8
src/link/Wasm.zig
View File

@ -310,8 +310,8 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void {
digest = man.final(); digest = man.final();
var prev_digest_buf: [digest.len]u8 = undefined; var prev_digest_buf: [digest.len]u8 = undefined;
const prev_digest: []u8 = directory.handle.readLink(id_symlink_basename, &prev_digest_buf) catch |err| blk: { const prev_digest: []u8 = directory.handle.readFile(id_symlink_basename, &prev_digest_buf) catch |err| blk: {
log.debug("WASM LLD new_digest={} readlink error: {}", .{ digest, @errorName(err) }); log.debug("WASM LLD new_digest={} readFile error: {}", .{ digest, @errorName(err) });
// Handle this as a cache miss. // Handle this as a cache miss.
break :blk prev_digest_buf[0..0]; break :blk prev_digest_buf[0..0];
}; };
@ -424,9 +424,9 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void {
} }
if (!self.base.options.disable_lld_caching) { if (!self.base.options.disable_lld_caching) {
// Update the dangling symlink with the digest. If it fails we can continue; it only // Update the dangling file with the digest. If it fails we can continue; it only
// means that the next invocation will have an unnecessary cache miss. // means that the next invocation will have an unnecessary cache miss.
directory.handle.symLink(&digest, id_symlink_basename, .{}) catch |err| { directory.handle.writeFile(id_symlink_basename, &digest) catch |err| {
std.log.warn("failed to save linking hash digest symlink: {}", .{@errorName(err)}); std.log.warn("failed to save linking hash digest symlink: {}", .{@errorName(err)});
}; };
// Again failure here only means an unnecessary cache miss. // Again failure here only means an unnecessary cache miss.