Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf expr: Move the scanner_ctx into the parse_ctx

Browse Source 
We currently maintain the two independently and copy from one to the
other. This is a burden when additional scanner context values are
necessary, so combine them.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Ahmad Yasin <ahmad.yasin@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Kshipra Bopardikar <kshipra.bopardikar@intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Miaoqian Lin <linmq006@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20220831174926.579643-3-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2022-08-31 10:49:21 -07:00 committed by Arnaldo Carvalho de Melo
parent 76ed5927ca
commit 1a6abdde13
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/tests/expr.c
View File

@ -133,7 +133,7 @@ static int test__expr(struct test_suite *t __maybe_unused, int subtest __maybe_u
(void **)&val_ptr));
expr__ctx_clear(ctx);
ctx->runtime = 3;
ctx->sctx.runtime = 3;
TEST_ASSERT_VAL("find ids",
expr__find_ids("EVENT1\\,param\\=?@ + EVENT2\\,param\\=?@",
NULL, ctx) == 0);

7
tools/perf/util/expr.c
View File

@ -310,7 +310,7 @@ struct expr_parse_ctx *expr__ctx_new(void)
free(ctx);
return NULL;
}
ctx->runtime = 0;
ctx->sctx.runtime = 0;
return ctx;
}
@ -344,16 +344,13 @@ static int
__expr__parse(double *val, struct expr_parse_ctx *ctx, const char *expr,
bool compute_ids)
{
struct expr_scanner_ctx scanner_ctx = {
.runtime = ctx->runtime,
};
YY_BUFFER_STATE buffer;
void *scanner;
int ret;
pr_debug2("parsing metric: %s\n", expr);
ret = expr_lex_init_extra(&scanner_ctx, &scanner);
ret = expr_lex_init_extra(&ctx->sctx, &scanner);
if (ret)
return ret;

14
tools/perf/util/expr.h
View File

@ -10,17 +10,17 @@
struct metric_ref;
struct expr_parse_ctx {
struct hashmap *ids;
int runtime;
};
struct expr_id_data;
struct expr_scanner_ctx {
int runtime;
};
struct expr_parse_ctx {
struct hashmap *ids;
struct expr_scanner_ctx sctx;
};
struct expr_id_data;
struct hashmap *ids__new(void);
void ids__free(struct hashmap *ids);
int ids__insert(struct hashmap *ids, const char *id);

4
tools/perf/util/metricgroup.c
View File

@ -215,7 +215,7 @@ static struct metric *metric__new(const struct pmu_event *pe,
}
m->metric_expr = pe->metric_expr;
m->metric_unit = pe->unit;
m->pctx->runtime = runtime;
m->pctx->sctx.runtime = runtime;
m->has_constraint = metric_no_group || metricgroup__has_constraint(pe);
m->metric_refs = NULL;
m->evlist = NULL;
@ -1626,7 +1626,7 @@ static int parse_groups(struct evlist *perf_evlist, const char *str,
}
expr->metric_unit = m->metric_unit;
expr->metric_events = metric_events;
expr->runtime = m->pctx->runtime;
expr->runtime = m->pctx->sctx.runtime;
list_add(&expr->nd, &me->head);
}

2
tools/perf/util/stat-shadow.c
View File

@ -911,7 +911,7 @@ static void generic_metric(struct perf_stat_config *config,
if (!pctx)
return;
pctx->runtime = runtime;
pctx->sctx.runtime = runtime;
i = prepare_metric(metric_events, metric_refs, pctx, cpu_map_idx, st);
if (i < 0) {
expr__ctx_free(pctx);