Skip to content

Show progress while running commands #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2023
Merged

Show progress while running commands #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion src/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const perf_measurements = [_]PerfMeasurement{
};

const Command = struct {
raw_cmd: []const u8,
argv: []const []const u8,
measurements: Measurements,
sample_count: usize,
Expand Down Expand Up @@ -89,6 +90,7 @@ pub fn main() !void {
var cmd_argv = std.ArrayList([]const u8).init(arena);
try parseCmd(&cmd_argv, arg);
try commands.append(.{
.raw_cmd = arg,
.argv = try cmd_argv.toOwnedSlice(),
.measurements = undefined,
.sample_count = undefined,
Expand All @@ -112,15 +114,32 @@ pub fn main() !void {
}
}

var progress: std.Progress = .{};
const root_node = progress.start("poop", commands.items.len);
defer root_node.end();

var perf_fds = [1]fd_t{-1} ** perf_measurements.len;
var samples_buf: [10000]Sample = undefined;

var timer = std.time.Timer.start() catch @panic("need timer to work");

for (commands.items, 1..) |*command, command_n| {
const max_prog_name_len = 50;
const prog_name = blk: {
if (command.raw_cmd.len > max_prog_name_len) {
break :blk try std.fmt.allocPrint(arena, "'{s}...'", .{command.raw_cmd[0 .. max_prog_name_len - 3]});
}
break :blk try std.fmt.allocPrint(arena, "'{s}'", .{command.raw_cmd});
};
var cmd_prog_node = root_node.start(prog_name, 0);
cmd_prog_node.activate();
progress.refresh();

const min_samples = 3;

const first_start = timer.read();
var sample_index: usize = 0;
while ((sample_index < 3 or
while ((sample_index < min_samples or
(timer.read() - first_start) < max_nano_seconds) and
sample_index < samples_buf.len) : (sample_index += 1)
{
Expand Down Expand Up @@ -184,8 +203,18 @@ pub fn main() !void {
std.os.close(perf_fd.*);
perf_fd.* = -1;
}

cmd_prog_node.setEstimatedTotalItems(est_total: {
const cur_samples: u64 = sample_index + 1;
const ns_per_sample = (timer.read() - first_start) / cur_samples;
const estimate = std.math.divCeil(u64, max_nano_seconds, ns_per_sample) catch unreachable;
break :est_total @intCast(usize, @max(cur_samples, estimate, min_samples));
});
cmd_prog_node.completeOne();
}

cmd_prog_node.end();

const all_samples = samples_buf[0..sample_index];

command.measurements = .{
Expand All @@ -200,6 +229,9 @@ pub fn main() !void {
command.sample_count = all_samples.len;

{
progress.lock_stderr();
defer progress.unlock_stderr();

try tty_conf.setColor(stdout_w, .bold);
try stdout_w.print("Benchmark {d}", .{command_n});
try tty_conf.setColor(stdout_w, .dim);
Expand Down