2014-06-13 (금), 00:08 +0200, Jiri Olsa:
> From: Jiri Olsa <jo...@redhat.com>
>
> Adding perf_config_u64 function to be able to parse
> 'llong' values out of config file.
>
> Cc: Arnaldo Carvalho de Melo <a...@kernel.org>
> Cc: Corey Ashford <cjash...@linux.vnet.ibm.com>
> Cc: David Ahern <dsah...@gmail.com>
> Cc: Frederic Weisbecker <fweis...@gmail.com>
> Cc: Ingo Molnar <mi...@kernel.org>
> Cc: Jean Pihet <jean.pi...@linaro.org>
> Cc: Namhyung Kim <namhy...@kernel.org>
> Cc: Paul Mackerras <pau...@samba.org>
> Cc: Peter Zijlstra <a.p.zijls...@chello.nl>
> Signed-off-by: Jiri Olsa <jo...@kernel.org>
> ---
> tools/perf/util/cache.h | 1 +
> tools/perf/util/config.c | 22 ++++++++++++++++++++++
> 2 files changed, 23 insertions(+)
>
> diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
> index 7b176dd..5cf9e1b 100644
> --- a/tools/perf/util/cache.h
> +++ b/tools/perf/util/cache.h
> @@ -22,6 +22,7 @@ typedef int (*config_fn_t)(const char *, const char *, void
> *);
> extern int perf_default_config(const char *, const char *, void *);
> extern int perf_config(config_fn_t fn, void *);
> extern int perf_config_int(const char *, const char *);
> +extern u64 perf_config_u64(const char *, const char *);
> extern int perf_config_bool(const char *, const char *);
> extern int config_error_nonbool(const char *);
> extern const char *perf_config_dirname(const char *, const char *);
> diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
> index 24519e1..e68bbe3 100644
> --- a/tools/perf/util/config.c
> +++ b/tools/perf/util/config.c
> @@ -286,6 +286,20 @@ static int parse_unit_factor(const char *end, unsigned
> long *val)
> return 0;
> }
>
> +static int perf_parse_llong(const char *value, long long *ret)
> +{
> + if (value && *value) {
> + char *end;
> + long val = strtoll(value, &end, 0);
Why not declare the val as long long?
> + unsigned long factor = 1;
Also please add a blank line between declaration and actual body.
Thanks,
Namhyung
> + if (!parse_unit_factor(end, &factor))
> + return 0;
> + *ret = val * factor;
> + return 1;
> + }
> + return 0;
> +}
> +
> static int perf_parse_long(const char *value, long *ret)
> {
> if (value && *value) {
> @@ -307,6 +321,14 @@ static void die_bad_config(const char *name)
> die("bad config value for '%s'", name);
> }
>
> +u64 perf_config_u64(const char *name, const char *value)
> +{
> + long long ret = 0;
> + if (!perf_parse_llong(value, &ret))
> + die_bad_config(name);
> + return (u64) ret;
> +}
> +
> int perf_config_int(const char *name, const char *value)
> {
> long ret = 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
