p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf jevents: Handle header line in mapfile 

To work with existing mapfiles, assume that the first line in
'mapfile.csv' is a header line and skip over it.

Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1473978296-20712-15-git-send-email-sukadev@linux.vnet.ibm.com
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Andi Kleen 2016-09-15 15:24:51 -07:00 committed by Arnaldo Carvalho de Melo
parent f33d122719
commit dc720ffc98
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/perf/pmu-events/jevents.c
View File

@ -477,7 +477,12 @@ static int process_mapfile(FILE *outfp, char *fpath)
print_mapping_table_prefix(outfp); print_mapping_table_prefix(outfp);
line_num = 0; /* Skip first line (header) */
p = fgets(line, n, mapfp);
if (!p)
goto out;
line_num = 1;
while (1) { while (1) {
char *cpuid, *version, *type, *fname; char *cpuid, *version, *type, *fname;
@ -521,8 +526,8 @@ static int process_mapfile(FILE *outfp, char *fpath)
fprintf(outfp, "},\n"); fprintf(outfp, "},\n");
} }
out:
print_mapping_table_suffix(outfp); print_mapping_table_suffix(outfp);
return 0; return 0;
} }