forked from Minki/linux
f6fb0960f9
Keeping the stack of nested metrics via 'struct expr_id' objects
and checking if we are in recursion via already processed metric.
The stack is implemented as static array within the struct egroup
with 100 entries, which should be enough nesting depth for any
metric we have or plan to have at the moment.
Adding test that simulates the recursion and checks we can
detect it.
Committer notes:
Bumped RECURSION_ID_MAX to 1000 as per Jiri's reply to Paul Clark on the
patch series e-mail discussion.
Fixed these:
tests/parse-metric.c:308:7: error: missing field 'val' initializer [-Werror,-Wmissing-field-initializers]
{ 0 },
^
util/metricgroup.c:924:28: error: missing field 'parent' initializer [-Werror,-Wmissing-field-initializers]
struct expr_ids ids = { 0 };
^
util/metricgroup.c:924:26: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
struct expr_ids ids = { 0 };
^
{}
util/metricgroup.c:924:26: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
struct expr_ids ids = { 0 };
^
{}
util/metricgroup.c:924:28: error: missing field 'cnt' initializer [-Werror,-Wmissing-field-initializers]
struct expr_ids ids = { 0 };
^
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-16-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
61 lines
1.5 KiB
C
61 lines
1.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef PARSE_CTX_H
|
|
#define PARSE_CTX_H 1
|
|
|
|
// There are fixes that need to land upstream before we can use libbpf's headers,
|
|
// for now use our copy uncoditionally, since the data structures at this point
|
|
// are exactly the same, no problem.
|
|
//#ifdef HAVE_LIBBPF_SUPPORT
|
|
//#include <bpf/hashmap.h>
|
|
//#else
|
|
#include "util/hashmap.h"
|
|
//#endif
|
|
|
|
struct metric_ref;
|
|
|
|
struct expr_id {
|
|
char *id;
|
|
struct expr_id *parent;
|
|
};
|
|
|
|
struct expr_parse_ctx {
|
|
struct hashmap ids;
|
|
struct expr_id *parent;
|
|
};
|
|
|
|
struct expr_id_data {
|
|
union {
|
|
double val;
|
|
struct {
|
|
const char *metric_name;
|
|
const char *metric_expr;
|
|
bool counted;
|
|
} ref;
|
|
struct expr_id *parent;
|
|
};
|
|
|
|
bool is_ref;
|
|
};
|
|
|
|
struct expr_scanner_ctx {
|
|
int start_token;
|
|
int runtime;
|
|
};
|
|
|
|
void expr__ctx_init(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_val(struct expr_parse_ctx *ctx, const char *id, double val);
|
|
int expr__add_ref(struct expr_parse_ctx *ctx, struct metric_ref *ref);
|
|
int expr__get_id(struct expr_parse_ctx *ctx, const char *id,
|
|
struct expr_id_data **data);
|
|
int expr__resolve_id(struct expr_parse_ctx *ctx, const char *id,
|
|
struct expr_id_data **datap);
|
|
int expr__parse(double *final_val, struct expr_parse_ctx *ctx,
|
|
const char *expr, int runtime);
|
|
int expr__find_other(const char *expr, const char *one,
|
|
struct expr_parse_ctx *ids, int runtime);
|
|
|
|
#endif
|