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

perf expr: Add expr_ prefix for parse_ctx and parse_id

Browse Source 
Adding expr_ prefix for parse_ctx and parse_id, to straighten out the
expr* namespace.

There's no functional change.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Anju T Sudhakar <anju@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Joe Mario <jmario@redhat.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linuxppc-dev@lists.ozlabs.org
Link: http://lore.kernel.org/lkml/20200401203340.31402-2-kjain@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2020-04-02 02:03:34 +05:30 committed by Arnaldo Carvalho de Melo
parent 04ed4ccb9c
commit aecce63e2b
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/tests/expr.c
View File

@ -6,7 +6,7 @@
#include <string.h> #include <string.h>
#include <linux/zalloc.h> #include <linux/zalloc.h>
static int test(struct parse_ctx *ctx, const char *e, double val2) static int test(struct expr_parse_ctx *ctx, const char *e, double val2)
{ {
double val; double val;
@ -22,7 +22,7 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)
const char **other; const char **other;
double val; double val;
int i, ret; int i, ret;
struct parse_ctx ctx; struct expr_parse_ctx ctx;
int num_other; int num_other;
expr__ctx_init(&ctx); expr__ctx_init(&ctx);

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

@ -11,7 +11,7 @@ extern int expr_debug;
#endif #endif
/* Caller must make sure id is allocated */ /* Caller must make sure id is allocated */
void expr__add_id(struct parse_ctx *ctx, const char *name, double val) void expr__add_id(struct expr_parse_ctx *ctx, const char *name, double val)
{ {
int idx; int idx;
@ -21,13 +21,13 @@ void expr__add_id(struct parse_ctx *ctx, const char *name, double val)
ctx->ids[idx].val = val; ctx->ids[idx].val = val;
} }
void expr__ctx_init(struct parse_ctx *ctx) void expr__ctx_init(struct expr_parse_ctx *ctx)
{ {
ctx->num_ids = 0; ctx->num_ids = 0;
} }
static int static int
__expr__parse(double *val, struct parse_ctx *ctx, const char *expr, __expr__parse(double *val, struct expr_parse_ctx *ctx, const char *expr,
int start) int start)
{ {
YY_BUFFER_STATE buffer; YY_BUFFER_STATE buffer;
@ -52,7 +52,7 @@ __expr__parse(double *val, struct parse_ctx *ctx, const char *expr,
return ret; return ret;
} }
int expr__parse(double *final_val, struct parse_ctx *ctx, const char *expr) int expr__parse(double *final_val, struct expr_parse_ctx *ctx, const char *expr)
{ {
return __expr__parse(final_val, ctx, expr, EXPR_PARSE) ? -1 : 0; return __expr__parse(final_val, ctx, expr, EXPR_PARSE) ? -1 : 0;
} }
@ -75,7 +75,7 @@ int expr__find_other(const char *expr, const char *one, const char ***other,
int *num_other) int *num_other)
{ {
int err, i = 0, j = 0; int err, i = 0, j = 0;
struct parse_ctx ctx; struct expr_parse_ctx ctx;
expr__ctx_init(&ctx); expr__ctx_init(&ctx);
err = __expr__parse(NULL, &ctx, expr, EXPR_OTHER); err = __expr__parse(NULL, &ctx, expr, EXPR_OTHER);

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

@ -5,19 +5,19 @@
#define EXPR_MAX_OTHER 20 #define EXPR_MAX_OTHER 20
#define MAX_PARSE_ID EXPR_MAX_OTHER #define MAX_PARSE_ID EXPR_MAX_OTHER
struct parse_id { struct expr_parse_id {
const char *name; const char *name;
double val; double val;
}; };
struct parse_ctx { struct expr_parse_ctx {
int num_ids; int num_ids;
struct parse_id ids[MAX_PARSE_ID]; struct expr_parse_id ids[MAX_PARSE_ID];
}; };
void expr__ctx_init(struct parse_ctx *ctx); void expr__ctx_init(struct expr_parse_ctx *ctx);
void expr__add_id(struct parse_ctx *ctx, const char *id, double val); void expr__add_id(struct expr_parse_ctx *ctx, const char *id, double val);
int expr__parse(double *final_val, struct parse_ctx *ctx, const char *expr); int expr__parse(double *final_val, struct expr_parse_ctx *ctx, const char *expr);
int expr__find_other(const char *expr, const char *one, const char ***other, int expr__find_other(const char *expr, const char *one, const char ***other,
int *num_other); int *num_other);

6
tools/perf/util/expr.y
View File

@ -15,7 +15,7 @@
%define api.pure full %define api.pure full
%parse-param { double *final_val } %parse-param { double *final_val }
%parse-param { struct parse_ctx *ctx } %parse-param { struct expr_parse_ctx *ctx }
%parse-param {void *scanner} %parse-param {void *scanner}
%lex-param {void* scanner} %lex-param {void* scanner}
@ -39,14 +39,14 @@
%{ %{
static void expr_error(double *final_val __maybe_unused, static void expr_error(double *final_val __maybe_unused,
struct parse_ctx *ctx __maybe_unused, struct expr_parse_ctx *ctx __maybe_unused,
void *scanner, void *scanner,
const char *s) const char *s)
{ {
pr_debug("%s\n", s); pr_debug("%s\n", s);
} }
static int lookup_id(struct parse_ctx *ctx, char *id, double *val) static int lookup_id(struct expr_parse_ctx *ctx, char *id, double *val)
{ {
int i; int i;

2
tools/perf/util/stat-shadow.c
View File

@ -729,7 +729,7 @@ static void generic_metric(struct perf_stat_config *config,
struct runtime_stat *st) struct runtime_stat *st)
{ {
print_metric_t print_metric = out->print_metric; print_metric_t print_metric = out->print_metric;
struct parse_ctx pctx; struct expr_parse_ctx pctx;
double ratio, scale; double ratio, scale;
int i; int i;
void *ctxp = out->ctx; void *ctxp = out->ctx;