Subject: [PATCH 10/22] perf jevents: Handle header line in mapfile

From: Arnaldo Carvalho de Melo <[email-masked]>
Date: Mon, 3 Oct 2016 23:37:09 -0300

From: Andi Kleen <[email-masked]>

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 <[email-masked]>
Acked-by: Ingo Molnar <[email-masked]>
Acked-by: Jiri Olsa <[email-masked]>
Cc: Madhavan Srinivasan <[email-masked]>
Cc: Peter Zijlstra <[email-masked]>
Link: http://lkml.kernel.org/r/[email-masked]
Cc: [email-masked]
Signed-off-by: Andi Kleen <[email-masked]>
Signed-off-by: Arnaldo Carvalho de Melo <[email-masked]>
---
 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 c4c074a49b6e..c9bf9a7dc7b2 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;
 }
 
-- 
2.7.4