From 2a46b60e1d115ff5149a112bc0f800467c0efaee Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Tue, 10 Nov 2026 23:34:16 -0300 Subject: record: --steps counts from the --from place The loader's syscalls on the way to main used up the count: --steps 120 on a dynamic program left ninety instructions. Co-Authored-By: Claude Fable 5.2 Claude-Session: https://claude.ai/code/session_016Y9MNCKgYCGiANnEwcEQxa --- build/debugger.zig | 4 +++- src/cli/record.zig | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build/debugger.zig b/build/debugger.zig index cb67354..7b90454 100644 --- a/build/debugger.zig +++ b/build/debugger.zig @@ -103,11 +103,13 @@ pub fn add(ctx: Ctx) void { from.addArg("--"); from.addArtifactArg(fib); from.addArg("10"); - from.expectStdErrMatch(" 64 moments, "); + from.expectStdErrMatch(" moments, "); const from_show = b.addRunArtifact(ctx.exe); from_show.addArg("show"); from_show.addFileArg(from_recording); from_show.expectStdOutMatch(" 1 breakpoint\n"); + // The 64 are counted from fib, whatever the loader did before. + from_show.expectStdOutMatch(" 64 step\n"); step.dependOn(&from_show.step); // ... and by syscall: the loader's own are passed, not taken for the place. const from_sys = b.addRunArtifact(ctx.exe); diff --git a/src/cli/record.zig b/src/cli/record.zig index d3d7a64..6743ec4 100644 --- a/src/cli/record.zig +++ b/src/cli/record.zig @@ -44,7 +44,8 @@ pub const usage = \\tcache, and the links of every chunk on a list; at most 4096 chunks and \\256 entries a list. glibc 2.40 and 2.44 only, linked dynamically or \\statically; the main arena's heap, the stopped thread's tcache. - \\--steps ends the recording after N moments, and --max-size when the + \\--steps ends the recording after N moments (N stops from the --from + \\place, when there is one), and --max-size when the \\file is that large (default 1G). Sizes take a suffix: 64K, 4G. \\ ++ util.Producer.usage; @@ -188,7 +189,9 @@ pub fn run(init: std.process.Init, args: []const [:0]const u8) !void { var timer = zt.event.now(); var exit_code: u64 = 0; var full = false; - while (rec.moments < max_moments) { + // From a place on, --steps counts the stops from there: what was recorded on the way is not of them. + var stops: u64 = 0; + while (if (from != null) stops < max_moments else rec.moments < max_moments) : (stops += 1) { const stop = (if (entry) |id| stop: { entry = null; break :stop runTo(&d, id); -- cgit v1.3