Skip to content

Commit

Permalink
perf session: Remove unneeded dump_printf calls
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnaldo Carvalho de Melo committed Dec 9, 2010
1 parent ba74f06 commit ddbc24b
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions tools/perf/util/session.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit ddbc24b

Please sign in to comment.