|
@@ -121,7 +121,6 @@ struct trace {
|
|
|
bool force;
|
|
|
bool vfs_getname;
|
|
|
int trace_pgfaults;
|
|
|
- int open_id;
|
|
|
};
|
|
|
|
|
|
struct tp_field {
|
|
@@ -805,12 +804,17 @@ static struct syscall_fmt *syscall_fmt__find(const char *name)
|
|
|
return bsearch(name, syscall_fmts, nmemb, sizeof(struct syscall_fmt), syscall_fmt__cmp);
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * is_exit: is this "exit" or "exit_group"?
|
|
|
+ * is_open: is this "open" or "openat"? To associate the fd returned in sys_exit with the pathname in sys_enter.
|
|
|
+ */
|
|
|
struct syscall {
|
|
|
struct event_format *tp_format;
|
|
|
int nr_args;
|
|
|
+ bool is_exit;
|
|
|
+ bool is_open;
|
|
|
struct format_field *args;
|
|
|
const char *name;
|
|
|
- bool is_exit;
|
|
|
struct syscall_fmt *fmt;
|
|
|
struct syscall_arg_fmt *arg_fmt;
|
|
|
};
|
|
@@ -1299,6 +1303,7 @@ static int trace__read_syscall_info(struct trace *trace, int id)
|
|
|
}
|
|
|
|
|
|
sc->is_exit = !strcmp(name, "exit_group") || !strcmp(name, "exit");
|
|
|
+ sc->is_open = !strcmp(name, "open") || !strcmp(name, "openat");
|
|
|
|
|
|
return syscall__set_arg_fmts(sc);
|
|
|
}
|
|
@@ -1722,7 +1727,7 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,
|
|
|
|
|
|
ret = perf_evsel__sc_tp_uint(evsel, ret, sample);
|
|
|
|
|
|
- if (id == trace->open_id && ret >= 0 && ttrace->filename.pending_open) {
|
|
|
+ if (sc->is_open && ret >= 0 && ttrace->filename.pending_open) {
|
|
|
trace__set_fd_pathname(thread, ret, ttrace->filename.name);
|
|
|
ttrace->filename.pending_open = false;
|
|
|
++trace->stats.vfs_getname;
|
|
@@ -3205,8 +3210,6 @@ int cmd_trace(int argc, const char **argv)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- trace.open_id = syscalltbl__id(trace.sctbl, "open");
|
|
|
-
|
|
|
err = target__validate(&trace.opts.target);
|
|
|
if (err) {
|
|
|
target__strerror(&trace.opts.target, err, bf, sizeof(bf));
|