summaryrefslogtreecommitdiff
path: root/src/trace/kernel_test.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/trace/kernel_test.zig')
-rw-r--r--src/trace/kernel_test.zig11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/trace/kernel_test.zig b/src/trace/kernel_test.zig
index 1905771..8277e34 100644
--- a/src/trace/kernel_test.zig
+++ b/src/trace/kernel_test.zig
@@ -60,17 +60,20 @@ fn record(log: *Log, path: []const u8, args: []const []const u8, options: perf.O
const envp = [_:null]?[*:0]const u8{};
var proc = try zt.ptrace.Process.spawn(argv[0].?, argv, &envp);
- errdefer proc.kill();
+ errdefer proc.close();
var session = perf.Session.open(gpa, proc.pid, options, log.sink()) catch |err| switch (err) {
error.PerfAccess, error.PerfNoSuchEvent => {
- proc.kill();
+ proc.close();
return error.SkipZigTest;
},
else => |e| return e,
};
defer session.close();
+ var symbols: zt.Symbols = .{ .gpa = gpa, .io = std.testing.io };
+ defer symbols.deinit();
+ symbols.free(try symbols.refresh(proc.pid));
for (armed) |a| {
- const sym = (try perf.lookup(gpa, proc.pid, a.symbol)).?;
+ const sym = symbols.find(a.symbol).?;
try session.watch(.{ .addr = sym.addr, .len = @intCast(@min(sym.size, 8)), .mode = a.mode, .name = a.symbol });
}
perf.release(proc);
@@ -297,7 +300,7 @@ test "usdt: the notes say what readelf says; arguments are fetched at a probe" {
const argv = [_:null]?[*:0]const u8{ path, "4", null };
const envp = [_:null]?[*:0]const u8{};
var proc = try zt.ptrace.Process.spawn(path, &argv, &envp);
- errdefer proc.kill();
+ errdefer proc.close();
const maps = try perf.readMaps(gpa, proc.pid);
defer gpa.free(maps);
// The program itself is the first thing mapped.