Commit 871f9f59 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf expr: Add expr_scanner_ctx object 



Add the expr_scanner_ctx object to hold user data for the expr scanner.
Currently it holds only start_token, Kajol Jain will use it to hold 24x7
runtime param.

Signed-off-by: default avatarJiri 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-3-kjain@linux.ibm.com


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

tools/perf/util/expr.c

+4 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
#include <assert.h>

#include "expr.h"

#include "expr-bison.h"

#define YY_EXTRA_TYPE int

#include "expr-flex.h"



#ifdef PARSER_DEBUG
@@ -30,11 +29,14 @@ static int 
__expr__parse(double *val, struct expr_parse_ctx *ctx, const char *expr,

	      int start)

{

	struct expr_scanner_ctx scanner_ctx = {

		.start_token = start,

	};

	YY_BUFFER_STATE buffer;

	void *scanner;

	int ret;



	ret = expr_lex_init_extra(start, &scanner);

	ret = expr_lex_init_extra(&scanner_ctx, &scanner);

	if (ret)

		return ret;

tools/perf/util/expr.h

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ struct expr_parse_ctx { 
	struct expr_parse_id ids[MAX_PARSE_ID];

};



struct expr_scanner_ctx {

	int start_token;

};



void expr__ctx_init(struct expr_parse_ctx *ctx);

void expr__add_id(struct expr_parse_ctx *ctx, const char *id, double val);

int expr__parse(double *final_val, struct expr_parse_ctx *ctx, const char *expr);

tools/perf/util/expr.l

+5 −5
Original line number Diff line number Diff line
@@ -76,13 +76,13 @@ sym [0-9a-zA-Z_\.:@]+ 
symbol		{spec}*{sym}*{spec}*{sym}*



%%

	{

		int start_token;

	struct expr_scanner_ctx *sctx = expr_get_extra(yyscanner);



		start_token = expr_get_extra(yyscanner);

	{

		int start_token = sctx->start_token;



		if (start_token) {

			expr_set_extra(NULL, yyscanner);

		if (sctx->start_token) {

			sctx->start_token = 0;

			return start_token;

		}

	}