[tip:perf/core] perf session: Remove unneeded dump_printf calls

tip-bot for Arnaldo Carvalho de Melo
2010-12-09T23:40:23Z

Commit-ID: ddbc24b72c2c3f3f0182bbc2cb70b31c52a6f45b
Gitweb: http://git.kernel.org/tip/ddbc24b72c2c3f3f0182bbc2cb70b31c52a6f45b
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
AuthorDate: Thu, 9 Dec 2010 12:20:20 -0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 9 Dec 2010 12:20:20 -0200

perf session: Remove unneeded dump_printf calls

Since we check at the beginning of the callers, no need to ask if
dump_trace is set multiple times.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ian Munsie <imunsie@au1.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/session.c | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 69760cd..b59abf5 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -639,13 +639,10 @@ static int perf_session_queue_event(struct perf_session *s, event_t *event,
return 0;
}

-static void callchain__dump(struct sample_data *sample)
+static void callchain__printf(struct sample_data *sample)
{
unsigned int i;

- if (!dump_trace)
- return;
-
printf("... chain: nr:%Lu\n", sample->callchain->nr);

for (i = 0; i < sample->callchain->nr; i++)
@@ -675,27 +672,29 @@ static void dump_event(struct perf_session *session, event_t *event,
if (!dump_trace)
return;

- dump_printf("\n%#Lx [%#x]: event: %d\n", file_offset,
- event->header.size, event->header.type);
+ printf("\n%#Lx [%#x]: event: %d\n", file_offset, event->header.size,
+ event->header.type);

trace_event(event);

if (sample)
perf_session__print_tstamp(session, event, sample);

- dump_printf("%#Lx [%#x]: PERF_RECORD_%s",
- file_offset, event->header.size,
- event__get_event_name(event->header.type));
+ printf("%#Lx [%#x]: PERF_RECORD_%s", file_offset, event->header.size,
+ event__get_event_name(event->header.type));
}

static void dump_sample(struct perf_session *session, event_t *event,
struct sample_data *sample)
{
- dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
- sample->pid, sample->tid, sample->ip, sample->period);
+ if (!dump_trace)
+ return;
+
+ printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,
+ sample->pid, sample->tid, sample->ip, sample->period);

if (session->sample_type & PERF_SAMPLE_CALLCHAIN)
- callchain__dump(sample);
+ callchain__printf(sample);
}

static int perf_session_deliver_event(struct perf_session *session,