提交 8c16b649 编写于 作者: A Adrian Hunter 提交者: Arnaldo Carvalho de Melo

perf session: Add missing sample flush for piped events

Piped events can be sorted so a final flush is needed.

Add that and remove a redundant 'err = 0'.
Signed-off-by: NAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: NJiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1382099356-4918-6-git-send-email-adrian.hunter@intel.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
上级 4f624685
...@@ -1263,7 +1263,9 @@ static int __perf_session__process_pipe_events(struct perf_session *self, ...@@ -1263,7 +1263,9 @@ static int __perf_session__process_pipe_events(struct perf_session *self,
if (!session_done()) if (!session_done())
goto more; goto more;
done: done:
err = 0; /* do the final flush for ordered samples */
self->ordered_samples.next_flush = ULLONG_MAX;
err = flush_sample_queue(self, tool);
out_err: out_err:
free(buf); free(buf);
perf_session__warn_about_errors(self, tool); perf_session__warn_about_errors(self, tool);
...@@ -1392,13 +1394,13 @@ int __perf_session__process_events(struct perf_session *session, ...@@ -1392,13 +1394,13 @@ int __perf_session__process_events(struct perf_session *session,
"Processing events..."); "Processing events...");
} }
err = 0;
if (session_done()) if (session_done())
goto out_err; goto out;
if (file_pos < file_size) if (file_pos < file_size)
goto more; goto more;
out:
/* do the final flush for ordered samples */ /* do the final flush for ordered samples */
session->ordered_samples.next_flush = ULLONG_MAX; session->ordered_samples.next_flush = ULLONG_MAX;
err = flush_sample_queue(session, tool); err = flush_sample_queue(session, tool);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册