[PATCH v20 15/20] perf, tools: Handle header line in mapfile

[Sukadev Bhattiprolu]

From: Andi Kleen <a...@linux.intel.com>

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

Signed-off-by: Andi Kleen <a...@linux.intel.com>
Signed-off-by: Sukadev Bhattiprolu <suka...@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jo...@redhat.com>
---

Changelog[v2]
        All architectures may not use the "Family" to identify. So,
        assume first line is header.
---
 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 a4f117c..b701d77 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -463,7 +463,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;
 
@@ -507,8 +512,8 @@ static int process_mapfile(FILE *outfp, char *fpath)
                fprintf(outfp, "},\n");
        }
 
+out:
        print_mapping_table_suffix(outfp);
-
        return 0;
 }
 
-- 
2.5.3