mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
perf metric: Rename expr__add_id() to expr__add_val()
Rename expr__add_id() to expr__add_val() so we can use expr__add_id() to actually add just the id without any value in following changes. There's no functional change. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Acked-by: Ian Rogers <irogers@google.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@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: Paul Clarke <pc@us.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lore.kernel.org/lkml/20200712132634.138901-2-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
3de2bf9dfb
commit
2c46f54249
6 changed files with 9 additions and 9 deletions
|
@ -24,8 +24,8 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
|
|||
struct expr_parse_ctx ctx;
|
||||
|
||||
expr__ctx_init(&ctx);
|
||||
expr__add_id(&ctx, strdup("FOO"), 1);
|
||||
expr__add_id(&ctx, strdup("BAR"), 2);
|
||||
expr__add_id_val(&ctx, strdup("FOO"), 1);
|
||||
expr__add_id_val(&ctx, strdup("BAR"), 2);
|
||||
|
||||
ret = test(&ctx, "1+1", 2);
|
||||
ret |= test(&ctx, "FOO+BAR", 3);
|
||||
|
|
|
@ -492,7 +492,7 @@ static int test_parsing(void)
|
|||
*/
|
||||
k = 1;
|
||||
hashmap__for_each_entry((&ctx.ids), cur, bkt)
|
||||
expr__add_id(&ctx, strdup(cur->key), k++);
|
||||
expr__add_id_val(&ctx, strdup(cur->key), k++);
|
||||
|
||||
hashmap__for_each_entry((&ctx.ids), cur, bkt) {
|
||||
if (check_parse_cpu(cur->key, map == cpus_map,
|
||||
|
@ -547,7 +547,7 @@ static int metric_parse_fake(const char *str)
|
|||
*/
|
||||
i = 1;
|
||||
hashmap__for_each_entry((&ctx.ids), cur, bkt)
|
||||
expr__add_id(&ctx, strdup(cur->key), i++);
|
||||
expr__add_id_val(&ctx, strdup(cur->key), i++);
|
||||
|
||||
hashmap__for_each_entry((&ctx.ids), cur, bkt) {
|
||||
if (check_parse_fake(cur->key)) {
|
||||
|
|
|
@ -33,7 +33,7 @@ static bool key_equal(const void *key1, const void *key2,
|
|||
}
|
||||
|
||||
/* Caller must make sure id is allocated */
|
||||
int expr__add_id(struct expr_parse_ctx *ctx, const char *name, double val)
|
||||
int expr__add_id_val(struct expr_parse_ctx *ctx, const char *name, double val)
|
||||
{
|
||||
double *val_ptr = NULL, *old_val = NULL;
|
||||
char *old_key = NULL;
|
||||
|
|
|
@ -22,7 +22,7 @@ struct expr_scanner_ctx {
|
|||
|
||||
void expr__ctx_init(struct expr_parse_ctx *ctx);
|
||||
void expr__ctx_clear(struct expr_parse_ctx *ctx);
|
||||
int expr__add_id(struct expr_parse_ctx *ctx, const char *id, double val);
|
||||
int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val);
|
||||
int expr__get_id(struct expr_parse_ctx *ctx, const char *id, double *val_ptr);
|
||||
int expr__parse(double *final_val, struct expr_parse_ctx *ctx,
|
||||
const char *expr, int runtime);
|
||||
|
|
|
@ -69,7 +69,7 @@ all_other: all_other other
|
|||
|
||||
other: ID
|
||||
{
|
||||
expr__add_id(ctx, $1, 0.0);
|
||||
expr__add_id_val(ctx, $1, 0.0);
|
||||
}
|
||||
|
|
||||
MIN | MAX | IF | ELSE | SMT_ON | NUMBER | '|' | '^' | '&' | '-' | '+' | '*' | '/' | '%' | '(' | ')' | ','
|
||||
|
|
|
@ -773,9 +773,9 @@ static int prepare_metric(struct evsel **metric_events,
|
|||
*pn = 0;
|
||||
|
||||
if (metric_total)
|
||||
expr__add_id(pctx, n, metric_total);
|
||||
expr__add_id_val(pctx, n, metric_total);
|
||||
else
|
||||
expr__add_id(pctx, n, avg_stats(stats)*scale);
|
||||
expr__add_id_val(pctx, n, avg_stats(stats)*scale);
|
||||
}
|
||||
|
||||
return i;
|
||||
|
|
Loading…
Reference in a new issue