mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-17 14:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

build system: make debounce interval CLI-configurable

Browse Source
This commit is contained in:
Andrew Kelley 2024-07-09 18:37:20 -07:00
parent 5ee3971b18
commit 6f89824c22
2 changed files with 12 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/compiler/build_runner.zig
View File

@ -107,6 +107,7 @@ pub fn main() !void {
var steps_menu = false;
var output_tmp_nonce: ?[16]u8 = null;
var watch = false;
var debounce_interval_ms: u16 = 50;
while (nextArg(args, &arg_idx)) |arg| {
if (mem.startsWith(u8, arg, "-Z")) {
@ -194,7 +195,15 @@ pub fn main() !void {
const next_arg = nextArg(args, &arg_idx) orelse
fatalWithHint("expected u32 after '{s}'", .{arg});
seed = std.fmt.parseUnsigned(u32, next_arg, 0) catch |err| {
fatal("unable to parse seed '{s}' as 32-bit integer: {s}\n", .{
fatal("unable to parse seed '{s}' as unsigned 32-bit integer: {s}\n", .{
next_arg, @errorName(err),
});
};
} else if (mem.eql(u8, arg, "--debounce")) {
const next_arg = nextArg(args, &arg_idx) orelse
fatalWithHint("expected u16 after '{s}'", .{arg});
debounce_interval_ms = std.fmt.parseUnsigned(u16, next_arg, 0) catch |err| {
fatal("unable to parse debounce interval '{s}' as unsigned 16-bit integer: {s}\n", .{
next_arg, @errorName(err),
});
};
@ -473,7 +482,6 @@ pub fn main() !void {
// if any more events come in. After the debounce interval has passed,
// trigger a rebuild on all steps with modified inputs, as well as their
// recursive dependants.
const debounce_interval_ms = 50;
var poll_fds: [1]std.posix.pollfd = .{
.{
.fd = w.fan_fd,
@ -515,67 +523,29 @@ fn markDirtySteps(w: *Watch) !bool {
error.WouldBlock => return any_dirty,
else => |e| return e,
};
//std.debug.dump_hex(events_buf[0..len]);
var meta: [*]align(1) M = @ptrCast(&events_buf);
while (len >= @sizeOf(M) and meta[0].event_len >= @sizeOf(M) and meta[0].event_len <= len) : ({
len -= meta[0].event_len;
meta = @ptrCast(@as([*]u8, @ptrCast(meta)) + meta[0].event_len);
}) {
assert(meta[0].vers == M.VERSION);
std.debug.print("meta = {any}\n", .{meta[0]});
const fid: *align(1) fanotify.event_info_fid = @ptrCast(meta + 1);
switch (fid.hdr.info_type) {
.DFID_NAME => {
const file_handle: *align(1) std.os.linux.file_handle = @ptrCast(&fid.handle);
const file_name_z: [*:0]u8 = @ptrCast((&file_handle.f_handle).ptr + file_handle.handle_bytes);
const file_name = mem.span(file_name_z);
std.debug.print("DFID_NAME file_handle = {any}, found: '{s}'\n", .{ file_handle.*, file_name });
const lfh: Watch.LinuxFileHandle = .{ .handle = file_handle };
if (w.handle_table.getPtr(lfh)) |reaction_set| {
if (reaction_set.getPtr(file_name)) |step_set| {
for (step_set.keys()) |step| {
std.debug.print("DFID_NAME marking step '{s}' dirty\n", .{step.name});
step.state = .precheck_done;
any_dirty = true;
}
}
} else {
std.debug.print("DFID_NAME changed file did not match any directories: '{}'\n", .{
std.fmt.fmtSliceHexLower(lfh.slice()),
});
}
},
//.FID => {
// const file_handle: *align(1) std.os.linux.file_handle = @ptrCast(&fid.handle);
// const lfh: Watch.LinuxFileHandle = .{ .handle = file_handle };
// if (w.handle_table.get(lfh)) |step_set| {
// for (step_set.keys()) |step| {
// std.debug.print("FID marking step '{s}' dirty\n", .{step.name});
// step.state = .precheck_done;
// any_dirty = true;
// }
// } else {
// std.debug.print("FID changed file did not match any steps: '{}'\n", .{
// std.fmt.fmtSliceHexLower(lfh.slice()),
// });
// }
//},
//.DFID => {
// const file_handle: *align(1) std.os.linux.file_handle = @ptrCast(&fid.handle);
// const lfh: Watch.LinuxFileHandle = .{ .handle = file_handle };
// if (w.handle_table.get(lfh)) |step_set| {
// for (step_set.keys()) |step| {
// std.debug.print("DFID marking step '{s}' dirty\n", .{step.name});
// step.state = .precheck_done;
// any_dirty = true;
// }
// } else {
// std.debug.print("DFID changed file did not match any steps\n", .{});
// }
//},
else => |t| {
std.debug.panic("TODO: received event type '{s}'", .{@tagName(t)});
},
else => |t| std.log.warn("unexpected fanotify event '{s}'", .{@tagName(t)}),
}
}
}
@ -1349,6 +1319,7 @@ fn usage(b: *std.Build, out_stream: anytype) !void {
\\ --skip-oom-steps Instead of failing, skip steps that would exceed --maxrss
\\ --fetch Exit after fetching dependency tree
\\ --watch Continuously rebuild when source files are modified
\\ --debounce <ms> Delay before rebuilding after watched file detection
\\
\\Project-Specific Options:
\\

16
lib/std/Build/Watch.zig
View File

@ -104,22 +104,6 @@ pub const LinuxFileHandle = struct {
};
};
pub fn getFileHandle(gpa: Allocator, path: std.Build.Cache.Path, basename: []const u8) !LinuxFileHandle {
var file_handle_buffer: [@sizeOf(std.os.linux.file_handle) + 128]u8 align(@alignOf(std.os.linux.file_handle)) = undefined;
var mount_id: i32 = undefined;
var buf: [std.fs.max_path_bytes]u8 = undefined;
const joined_path = if (path.sub_path.len == 0) basename else path: {
break :path std.fmt.bufPrint(&buf, "{s}/{s}", .{
path.sub_path, basename,
}) catch return error.NameTooLong;
};
const stack_ptr: *std.os.linux.file_handle = @ptrCast(&file_handle_buffer);
stack_ptr.handle_bytes = file_handle_buffer.len - @sizeOf(std.os.linux.file_handle);
try std.posix.name_to_handle_at(path.root_dir.handle.fd, joined_path, stack_ptr, &mount_id, 0);
const stack_lfh: LinuxFileHandle = .{ .handle = stack_ptr };
return stack_lfh.clone(gpa);
}
pub fn getDirHandle(gpa: Allocator, path: std.Build.Cache.Path) !LinuxFileHandle {
var file_handle_buffer: [@sizeOf(std.os.linux.file_handle) + 128]u8 align(@alignOf(std.os.linux.file_handle)) = undefined;
var mount_id: i32 = undefined;