fa831fbb43
The runtime value is needed when recursively parsing metrics, currently a value of 1 is passed which is incorrect. Rather than add more arguments to the bison parser, add runtime to the context. Fix call sites not to pass a value. The runtime value is defaulted to 0, which is arbitrary. In some places this replaces a value of 1, which was also arbitrary. This shouldn't affect anything other than PPC. The use of 0 or 1 shouldn't matter as a proper runtime value would be needed in a case that it did matter. Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Andi Kleen <ak@linux.intel.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Antonov <alexander.antonov@linux.intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andrew Kilroy <andrew.kilroy@arm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Changbin Du <changbin.du@intel.com> Cc: Denys Zagorui <dzagorui@cisco.com> Cc: Fabian Hemmer <copy@copy.sh> Cc: Felix Fietkau <nbd@nbd.name> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jacob Keller <jacob.e.keller@intel.com> Cc: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Joakim Zhang <qiangqing.zhang@nxp.com> Cc: John Garry <john.garry@huawei.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Kees Kook <keescook@chromium.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Nicholas Fraser <nfraser@codeweavers.com> Cc: Nick Desaulniers <ndesaulniers@google.com> Cc: Paul Clarke <pc@us.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Riccardo Mancini <rickyman7@gmail.com> Cc: Sami Tolvanen <samitolvanen@google.com> Cc: ShihCheng Tu <mrtoastcheng@gmail.com> Cc: Song Liu <songliubraving@fb.com> Cc: Stephane Eranian <eranian@google.com> Cc: Sumanth Korikkar <sumanthk@linux.ibm.com> Cc: Thomas Richter <tmricht@linux.ibm.com> Cc: Wan Jiabing <wanjiabing@vivo.com> Cc: Zhen Lei <thunder.leizhen@huawei.com> Link: https://lore.kernel.org/r/20211015172132.1162559-6-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
65 lines
1.8 KiB
C
65 lines
1.8 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 unconditionally, 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;
|
|
int runtime;
|
|
};
|
|
|
|
struct expr_id_data;
|
|
|
|
struct expr_scanner_ctx {
|
|
int runtime;
|
|
};
|
|
|
|
struct hashmap *ids__new(void);
|
|
void ids__free(struct hashmap *ids);
|
|
int ids__insert(struct hashmap *ids, const char *id, struct expr_id *parent);
|
|
/*
|
|
* Union two sets of ids (hashmaps) and construct a third, freeing ids1 and
|
|
* ids2.
|
|
*/
|
|
struct hashmap *ids__union(struct hashmap *ids1, struct hashmap *ids2);
|
|
|
|
struct expr_parse_ctx *expr__ctx_new(void);
|
|
void expr__ctx_clear(struct expr_parse_ctx *ctx);
|
|
void expr__ctx_free(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 expr__find_ids(const char *expr, const char *one,
|
|
struct expr_parse_ctx *ids);
|
|
|
|
double expr_id_data__value(const struct expr_id_data *data);
|
|
struct expr_id *expr_id_data__parent(struct expr_id_data *data);
|
|
|
|
#endif
|