iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf metric: Add expr__del_id function

Browse Source 
Adding expr__del_id function to remove ID from hashmap.  It will save us
few lines in following changes.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Reviewed-by: Kajol Jain <kjain@linux.ibm.com>
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: 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/20200719181320.785305-5-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa
2020-07-19 20:13:05 +02:00
committed by Arnaldo Carvalho de Melo
parent 5c5f5e835f
commit 3fd29fa6c1
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,17 @@ int expr__get_id(struct expr_parse_ctx *ctx, const char *id,
return hashmap__find(&ctx->ids, id, (void **)data) ? 0 : -1; return hashmap__find(&ctx->ids, id, (void **)data) ? 0 : -1;
} }
void expr__del_id(struct expr_parse_ctx *ctx, const char *id)
{
struct expr_id_data *old_val = NULL;
char *old_key = NULL;
hashmap__delete(&ctx->ids, id,
(const void **)&old_key, (void **)&old_val);
free(old_key);
free(old_val);
}
void expr__ctx_init(struct expr_parse_ctx *ctx) void expr__ctx_init(struct expr_parse_ctx *ctx)
{ {
hashmap__init(&ctx->ids, key_hash, key_equal, NULL); hashmap__init(&ctx->ids, key_hash, key_equal, NULL);
@ -136,16 +147,10 @@ int expr__parse(double *final_val, struct expr_parse_ctx *ctx,
int expr__find_other(const char *expr, const char *one, int expr__find_other(const char *expr, const char *one,
struct expr_parse_ctx *ctx, int runtime) struct expr_parse_ctx *ctx, int runtime)
{ {
struct expr_id_data *old_val = NULL;
char *old_key = NULL;
int ret = __expr__parse(NULL, ctx, expr, EXPR_OTHER, runtime); int ret = __expr__parse(NULL, ctx, expr, EXPR_OTHER, runtime);
if (one) { if (one)
hashmap__delete(&ctx->ids, one, expr__del_id(ctx, one);
(const void **)&old_key, (void **)&old_val);
free(old_key);
free(old_val);
}
return ret; return ret;
} }

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

@ -26,6 +26,7 @@ struct expr_scanner_ctx {
void expr__ctx_init(struct expr_parse_ctx *ctx); void expr__ctx_init(struct expr_parse_ctx *ctx);
void expr__ctx_clear(struct expr_parse_ctx *ctx); void expr__ctx_clear(struct expr_parse_ctx *ctx);
void expr__del_id(struct expr_parse_ctx *ctx, const char *id);
int expr__add_id(struct expr_parse_ctx *ctx, const char *id); int expr__add_id(struct expr_parse_ctx *ctx, const char *id);
int expr__add_id_val(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, int expr__get_id(struct expr_parse_ctx *ctx, const char *id,