summaryrefslogtreecommitdiff
path: root/src/cli/serve.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/cli/serve.zig')
-rw-r--r--src/cli/serve.zig14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/cli/serve.zig b/src/cli/serve.zig
index 47ec1ed..23d307b 100644
--- a/src/cli/serve.zig
+++ b/src/cli/serve.zig
@@ -29,7 +29,7 @@ const Server = struct {
}
fn reply(s: *Server, d: *zt.Debugger, status: zt.control.Status, reason: []const u8, elapsed: u64) !void {
- try zt.control.send(s.writer, .{ .status = status, .pid = d.proc.pid, .tid = @intCast(d.proc.tid), .moments = s.rec.moments, .pc = d.regs.rip, .reason = reason, .elapsed_ns = elapsed });
+ try zt.control.send(s.writer, .{ .status = status, .pid = d.proc.pid, .tid = @intCast(d.proc.tid), .moments = s.rec.moments, .pc = d.regs.rip, .reason = reason, .elapsed_ns = elapsed, .capture_ns = if (status == .running) 0 else d.capture_ns });
}
fn waiting(ctx: *anyopaque, d: *zt.Debugger) !void {
@@ -94,13 +94,16 @@ pub fn run(init: std.process.Init, args: []const [:0]const u8) !void {
const cmd = words.next() orelse continue;
if (std.mem.eql(u8, cmd, "quit")) break;
const started = std.Io.Clock.awake.now(init.io);
+ d.capture_ns = 0;
var reason_buf: [128]u8 = undefined;
const reason = execute(&d, &server, cmd, std.mem.trim(u8, words.rest(), " \t\r"), &reason_buf) catch |err| {
try server.reply(&d, if (d.done) .exited else .failed, @errorName(err), 0);
continue;
};
- if ((std.mem.eql(u8, cmd, "inspect") or std.mem.eql(u8, cmd, "symbols")) and rec.delta.items.len > 0) try rec.commit();
+ if ((std.mem.eql(u8, cmd, "inspect") or std.mem.eql(u8, cmd, "symbols") or std.mem.eql(u8, cmd, "source-map")) and rec.delta.items.len > 0) try rec.commit();
+ const flush_started = std.Io.Clock.awake.now(init.io);
try rec.flush();
+ if (d.capture_ns != 0) d.capture_ns += @intCast(flush_started.durationTo(std.Io.Clock.awake.now(init.io)).toNanoseconds());
const elapsed: u64 = @intCast(started.durationTo(std.Io.Clock.awake.now(init.io)).toNanoseconds());
try server.reply(&d, if (d.done) .exited else .stopped, reason, elapsed);
}
@@ -116,6 +119,13 @@ fn execute(d: *zt.Debugger, s: *Server, cmd: []const u8, arg: []const u8, buf: [
const sig = try std.fmt.parseInt(u32, arg, 0);
if (sig > 64) return error.InvalidSignal;
d.proc.resume_signal = sig;
+ } else if (std.mem.eql(u8, cmd, "source-map")) {
+ var words = std.mem.tokenizeScalar(u8, arg, ' ');
+ const from = words.next() orelse return error.MissingPrefix;
+ const to = words.next() orelse return error.MissingPath;
+ if (words.next() != null) return error.InvalidSourceMap;
+ try d.mapSource(from, to);
+ return "source prefix mapped; target unchanged";
} else if (std.mem.eql(u8, cmd, "symbols")) {
if (arg.len == 0) return error.MissingPath;
try d.loadJit(arg);