lkml.org 
[lkml]   [2015]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v13 13/14] perf, tools: Handle header line in mapfile
Date
From: Andi Kleen <ak@linux.intel.com>

Support a header line in the mapfile.csv, to match the existing
mapfiles

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.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 14707fb..8d365f2 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -461,7 +461,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;

@@ -505,8 +510,8 @@ static int process_mapfile(FILE *outfp, char *fpath)
fprintf(outfp, "},\n");
}

+out:
print_mapping_table_suffix(outfp);
-
return 0;
}

--
1.7.9.5


\
 
 \ /
  Last update: 2015-06-02 20:01    [W:0.151 / U:0.340 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site