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, linuxppc-dev@lists.ozlabs.org,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v13 13/14] perf, tools: Handle header line in mapfile
Date: Tue, 2 Jun 2015 10:12:13 -0700 [thread overview]
Message-ID: <1433265135-20426-14-git-send-email-sukadev@linux.vnet.ibm.com> (raw)
In-Reply-To: <1433265135-20426-1-git-send-email-sukadev@linux.vnet.ibm.com>
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
next prev parent reply other threads:[~2015-06-02 17:13 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 17:12 [PATCH V13 00/14] perf, tools: Add support for PMU events in JSON format Sukadev Bhattiprolu
2015-06-02 17:12 ` [PATCH v13 01/14] perf, tools: Add jsmn `jasmine' JSON parser Sukadev Bhattiprolu
2015-06-02 17:12 ` [PATCH v13 02/14] perf, tools, jevents: Program to convert JSON file to C style file Sukadev Bhattiprolu
2015-06-03 10:30 ` Jiri Olsa
2015-06-03 10:31 ` Jiri Olsa
2015-06-03 10:32 ` Jiri Olsa
2015-06-02 17:12 ` [PATCH v13 03/14] perf, tools: Use pmu_events_map table to create event aliases Sukadev Bhattiprolu
2015-06-03 10:30 ` Jiri Olsa
2015-06-03 10:30 ` Jiri Olsa
2015-06-03 10:31 ` Jiri Olsa
2015-06-03 10:31 ` Jiri Olsa
2015-06-02 17:12 ` [PATCH v13 04/14] perf, tools: Allow events with dot Sukadev Bhattiprolu
2015-06-03 10:32 ` Jiri Olsa
2015-06-16 9:28 ` Robert Richter
2015-06-02 17:12 ` [PATCH v13 05/14] perf, tools: Support CPU id matching for x86 v2 Sukadev Bhattiprolu
2015-06-02 17:12 ` [PATCH v13 06/14] perf, tools: Support alias descriptions Sukadev Bhattiprolu
2015-06-03 10:31 ` Jiri Olsa
2015-06-02 17:12 ` [PATCH v13 07/14] perf, tools: Query terminal width and use in perf list Sukadev Bhattiprolu
2015-06-02 17:12 ` [PATCH v13 08/14] perf, tools: Add a --no-desc flag to " Sukadev Bhattiprolu
2015-06-02 17:12 ` [PATCH v13 09/14] perf, tools: Group alias perf list by section Sukadev Bhattiprolu
2015-06-02 19:20 ` Sukadev Bhattiprolu
2015-06-02 17:12 ` [PATCH v13 10/14] perf, tools: Add override support for event list CPUID Sukadev Bhattiprolu
2015-06-02 17:12 ` [PATCH v13 11/14] perf, tools: Support long descriptions with perf list -v Sukadev Bhattiprolu
2015-06-03 10:32 ` Jiri Olsa
2015-06-02 17:12 ` [PATCH v13 12/14] perf, tools: Add support for event list topics Sukadev Bhattiprolu
2015-06-02 19:16 ` Sukadev Bhattiprolu
2015-06-03 10:32 ` Jiri Olsa
2015-06-03 12:57 ` Andi Kleen
2015-06-03 13:26 ` Arnaldo Carvalho de Melo
2015-06-03 14:25 ` Jiri Olsa
2015-06-02 17:12 ` Sukadev Bhattiprolu [this message]
2015-06-03 10:32 ` [PATCH v13 13/14] perf, tools: Handle header line in mapfile Jiri Olsa
2015-06-02 17:12 ` [PATCH v13 14/14] perf, tools: Add README for the JSON/map files parsing Sukadev Bhattiprolu
2015-06-02 19:22 ` [PATCH V13 00/14] perf, tools: Add support for PMU events in JSON format Sukadev Bhattiprolu
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=1433265135-20426-14-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=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).