Commit 332603c2 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf metric: Add expr__add_id function 



Add the expr__add_id() function to data for ID with zero value, which is
used when scanning the expression for IDs.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Reviewed-by: default avatarKajol Jain <kjain@linux.ibm.com>
Acked-by: default avatarIan 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-3-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 60e10c00

tools/perf/util/expr.c

+25 −6
Original line number Diff line number Diff line
@@ -32,6 +32,26 @@ static bool key_equal(const void *key1, const void *key2, 
	return !strcmp((const char *)key1, (const char *)key2);

}



/* Caller must make sure id is allocated */

int expr__add_id(struct expr_parse_ctx *ctx, const char *id)

{

	struct expr_id_data *data_ptr = NULL, *old_data = NULL;

	char *old_key = NULL;

	int ret;



	data_ptr = malloc(sizeof(*data_ptr));

	if (!data_ptr)

		return -ENOMEM;



	ret = hashmap__set(&ctx->ids, id, data_ptr,

			   (const void **)&old_key, (void **)&old_data);

	if (ret)

		free(data_ptr);

	free(old_key);

	free(old_data);

	return ret;

}



/* Caller must make sure id is allocated */

int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val)

{
@@ -39,12 +59,11 @@ int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val) 
	char *old_key = NULL;

	int ret;



	if (val != 0.0) {

	data_ptr = malloc(sizeof(*data_ptr));

	if (!data_ptr)

		return -ENOMEM;

	data_ptr->val = val;

	}



	ret = hashmap__set(&ctx->ids, id, data_ptr,

			   (const void **)&old_key, (void **)&old_data);

	if (ret)

tools/perf/util/expr.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,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);

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,

tools/perf/util/expr.y

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ all_other: all_other other 


other: ID

{

	expr__add_id_val(ctx, $1, 0.0);

	expr__add_id(ctx, $1);

}

|

MIN | MAX | IF | ELSE | SMT_ON | NUMBER | '|' | '^' | '&' | '-' | '+' | '*' | '/' | '%' | '(' | ')' | ','