|
@@ -2055,13 +2055,33 @@ static int trace__event_handler(struct trace *trace, struct perf_evsel *evsel,
|
|
|
if (trace->trace_syscalls)
|
|
|
fprintf(trace->output, "( ): ");
|
|
|
|
|
|
+ if (evsel == trace->syscalls.events.augmented) {
|
|
|
+ int id = perf_evsel__sc_tp_uint(evsel, id, sample);
|
|
|
+ struct syscall *sc = trace__syscall_info(trace, evsel, id);
|
|
|
+
|
|
|
+ if (sc) {
|
|
|
+ struct thread *thread = machine__findnew_thread(trace->host, sample->pid, sample->tid);
|
|
|
+
|
|
|
+ if (thread) {
|
|
|
+ fprintf(trace->output, "%s(", sc->name);
|
|
|
+ trace__fprintf_sys_enter(trace, evsel, sample);
|
|
|
+ fputc(')', trace->output);
|
|
|
+ thread__put(thread);
|
|
|
+ goto newline;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /*
|
|
|
+ * XXX: Not having the associated syscall info or not finding/adding
|
|
|
+ * the thread should never happen, but if it does...
|
|
|
+ * fall thru and print it as a bpf_output event.
|
|
|
+ */
|
|
|
+ }
|
|
|
+
|
|
|
fprintf(trace->output, "%s:", evsel->name);
|
|
|
|
|
|
if (perf_evsel__is_bpf_output(evsel)) {
|
|
|
- if (evsel == trace->syscalls.events.augmented)
|
|
|
- trace__fprintf_sys_enter(trace, evsel, sample);
|
|
|
- else
|
|
|
- bpf_output__fprintf(trace, sample);
|
|
|
+ bpf_output__fprintf(trace, sample);
|
|
|
} else if (evsel->tp_format) {
|
|
|
if (strncmp(evsel->tp_format->name, "sys_enter_", 10) ||
|
|
|
trace__fprintf_sys_enter(trace, evsel, sample)) {
|
|
@@ -2071,6 +2091,7 @@ static int trace__event_handler(struct trace *trace, struct perf_evsel *evsel,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+newline:
|
|
|
fprintf(trace->output, "\n");
|
|
|
|
|
|
if (callchain_ret > 0)
|