From: tip-bot for Andi Kleen <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, tglx@linutronix.de, ak@linux.intel.com,
acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com,
jolsa@kernel.org
Subject: [tip:perf/core] perf pmu: Factor out scale conversion code
Date: Wed, 18 Jan 2017 01:19:16 -0800 [thread overview]
Message-ID: <tip-d02fc6bcd53721cf8588633409157c232f2418e0@git.kernel.org> (raw)
In-Reply-To: <20170103150833.6694-2-andi@firstfloor.org>
Commit-ID: d02fc6bcd53721cf8588633409157c232f2418e0
Gitweb: http://git.kernel.org/tip/d02fc6bcd53721cf8588633409157c232f2418e0
Author: Andi Kleen <ak@linux.intel.com>
AuthorDate: Tue, 3 Jan 2017 07:08:23 -0800
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 16 Jan 2017 14:59:15 -0300
perf pmu: Factor out scale conversion code
Move the scale factor parsing code to an own function to reuse it in an
upcoming patch.
v2: Return error in case strdup returns NULL.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/20170103150833.6694-2-andi@firstfloor.org
[ Keep returning -ENOMEM when strdup() fails in perf_pmu__parse_scale()/convert_scale() ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/pmu.c | 62 ++++++++++++++++++++++++++++-----------------------
1 file changed, 34 insertions(+), 28 deletions(-)
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index dc6ccaa..78b1610 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -94,32 +94,10 @@ static int pmu_format(const char *name, struct list_head *format)
return 0;
}
-static int perf_pmu__parse_scale(struct perf_pmu_alias *alias, char *dir, char *name)
+static int convert_scale(const char *scale, char **end, double *sval)
{
- struct stat st;
- ssize_t sret;
- char scale[128];
- int fd, ret = -1;
- char path[PATH_MAX];
char *lc;
-
- snprintf(path, PATH_MAX, "%s/%s.scale", dir, name);
-
- fd = open(path, O_RDONLY);
- if (fd == -1)
- return -1;
-
- if (fstat(fd, &st) < 0)
- goto error;
-
- sret = read(fd, scale, sizeof(scale)-1);
- if (sret < 0)
- goto error;
-
- if (scale[sret - 1] == '\n')
- scale[sret - 1] = '\0';
- else
- scale[sret] = '\0';
+ int ret = 0;
/*
* save current locale
@@ -134,7 +112,7 @@ static int perf_pmu__parse_scale(struct perf_pmu_alias *alias, char *dir, char *
lc = strdup(lc);
if (!lc) {
ret = -ENOMEM;
- goto error;
+ goto out;
}
/*
@@ -144,14 +122,42 @@ static int perf_pmu__parse_scale(struct perf_pmu_alias *alias, char *dir, char *
*/
setlocale(LC_NUMERIC, "C");
- alias->scale = strtod(scale, NULL);
+ *sval = strtod(scale, end);
+out:
/* restore locale */
setlocale(LC_NUMERIC, lc);
-
free(lc);
+ return ret;
+}
+
+static int perf_pmu__parse_scale(struct perf_pmu_alias *alias, char *dir, char *name)
+{
+ struct stat st;
+ ssize_t sret;
+ char scale[128];
+ int fd, ret = -1;
+ char path[PATH_MAX];
+
+ snprintf(path, PATH_MAX, "%s/%s.scale", dir, name);
+
+ fd = open(path, O_RDONLY);
+ if (fd == -1)
+ return -1;
+
+ if (fstat(fd, &st) < 0)
+ goto error;
+
+ sret = read(fd, scale, sizeof(scale)-1);
+ if (sret < 0)
+ goto error;
+
+ if (scale[sret - 1] == '\n')
+ scale[sret - 1] = '\0';
+ else
+ scale[sret] = '\0';
- ret = 0;
+ ret = convert_scale(scale, NULL, &alias->scale);
error:
close(fd);
return ret;
next prev parent reply other threads:[~2017-01-18 9:45 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-03 15:08 Support Intel uncore event lists v4 Andi Kleen
2017-01-03 15:08 ` [PATCH 01/11] perf, tools: Factor out scale conversion code Andi Kleen
2017-01-08 18:57 ` Jiri Olsa
2017-01-08 18:57 ` Jiri Olsa
2017-01-12 13:31 ` Arnaldo Carvalho de Melo
2017-01-12 18:07 ` Arnaldo Carvalho de Melo
2017-01-18 9:19 ` tip-bot for Andi Kleen [this message]
2017-01-03 15:08 ` [PATCH 02/11] perf, tools: Parse eventcode as number in jevents Andi Kleen
2017-01-08 18:57 ` Jiri Olsa
2017-01-10 1:10 ` Andi Kleen
2017-01-18 11:56 ` Jiri Olsa
2017-01-03 15:08 ` [PATCH 03/11] perf, tools: Add support for parsing uncore json files Andi Kleen
2017-01-08 18:58 ` Jiri Olsa
2017-01-12 13:32 ` Arnaldo Carvalho de Melo
2017-01-08 19:00 ` Jiri Olsa
2017-01-03 15:08 ` [PATCH 04/11] perf, tools: Support per pmu json aliases Andi Kleen
2017-01-18 11:58 ` Jiri Olsa
2017-01-19 0:17 ` Andi Kleen
2017-01-19 10:42 ` Jiri Olsa
2017-01-03 15:08 ` [PATCH 05/11] perf, tools: Support event aliases for non cpu// pmus Andi Kleen
2017-01-18 12:10 ` Jiri Olsa
2017-01-03 15:08 ` [PATCH 06/11] perf, tools: Add debug support for outputing alias string Andi Kleen
2017-01-18 12:16 ` Jiri Olsa
2017-01-18 15:45 ` Andi Kleen
2017-01-18 16:18 ` Jiri Olsa
2017-01-18 12:16 ` Jiri Olsa
2017-01-03 15:08 ` [PATCH 07/11] perf, tools: Collapse identically named events in perf stat Andi Kleen
2017-01-18 12:44 ` Jiri Olsa
2017-01-18 16:31 ` Andi Kleen
2017-01-18 16:56 ` Jiri Olsa
2017-01-18 17:28 ` Andi Kleen
2017-01-03 15:08 ` [PATCH 08/11] perf, tools: Expand PMU events by prefix match Andi Kleen
2017-01-03 15:08 ` [PATCH 09/11] perf, tools: Add a simple expression parser for JSON Andi Kleen
2017-01-03 15:08 ` [PATCH 10/11] perf, tools: Support MetricExpr header in JSON event list Andi Kleen
2017-01-03 15:08 ` [PATCH 11/11] perf, tools, stat: Output JSON MetricExpr metric 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=tip-d02fc6bcd53721cf8588633409157c232f2418e0@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/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).