lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf tools: Output 'perf list' to stdout not stderr

Browse Source 
Writing to stdout is probably the expected behavior because the
user explicitly asked for a list.

Signed-off-by: Marti Raudsepp <marti@juffo.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <4ebb59420ef057972167.1256603585@localhost>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Marti Raudsepp
2009-10-27 00:33:05 +00:00
committed by Ingo Molnar
parent 85df6f683e
commit 689d301878
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/perf/util/parse-events.c
View File

@@ -806,7 +806,7 @@ static void print_tracepoint_events(void)
for_each_event(sys_dirent, evt_dir, evt_dirent, evt_next) { for_each_event(sys_dirent, evt_dir, evt_dirent, evt_next) {
snprintf(evt_path, MAXPATHLEN, "%s:%s", snprintf(evt_path, MAXPATHLEN, "%s:%s",
sys_dirent.d_name, evt_dirent.d_name); sys_dirent.d_name, evt_dirent.d_name);
fprintf(stderr, " %-42s [%s]\n", evt_path, printf(" %-42s [%s]\n", evt_path,
event_type_descriptors[PERF_TYPE_TRACEPOINT+1]); event_type_descriptors[PERF_TYPE_TRACEPOINT+1]);
} }
closedir(evt_dir); closedir(evt_dir);
@@ -823,8 +823,8 @@ void print_events(void)
unsigned int i, type, op, prev_type = -1; unsigned int i, type, op, prev_type = -1;
char name[40]; char name[40];
fprintf(stderr, "\n"); printf("\n");
fprintf(stderr, "List of pre-defined events (to be used in -e):\n"); printf("List of pre-defined events (to be used in -e):\n");
for (i = 0; i < ARRAY_SIZE(event_symbols); i++, syms++) { for (i = 0; i < ARRAY_SIZE(event_symbols); i++, syms++) {
type = syms->type + 1; type = syms->type + 1;
@@ -832,19 +832,19 @@ void print_events(void)
type = 0; type = 0;
if (type != prev_type) if (type != prev_type)
fprintf(stderr, "\n"); printf("\n");
if (strlen(syms->alias)) if (strlen(syms->alias))
sprintf(name, "%s OR %s", syms->symbol, syms->alias); sprintf(name, "%s OR %s", syms->symbol, syms->alias);
else else
strcpy(name, syms->symbol); strcpy(name, syms->symbol);
fprintf(stderr, " %-42s [%s]\n", name, printf(" %-42s [%s]\n", name,
event_type_descriptors[type]); event_type_descriptors[type]);
prev_type = type; prev_type = type;
} }
fprintf(stderr, "\n"); printf("\n");
for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) { for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) {
for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) { for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) {
/* skip invalid cache type */ /* skip invalid cache type */
@@ -852,17 +852,17 @@ void print_events(void)
continue; continue;
for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) { for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) {
fprintf(stderr, " %-42s [%s]\n", printf(" %-42s [%s]\n",
event_cache_name(type, op, i), event_cache_name(type, op, i),
event_type_descriptors[4]); event_type_descriptors[4]);
} }
} }
} }
fprintf(stderr, "\n"); printf("\n");
fprintf(stderr, " %-42s [raw hardware event descriptor]\n", printf(" %-42s [raw hardware event descriptor]\n",
"rNNN"); "rNNN");
fprintf(stderr, "\n"); printf("\n");
print_tracepoint_events(); print_tracepoint_events();