[PATCH v19 15/19] perf, tools: Handle header line in mapfile

From	Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Newsgroups	linux.kernel
Subject	[PATCH v19 15/19] perf, tools: Handle header line in mapfile
Date	2015-12-01 04:00 +0100
Message-ID	<qAJkC-3EM-19@gated-at.bofh.it> (permalink)
References	<qAJkB-3EM-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Andi Kleen <ak@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 <ak@linux.intel.com>
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@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 8e6e813..b4e3f01 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;
 }
 
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

[PATCH v19 00/19] perf, tools: Add support for PMU events in JSON format Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100
  [PATCH v19 19/19] perf, tools, pmu-events: Add Skylake frontend MSR support Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100
  [PATCH v19 08/19] perf, tools: Add a --no-desc flag to perf list Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100
  [PATCH v19 13/19] perf, tools, jevents: Add support for event topics Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100
  [PATCH v19 15/19] perf, tools: Handle header line in mapfile Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100
  [PATCH v19 17/19] perf, tools: Make alias matching case-insensitive Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100
  [PATCH v19 01/19] perf, tools: Add jsmn `jasmine' JSON parser Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100
  [PATCH v19 16/19] perf, tools: Add README for info on parsing JSON/map files Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100
  [PATCH v19 14/19] perf, tools: Add support for event list topics Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100
  [PATCH v19 18/19] perf, tools, pmu-events: Fix fixed counters on Intel Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100
  [PATCH v19 10/19] perf, tools, jevents: Add support for long descriptions Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:00 +0100
  [PATCH v19 07/19] perf, tools: Query terminal width and use in perf list Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100
  [PATCH v19 05/19] perf, tools: Support CPU id matching for x86 v2 Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100
  [PATCH v19 03/19] perf, tools: Use pmu_events table to create aliases Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100
  [PATCH v19 12/19] perf, tools: Support long descriptions with perf list Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100
  [PATCH v19 11/19] perf, tools: Add alias support for long descriptions Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100
  [PATCH v19 06/19] perf, tools: Support alias descriptions Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100
  [PATCH v19 04/19] perf, tools: Support CPU ID matching for Powerpc Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100
  [PATCH v19 09/19] perf, tools: Add override support for event list CPUID Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100
  [PATCH v19 02/19] perf, tools, jevents: Program to convert JSON file to C style file Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> - 2015-12-01 04:10 +0100
  Re: [PATCH v19 00/19] perf, tools: Add support for PMU events in  JSON format Andi Kleen <ak@linux.intel.com> - 2015-12-03 22:10 +0100

csiph-web