Commit-ID: dc720ffc9863b618a192f5949234c54aad00ed24 Gitweb: http://git.kernel.org/tip/dc720ffc9863b618a192f5949234c54aad00ed24 Author: Andi Kleen <a...@linux.intel.com> AuthorDate: Thu, 15 Sep 2016 15:24:51 -0700 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Mon, 3 Oct 2016 21:33:54 -0300
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 <suka...@linux.vnet.ibm.com> Acked-by: Ingo Molnar <mi...@kernel.org> Acked-by: Jiri Olsa <jo...@redhat.com> Cc: Madhavan Srinivasan <ma...@linux.vnet.ibm.com> Cc: Peter Zijlstra <pet...@infradead.org> Link: http://lkml.kernel.org/r/1473978296-20712-15-git-send-email-suka...@linux.vnet.ibm.com Cc: linuxppc-...@lists.ozlabs.org Signed-off-by: Andi Kleen <a...@linux.intel.com> Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/pmu-events/jevents.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index c4c074a..c9bf9a7 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -477,7 +477,12 @@ static int process_mapfile(FILE *outfp, char *fpath) 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) { char *cpuid, *version, *type, *fname; @@ -521,8 +526,8 @@ static int process_mapfile(FILE *outfp, char *fpath) fprintf(outfp, "},\n"); } +out: print_mapping_table_suffix(outfp); - return 0; }
