Commit 070b3b5a authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf metric: Add 'struct expr_id_data' to keep expr value 



Add 'struct expr_id_data' to keep an expr value instead of just a simple
double pointer, so we can store more data for ID in the following
changes.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
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: 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-3-jolsa@kernel.org


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

tools/perf/tests/expr.c

+2 −1
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ static int test(struct expr_parse_ctx *ctx, const char *e, double val2) 


int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)

{

	struct expr_id_data *val_ptr;

	const char *p;

	double val, *val_ptr;

	double val;

	int ret;

	struct expr_parse_ctx ctx;

tools/perf/util/expr.c

+11 −11
Original line number Diff line number Diff line
@@ -33,32 +33,32 @@ static bool key_equal(const void *key1, const void *key2, 
}



/* Caller must make sure id is allocated */

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

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

{

	double *val_ptr = NULL, *old_val = NULL;

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

	char *old_key = NULL;

	int ret;



	if (val != 0.0) {

		val_ptr = malloc(sizeof(double));

		if (!val_ptr)

		data_ptr = malloc(sizeof(*data_ptr));

		if (!data_ptr)

			return -ENOMEM;

		*val_ptr = val;

		data_ptr->val = val;

	}

	ret = hashmap__set(&ctx->ids, name, val_ptr,

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

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

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

	free(old_key);

	free(old_val);

	free(old_data);

	return ret;

}



int expr__get_id(struct expr_parse_ctx *ctx, const char *id, double *val_ptr)

{

	double *data;

	struct expr_id_data *data;



	if (!hashmap__find(&ctx->ids, id, (void **)&data))

		return -1;

	*val_ptr = (data == NULL) ?  0.0 : *data;

	*val_ptr = (data == NULL) ?  0.0 : data->val;

	return 0;

}
@@ -119,7 +119,7 @@ int expr__parse(double *final_val, struct expr_parse_ctx *ctx, 
int expr__find_other(const char *expr, const char *one,

		     struct expr_parse_ctx *ctx, int runtime)

{

	double *old_val = NULL;

	struct expr_id_data *old_val = NULL;

	char *old_key = NULL;

	int ret = __expr__parse(NULL, ctx, expr, EXPR_OTHER, runtime);

tools/perf/util/expr.h

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ struct expr_parse_ctx { 
	struct hashmap ids;

};



struct expr_id_data {

	double	val;

};



struct expr_scanner_ctx {

	int start_token;

	int runtime;

tools/perf/util/metricgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static struct evsel *find_evsel_group(struct evlist *perf_evlist, 
				      unsigned long *evlist_used)

{

	struct evsel *ev, *current_leader = NULL;

	double *val_ptr;

	struct expr_id_data *val_ptr;

	int i = 0, matched_events = 0, events_to_match;

	const int idnum = (int)hashmap__size(&pctx->ids);

CRA Git | Maintained and supported by SUSTech CRA and CCSE