|
@@ -1955,6 +1955,16 @@ static int perf_script__fopen_per_event_dump(struct perf_script *script)
|
|
struct perf_evsel *evsel;
|
|
struct perf_evsel *evsel;
|
|
|
|
|
|
evlist__for_each_entry(script->session->evlist, evsel) {
|
|
evlist__for_each_entry(script->session->evlist, evsel) {
|
|
|
|
+ /*
|
|
|
|
+ * Already setup? I.e. we may be called twice in cases like
|
|
|
|
+ * Intel PT, one for the intel_pt// and dummy events, then
|
|
|
|
+ * for the evsels syntheized from the auxtrace info.
|
|
|
|
+ *
|
|
|
|
+ * Ses perf_script__process_auxtrace_info.
|
|
|
|
+ */
|
|
|
|
+ if (evsel->priv != NULL)
|
|
|
|
+ continue;
|
|
|
|
+
|
|
evsel->priv = perf_evsel_script__new(evsel, script->session->data);
|
|
evsel->priv = perf_evsel_script__new(evsel, script->session->data);
|
|
if (evsel->priv == NULL)
|
|
if (evsel->priv == NULL)
|
|
goto out_err_fclose;
|
|
goto out_err_fclose;
|
|
@@ -2838,6 +2848,25 @@ int process_cpu_map_event(struct perf_tool *tool __maybe_unused,
|
|
return set_maps(script);
|
|
return set_maps(script);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+#ifdef HAVE_AUXTRACE_SUPPORT
|
|
|
|
+static int perf_script__process_auxtrace_info(struct perf_tool *tool,
|
|
|
|
+ union perf_event *event,
|
|
|
|
+ struct perf_session *session)
|
|
|
|
+{
|
|
|
|
+ int ret = perf_event__process_auxtrace_info(tool, event, session);
|
|
|
|
+
|
|
|
|
+ if (ret == 0) {
|
|
|
|
+ struct perf_script *script = container_of(tool, struct perf_script, tool);
|
|
|
|
+
|
|
|
|
+ ret = perf_script__setup_per_event_dump(script);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return ret;
|
|
|
|
+}
|
|
|
|
+#else
|
|
|
|
+#define perf_script__process_auxtrace_info 0
|
|
|
|
+#endif
|
|
|
|
+
|
|
int cmd_script(int argc, const char **argv)
|
|
int cmd_script(int argc, const char **argv)
|
|
{
|
|
{
|
|
bool show_full_info = false;
|
|
bool show_full_info = false;
|
|
@@ -2866,7 +2895,7 @@ int cmd_script(int argc, const char **argv)
|
|
.feature = perf_event__process_feature,
|
|
.feature = perf_event__process_feature,
|
|
.build_id = perf_event__process_build_id,
|
|
.build_id = perf_event__process_build_id,
|
|
.id_index = perf_event__process_id_index,
|
|
.id_index = perf_event__process_id_index,
|
|
- .auxtrace_info = perf_event__process_auxtrace_info,
|
|
|
|
|
|
+ .auxtrace_info = perf_script__process_auxtrace_info,
|
|
.auxtrace = perf_event__process_auxtrace,
|
|
.auxtrace = perf_event__process_auxtrace,
|
|
.auxtrace_error = perf_event__process_auxtrace_error,
|
|
.auxtrace_error = perf_event__process_auxtrace_error,
|
|
.stat = perf_event__process_stat_event,
|
|
.stat = perf_event__process_stat_event,
|