forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf tools: Factor ordered_events__flush to be more generic

Browse source 
Centralizing the next_flush calculation under the ordered_events__flush
function.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-srwunsy7o5wl17vpt4a10oxp@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2014-06-05 10:29:45 +02:00 • committed by Arnaldo Carvalho de Melo
commit d8836b5d17
1 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

47
tools/perf/util/session.c
View file

@ -451,6 +451,11 @@ struct ordered_event {
struct list_head list; struct list_head list;
}; };
enum oe_flush {
OE_FLUSH__FINAL,
OE_FLUSH__ROUND,
};
static void perf_session_free_sample_buffers(struct perf_session *session) static void perf_session_free_sample_buffers(struct perf_session *session)
{ {
struct ordered_events *oe = &session->ordered_events; struct ordered_events *oe = &session->ordered_events;
@ -564,8 +569,8 @@ static int perf_session_deliver_event(struct perf_session *session,
struct perf_tool *tool, struct perf_tool *tool,
u64 file_offset); u64 file_offset);
static int ordered_events__flush(struct perf_session *s, static int __ordered_events__flush(struct perf_session *s,
struct perf_tool *tool) struct perf_tool *tool)
{ {
struct ordered_events *oe = &s->ordered_events; struct ordered_events *oe = &s->ordered_events;
struct list_head *head = &oe->events; struct list_head *head = &oe->events;
@ -615,6 +620,32 @@ static int ordered_events__flush(struct perf_session *s,
return 0; return 0;
} }
static int ordered_events__flush(struct perf_session *s, struct perf_tool *tool,
enum oe_flush how)
{
struct ordered_events *oe = &s->ordered_events;
int err;
switch (how) {
case OE_FLUSH__FINAL:
oe->next_flush = ULLONG_MAX;
break;
case OE_FLUSH__ROUND:
default:
break;
};
err = __ordered_events__flush(s, tool);
if (!err) {
if (how == OE_FLUSH__ROUND)
oe->next_flush = oe->max_timestamp;
}
return err;
}
/* /*
* When perf record finishes a pass on every buffers, it records this pseudo * When perf record finishes a pass on every buffers, it records this pseudo
* event. * event.
@ -658,11 +689,7 @@ static int process_finished_round(struct perf_tool *tool,
union perf_event *event __maybe_unused, union perf_event *event __maybe_unused,
struct perf_session *session) struct perf_session *session)
{ {
int ret = ordered_events__flush(session, tool); return ordered_events__flush(session, tool, OE_FLUSH__ROUND);
if (!ret)
session->ordered_events.next_flush = session->ordered_events.max_timestamp;
return ret;
} }
int perf_session_queue_event(struct perf_session *s, union perf_event *event, int perf_session_queue_event(struct perf_session *s, union perf_event *event,
@ -1247,8 +1274,7 @@ more:
goto more; goto more;
done: done:
/* do the final flush for ordered samples */ /* do the final flush for ordered samples */
session->ordered_events.next_flush = ULLONG_MAX; err = ordered_events__flush(session, tool, OE_FLUSH__FINAL);
err = ordered_events__flush(session, tool);
out_err: out_err:
free(buf); free(buf);
perf_session__warn_about_errors(session, tool); perf_session__warn_about_errors(session, tool);
@ -1393,8 +1419,7 @@ more:
out: out:
/* do the final flush for ordered samples */ /* do the final flush for ordered samples */
session->ordered_events.next_flush = ULLONG_MAX; err = ordered_events__flush(session, tool, OE_FLUSH__FINAL);
err = ordered_events__flush(session, tool);
out_err: out_err:
ui_progress__finish(); ui_progress__finish();
perf_session__warn_about_errors(session, tool); perf_session__warn_about_errors(session, tool);