Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1634e460 authored by Tzvetomir Stoyanov (VMware)'s avatar Tzvetomir Stoyanov (VMware) Committed by Arnaldo Carvalho de Melo
Browse files

tools lib traceevent: Rename internal parser related APIs 



In order to make libtraceevent into a proper library, variables, data
structures and functions require a unique prefix to prevent name space
conflicts. That prefix will be "tep_" and not "pevent_". This changes
APIs: pevent_buffer_init, pevent_read_token, pevent_free_token,
pevent_peek_char, pevent_get_input_buf, pevent_get_input_buf_ptr

Signed-off-by: default avatarTzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lkml.kernel.org/r/20180808180703.275281085@goodmis.org


Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 413af01c

tools/lib/traceevent/event-parse.c

+12 −12
Original line number Diff line number Diff line
@@ -73,12 +73,12 @@ static void init_input_buf(const char *buf, unsigned long long size) 
	input_buf_ptr = 0;

}



const char *pevent_get_input_buf(void)

const char *tep_get_input_buf(void)

{

	return input_buf;

}



unsigned long long pevent_get_input_buf_ptr(void)

unsigned long long tep_get_input_buf_ptr(void)

{

	return input_buf_ptr;

}
@@ -113,14 +113,14 @@ process_defined_func(struct trace_seq *s, void *data, int size, 
static void free_func_handle(struct tep_function_handler *func);



/**

 * pevent_buffer_init - init buffer for parsing

 * tep_buffer_init - init buffer for parsing

 * @buf: buffer to parse

 * @size: the size of the buffer

 *

 * For use with pevent_read_token(), this initializes the internal

 * buffer that pevent_read_token() will parse.

 * For use with tep_read_token(), this initializes the internal

 * buffer that tep_read_token() will parse.

 */

void pevent_buffer_init(const char *buf, unsigned long long size)

void tep_buffer_init(const char *buf, unsigned long long size)

{

	init_input_buf(buf, size);

}
@@ -913,11 +913,11 @@ static int __peek_char(void) 
}



/**

 * pevent_peek_char - peek at the next character that will be read

 * tep_peek_char - peek at the next character that will be read

 *

 * Returns the next character read, or -1 if end of buffer.

 */

int pevent_peek_char(void)

int tep_peek_char(void)

{

	return __peek_char();

}
@@ -1157,7 +1157,7 @@ static enum event_type read_token(char **tok) 
}



/**

 * pevent_read_token - access to utilites to use the pevent parser

 * tep_read_token - access to utilites to use the pevent parser

 * @tok: The token to return

 *

 * This will parse tokens from the string given by
@@ -1165,16 +1165,16 @@ static enum event_type read_token(char **tok) 
 *

 * Returns the token type.

 */

enum event_type pevent_read_token(char **tok)

enum event_type tep_read_token(char **tok)

{

	return read_token(tok);

}



/**

 * pevent_free_token - free a token returned by pevent_read_token

 * tep_free_token - free a token returned by tep_read_token

 * @token: the token to free

 */

void pevent_free_token(char *token)

void tep_free_token(char *token)

{

	free_token(token);

}

tools/lib/traceevent/event-parse.h

+6 −6
Original line number Diff line number Diff line
@@ -797,12 +797,12 @@ void pevent_ref(struct tep_handle *pevent); 
void pevent_unref(struct tep_handle *pevent);



/* access to the internal parser */

void pevent_buffer_init(const char *buf, unsigned long long size);

enum event_type pevent_read_token(char **tok);

void pevent_free_token(char *token);

int pevent_peek_char(void);

const char *pevent_get_input_buf(void);

unsigned long long pevent_get_input_buf_ptr(void);

void tep_buffer_init(const char *buf, unsigned long long size);

enum event_type tep_read_token(char **tok);

void tep_free_token(char *token);

int tep_peek_char(void);

const char *tep_get_input_buf(void);

unsigned long long tep_get_input_buf_ptr(void);



/* for debugging */

void tep_print_funcs(struct tep_handle *pevent);

tools/lib/traceevent/parse-filter.c

+8 −8
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ static void show_error(char *error_buf, const char *fmt, ...) 
	int len;

	int i;



	input = pevent_get_input_buf();

	index = pevent_get_input_buf_ptr();

	input = tep_get_input_buf();

	index = tep_get_input_buf_ptr();

	len = input ? strlen(input) : 0;



	if (len) {
@@ -72,7 +72,7 @@ static void show_error(char *error_buf, const char *fmt, ...) 


static void free_token(char *token)

{

	pevent_free_token(token);

	tep_free_token(token);

}



static enum event_type read_token(char **tok)
@@ -82,13 +82,13 @@ static enum event_type read_token(char **tok) 


	do {

		free_token(token);

		type = pevent_read_token(&token);

		type = tep_read_token(&token);

	} while (type == EVENT_NEWLINE || type == EVENT_SPACE);



	/* If token is = or ! check to see if the next char is ~ */

	if (token &&

	    (strcmp(token, "=") == 0 || strcmp(token, "!") == 0) &&

	    pevent_peek_char() == '~') {

	    tep_peek_char() == '~') {

		/* append it */

		*tok = malloc(3);

		if (*tok == NULL) {
@@ -98,7 +98,7 @@ static enum event_type read_token(char **tok) 
		sprintf(*tok, "%c%c", *token, '~');

		free_token(token);

		/* Now remove the '~' from the buffer */

		pevent_read_token(&token);

		tep_read_token(&token);

		free_token(token);

	} else

		*tok = token;
@@ -1198,7 +1198,7 @@ process_event(struct event_format *event, const char *filter_str, 
{

	int ret;



	pevent_buffer_init(filter_str, strlen(filter_str));

	tep_buffer_init(filter_str, strlen(filter_str));



	ret = process_filter(event, parg, error_str, 0);

	if (ret < 0)
@@ -1254,7 +1254,7 @@ filter_event(struct event_filter *filter, struct event_format *event, 
static void filter_init_error_buf(struct event_filter *filter)

{

	/* clear buffer to reset show error */

	pevent_buffer_init("", 0);

	tep_buffer_init("", 0);

	filter->error_buffer[0] = '\0';

}