From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
To: mingo@redhat.com, ak@linux.intel.com,
Michael Ellerman <mpe@ellerman.id.au>,
Jiri Olsa <jolsa@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: namhyung@kernel.org, maddy@linux.vnet.ibm.com,
linuxppc-dev@lists.ozlabs.org, <linux-kernel@vger.kernel.org>
Subject: [PATCH v19 15/19] perf, tools: Handle header line in mapfile
Date: Mon, 30 Nov 2015 18:57:10 -0800 [thread overview]
Message-ID: <1448938635-29176-16-git-send-email-sukadev@linux.vnet.ibm.com> (raw)
In-Reply-To: <1448938635-29176-1-git-send-email-sukadev@linux.vnet.ibm.com>
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
next prev parent reply other threads:[~2015-12-01 2:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-01 2:56 [PATCH v19 00/19] perf, tools: Add support for PMU events in JSON format Sukadev Bhattiprolu
2015-12-01 2:56 ` [PATCH v19 01/19] perf, tools: Add jsmn `jasmine' JSON parser Sukadev Bhattiprolu
2015-12-01 2:56 ` [PATCH v19 02/19] perf, tools, jevents: Program to convert JSON file to C style file Sukadev Bhattiprolu
2015-12-01 2:56 ` [PATCH v19 03/19] perf, tools: Use pmu_events table to create aliases Sukadev Bhattiprolu
2015-12-01 2:56 ` [PATCH v19 04/19] perf, tools: Support CPU ID matching for Powerpc Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 05/19] perf, tools: Support CPU id matching for x86 v2 Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 06/19] perf, tools: Support alias descriptions Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 07/19] perf, tools: Query terminal width and use in perf list Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 08/19] perf, tools: Add a --no-desc flag to " Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 09/19] perf, tools: Add override support for event list CPUID Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 10/19] perf, tools, jevents: Add support for long descriptions Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 11/19] perf, tools: Add alias " Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 12/19] perf, tools: Support long descriptions with perf list Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 13/19] perf, tools, jevents: Add support for event topics Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 14/19] perf, tools: Add support for event list topics Sukadev Bhattiprolu
2015-12-01 2:57 ` Sukadev Bhattiprolu [this message]
2015-12-01 2:57 ` [PATCH v19 16/19] perf, tools: Add README for info on parsing JSON/map files Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 17/19] perf, tools: Make alias matching case-insensitive Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 18/19] perf, tools, pmu-events: Fix fixed counters on Intel Sukadev Bhattiprolu
2015-12-01 2:57 ` [PATCH v19 19/19] perf, tools, pmu-events: Add Skylake frontend MSR support Sukadev Bhattiprolu
2015-12-03 21:02 ` [PATCH v19 00/19] perf, tools: Add support for PMU events in JSON format Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448938635-29176-16-git-send-email-sukadev@linux.vnet.ibm.com \
--to=sukadev@linux.vnet.ibm.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).