|
@@ -2749,7 +2749,27 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
|
|
goto out_delete_evlist;
|
|
goto out_delete_evlist;
|
|
}
|
|
}
|
|
|
|
|
|
- perf_evlist__config(evlist, &trace->opts, &callchain_param);
|
|
|
|
|
|
+ perf_evlist__config(evlist, &trace->opts, NULL);
|
|
|
|
+
|
|
|
|
+ if (trace->opts.callgraph_set && trace->syscalls.events.sys_exit) {
|
|
|
|
+ perf_evsel__config_callchain(trace->syscalls.events.sys_exit,
|
|
|
|
+ &trace->opts, &callchain_param);
|
|
|
|
+ /*
|
|
|
|
+ * Now we have evsels with different sample_ids, use
|
|
|
|
+ * PERF_SAMPLE_IDENTIFIER to map from sample to evsel
|
|
|
|
+ * from a fixed position in each ring buffer record.
|
|
|
|
+ *
|
|
|
|
+ * As of this the changeset introducing this comment, this
|
|
|
|
+ * isn't strictly needed, as the fields that can come before
|
|
|
|
+ * PERF_SAMPLE_ID are all used, but we'll probably disable
|
|
|
|
+ * some of those for things like copying the payload of
|
|
|
|
+ * pointer syscall arguments, and for vfs_getname we don't
|
|
|
|
+ * need PERF_SAMPLE_ADDR and PERF_SAMPLE_IP, so do this
|
|
|
|
+ * here as a warning we need to use PERF_SAMPLE_IDENTIFIER.
|
|
|
|
+ */
|
|
|
|
+ perf_evlist__set_sample_bit(evlist, IDENTIFIER);
|
|
|
|
+ perf_evlist__reset_sample_bit(evlist, ID);
|
|
|
|
+ }
|
|
|
|
|
|
signal(SIGCHLD, sig_handler);
|
|
signal(SIGCHLD, sig_handler);
|
|
signal(SIGINT, sig_handler);
|
|
signal(SIGINT, sig_handler);
|