mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

perf expr: Straighten expr__parse()/expr__find_other() interface

Browse source 
Now that we have a flex parser we don't need to update the parsed string
pointer, so the interface can just be passed the pointer to the
expression instead of a pointer to pointer.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Link: http://lore.kernel.org/lkml/20200228093616.67125-5-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2020-02-28 10:36:15 +01:00 committed by Arnaldo Carvalho de Melo
parent 58ca707636
commit 0f9b1e124b
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/perf/tests/expr.c
View file

@ -10,7 +10,7 @@ static int test(struct parse_ctx *ctx, const char *e, double val2)
{
double val;
if (expr__parse(&val, ctx, &e))
if (expr__parse(&val, ctx, e))
TEST_ASSERT_VAL("parse test failed", 0);
TEST_ASSERT_VAL("unexpected value", val == val2);
return 0;
@ -44,11 +44,11 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
return ret;
p = "FOO/0";
ret = expr__parse(&val, &ctx, &p);
ret = expr__parse(&val, &ctx, p);
TEST_ASSERT_VAL("division by zero", ret == 1);
p = "BAR/";
ret = expr__parse(&val, &ctx, &p);
ret = expr__parse(&val, &ctx, p);
TEST_ASSERT_VAL("missing operand", ret == 1);
TEST_ASSERT_VAL("find other",

8
tools/perf/util/expr.c
View file

@ -52,9 +52,9 @@ __expr__parse(double *val, struct parse_ctx *ctx, const char *expr,
return ret;
}
int expr__parse(double *final_val, struct parse_ctx *ctx, const char **pp)
int expr__parse(double *final_val, struct parse_ctx *ctx, const char *expr)
{
return __expr__parse(final_val, ctx, *pp, EXPR_PARSE);
return __expr__parse(final_val, ctx, expr, EXPR_PARSE);
}
static bool
@ -71,14 +71,14 @@ already_seen(const char *val, const char *one, const char **other,
return false;
}
int expr__find_other(const char *p, const char *one, const char ***other,
int expr__find_other(const char *expr, const char *one, const char ***other,
int *num_other)
{
int err, i = 0, j = 0;
struct parse_ctx ctx;
expr__ctx_init(&ctx);
err = __expr__parse(NULL, &ctx, p, EXPR_OTHER);
err = __expr__parse(NULL, &ctx, expr, EXPR_OTHER);
if (err)
return -1;

4
tools/perf/util/expr.h
View file

@ -17,8 +17,8 @@ struct parse_ctx {
void expr__ctx_init(struct parse_ctx *ctx);
void expr__add_id(struct parse_ctx *ctx, const char *id, double val);
int expr__parse(double *final_val, struct parse_ctx *ctx, const char **pp);
int expr__find_other(const char *p, const char *one, const char ***other,
int expr__parse(double *final_val, struct parse_ctx *ctx, const char *expr);
int expr__find_other(const char *expr, const char *one, const char ***other,
int *num_other);
#endif

4
tools/perf/util/stat-shadow.c
View file

@ -777,9 +777,7 @@ static void generic_metric(struct perf_stat_config *config,
}
if (!metric_events[i]) {
const char *p = metric_expr;
if (expr__parse(&ratio, &pctx, &p) == 0) {
if (expr__parse(&ratio, &pctx, metric_expr) == 0) {
char *unit;
char metric_bf[64];