Skip to content

L
linux
Commit f25d9e09 authored by Tzvetomir Stoyanov (VMware)'s avatar Tzvetomir Stoyanov (VMware) Committed by Arnaldo Carvalho de Melo
Browse files
Options

tools lib traceevent: Rename enum event_{sort_}type to enum tep_event_{sort_}type 

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_". This renames enum event_type to
enum tep_event_type, enum event_sort_type to enum tep_event_sort_type
and add prefix TEP_ to all enum's members
Signed-off-by: default avatarTzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lkml.kernel.org/r/20180919185722.961022207@goodmis.orgSigned-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bb39ccb2
Hide whitespace changes
Inline Side-by-side
Showing with 279 additions and 279 deletions
tools/lib/traceevent/event-parse.c
View file @ f25d9e09
...@@ -770,12 +770,12 @@ static int add_event(struct tep_handle *pevent, struct tep_event_format *event) ...@@ -770,12 +770,12 @@ static int add_event(struct tep_handle *pevent, struct tep_event_format *event)
return 0; return 0;
} }
static int event_item_type(enum event_type type) static int event_item_type(enum tep_event_type type)
{ {
switch (type) { switch (type) {
case EVENT_ITEM ... EVENT_SQUOTE: case TEP_EVENT_ITEM ... TEP_EVENT_SQUOTE:
return 1; return 1;
case EVENT_ERROR ... EVENT_DELIM: case TEP_EVENT_ERROR ... TEP_EVENT_DELIM:
default: default:
return 0; return 0;
} }
...@@ -863,24 +863,24 @@ static void free_arg(struct print_arg *arg) ...@@ -863,24 +863,24 @@ static void free_arg(struct print_arg *arg)
free(arg); free(arg);
} }
static enum event_type get_type(int ch) static enum tep_event_type get_type(int ch)
{ {
if (ch == '\n') if (ch == '\n')
return EVENT_NEWLINE; return TEP_EVENT_NEWLINE;
if (isspace(ch)) if (isspace(ch))
return EVENT_SPACE; return TEP_EVENT_SPACE;
if (isalnum(ch) || ch == '_') if (isalnum(ch) || ch == '_')
return EVENT_ITEM; return TEP_EVENT_ITEM;
if (ch == '\'') if (ch == '\'')
return EVENT_SQUOTE; return TEP_EVENT_SQUOTE;
if (ch == '"') if (ch == '"')
return EVENT_DQUOTE; return TEP_EVENT_DQUOTE;
if (!isprint(ch)) if (!isprint(ch))
return EVENT_NONE; return TEP_EVENT_NONE;
if (ch == '(' || ch == ')' || ch == ',') if (ch == '(' || ch == ')' || ch == ',')
return EVENT_DELIM; return TEP_EVENT_DELIM;
return EVENT_OP; return TEP_EVENT_OP;
} }
static int __read_char(void) static int __read_char(void)
...@@ -928,38 +928,38 @@ static int extend_token(char **tok, char *buf, int size) ...@@ -928,38 +928,38 @@ static int extend_token(char **tok, char *buf, int size)
return 0; return 0;
} }
static enum event_type force_token(const char *str, char **tok); static enum tep_event_type force_token(const char *str, char **tok);
static enum event_type __read_token(char **tok) static enum tep_event_type __read_token(char **tok)
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
int ch, last_ch, quote_ch, next_ch; int ch, last_ch, quote_ch, next_ch;
int i = 0; int i = 0;
int tok_size = 0; int tok_size = 0;
enum event_type type; enum tep_event_type type;
*tok = NULL; *tok = NULL;
ch = __read_char(); ch = __read_char();
if (ch < 0) if (ch < 0)
return EVENT_NONE; return TEP_EVENT_NONE;
type = get_type(ch); type = get_type(ch);
if (type == EVENT_NONE) if (type == TEP_EVENT_NONE)
return type; return type;
buf[i++] = ch; buf[i++] = ch;
switch (type) { switch (type) {
case EVENT_NEWLINE: case TEP_EVENT_NEWLINE:
case EVENT_DELIM: case TEP_EVENT_DELIM:
if (asprintf(tok, "%c", ch) < 0) if (asprintf(tok, "%c", ch) < 0)
return EVENT_ERROR; return TEP_EVENT_ERROR;
return type; return type;
case EVENT_OP: case TEP_EVENT_OP:
switch (ch) { switch (ch) {
case '-': case '-':
next_ch = __peek_char(); next_ch = __peek_char();
...@@ -1002,8 +1002,8 @@ static enum event_type __read_token(char **tok) ...@@ -1002,8 +1002,8 @@ static enum event_type __read_token(char **tok)
buf[i++] = __read_char(); buf[i++] = __read_char();
goto out; goto out;
case EVENT_DQUOTE: case TEP_EVENT_DQUOTE:
case EVENT_SQUOTE: case TEP_EVENT_SQUOTE:
/* don't keep quotes */ /* don't keep quotes */
i--; i--;
quote_ch = ch; quote_ch = ch;
...@@ -1015,7 +1015,7 @@ static enum event_type __read_token(char **tok) ...@@ -1015,7 +1015,7 @@ static enum event_type __read_token(char **tok)
tok_size += BUFSIZ; tok_size += BUFSIZ;
if (extend_token(tok, buf, tok_size) < 0) if (extend_token(tok, buf, tok_size) < 0)
return EVENT_NONE; return TEP_EVENT_NONE;
i = 0; i = 0;
} }
last_ch = ch; last_ch = ch;
...@@ -1032,7 +1032,7 @@ static enum event_type __read_token(char **tok) ...@@ -1032,7 +1032,7 @@ static enum event_type __read_token(char **tok)
* For strings (double quotes) check the next token. * For strings (double quotes) check the next token.
* If it is another string, concatinate the two. * If it is another string, concatinate the two.
*/ */
if (type == EVENT_DQUOTE) { if (type == TEP_EVENT_DQUOTE) {
unsigned long long save_input_buf_ptr = input_buf_ptr; unsigned long long save_input_buf_ptr = input_buf_ptr;
do { do {
...@@ -1045,8 +1045,8 @@ static enum event_type __read_token(char **tok) ...@@ -1045,8 +1045,8 @@ static enum event_type __read_token(char **tok)
goto out; goto out;
case EVENT_ERROR ... EVENT_SPACE: case TEP_EVENT_ERROR ... TEP_EVENT_SPACE:
case EVENT_ITEM: case TEP_EVENT_ITEM:
default: default:
break; break;
} }
...@@ -1057,7 +1057,7 @@ static enum event_type __read_token(char **tok) ...@@ -1057,7 +1057,7 @@ static enum event_type __read_token(char **tok)
tok_size += BUFSIZ; tok_size += BUFSIZ;
if (extend_token(tok, buf, tok_size) < 0) if (extend_token(tok, buf, tok_size) < 0)
return EVENT_NONE; return TEP_EVENT_NONE;
i = 0; i = 0;
} }
ch = __read_char(); ch = __read_char();
...@@ -1067,9 +1067,9 @@ static enum event_type __read_token(char **tok) ...@@ -1067,9 +1067,9 @@ static enum event_type __read_token(char **tok)
out: out:
buf[i] = 0; buf[i] = 0;
if (extend_token(tok, buf, tok_size + i + 1) < 0) if (extend_token(tok, buf, tok_size + i + 1) < 0)
return EVENT_NONE; return TEP_EVENT_NONE;
if (type == EVENT_ITEM) { if (type == TEP_EVENT_ITEM) {
/* /*
* Older versions of the kernel has a bug that * Older versions of the kernel has a bug that
* creates invalid symbols and will break the mac80211 * creates invalid symbols and will break the mac80211
...@@ -1096,12 +1096,12 @@ static enum event_type __read_token(char **tok) ...@@ -1096,12 +1096,12 @@ static enum event_type __read_token(char **tok)
return type; return type;
} }
static enum event_type force_token(const char *str, char **tok) static enum tep_event_type force_token(const char *str, char **tok)
{ {
const char *save_input_buf; const char *save_input_buf;
unsigned long long save_input_buf_ptr; unsigned long long save_input_buf_ptr;
unsigned long long save_input_buf_siz; unsigned long long save_input_buf_siz;
enum event_type type; enum tep_event_type type;
/* save off the current input pointers */ /* save off the current input pointers */
save_input_buf = input_buf; save_input_buf = input_buf;
...@@ -1126,13 +1126,13 @@ static void free_token(char *tok) ...@@ -1126,13 +1126,13 @@ static void free_token(char *tok)
free(tok); free(tok);
} }
static enum event_type read_token(char **tok) static enum tep_event_type read_token(char **tok)
{ {
enum event_type type; enum tep_event_type type;
for (;;) { for (;;) {
type = __read_token(tok); type = __read_token(tok);
if (type != EVENT_SPACE) if (type != TEP_EVENT_SPACE)
return type; return type;
free_token(*tok); free_token(*tok);
...@@ -1140,7 +1140,7 @@ static enum event_type read_token(char **tok) ...@@ -1140,7 +1140,7 @@ static enum event_type read_token(char **tok)
/* not reached */ /* not reached */
*tok = NULL; *tok = NULL;
return EVENT_NONE; return TEP_EVENT_NONE;
} }
/** /**
...@@ -1152,7 +1152,7 @@ static enum event_type read_token(char **tok) ...@@ -1152,7 +1152,7 @@ static enum event_type read_token(char **tok)
* *
* Returns the token type. * Returns the token type.
*/ */
enum event_type tep_read_token(char **tok) enum tep_event_type tep_read_token(char **tok)
{ {
return read_token(tok); return read_token(tok);
} }
...@@ -1167,13 +1167,13 @@ void tep_free_token(char *token) ...@@ -1167,13 +1167,13 @@ void tep_free_token(char *token)
} }
/* no newline */ /* no newline */
static enum event_type read_token_item(char **tok) static enum tep_event_type read_token_item(char **tok)
{ {
enum event_type type; enum tep_event_type type;
for (;;) { for (;;) {
type = __read_token(tok); type = __read_token(tok);
if (type != EVENT_SPACE && type != EVENT_NEWLINE) if (type != TEP_EVENT_SPACE && type != TEP_EVENT_NEWLINE)
return type; return type;
free_token(*tok); free_token(*tok);
*tok = NULL; *tok = NULL;
...@@ -1181,10 +1181,10 @@ static enum event_type read_token_item(char **tok) ...@@ -1181,10 +1181,10 @@ static enum event_type read_token_item(char **tok)
/* not reached */ /* not reached */
*tok = NULL; *tok = NULL;
return EVENT_NONE; return TEP_EVENT_NONE;
} }
static int test_type(enum event_type type, enum event_type expect) static int test_type(enum tep_event_type type, enum tep_event_type expect)
{ {
if (type != expect) { if (type != expect) {
do_warning("Error: expected type %d but read %d", do_warning("Error: expected type %d but read %d",
...@@ -1194,8 +1194,8 @@ static int test_type(enum event_type type, enum event_type expect) ...@@ -1194,8 +1194,8 @@ static int test_type(enum event_type type, enum event_type expect)
return 0; return 0;
} }
static int test_type_token(enum event_type type, const char *token, static int test_type_token(enum tep_event_type type, const char *token,
enum event_type expect, const char *expect_tok) enum tep_event_type expect, const char *expect_tok)
{ {
if (type != expect) { if (type != expect) {
do_warning("Error: expected type %d but read %d", do_warning("Error: expected type %d but read %d",
...@@ -1211,9 +1211,9 @@ static int test_type_token(enum event_type type, const char *token, ...@@ -1211,9 +1211,9 @@ static int test_type_token(enum event_type type, const char *token,
return 0; return 0;
} }
static int __read_expect_type(enum event_type expect, char **tok, int newline_ok) static int __read_expect_type(enum tep_event_type expect, char **tok, int newline_ok)
{ {
enum event_type type; enum tep_event_type type;
if (newline_ok) if (newline_ok)
type = read_token(tok); type = read_token(tok);
...@@ -1222,15 +1222,15 @@ static int __read_expect_type(enum event_type expect, char **tok, int newline_ok ...@@ -1222,15 +1222,15 @@ static int __read_expect_type(enum event_type expect, char **tok, int newline_ok
return test_type(type, expect); return test_type(type, expect);
} }
static int read_expect_type(enum event_type expect, char **tok) static int read_expect_type(enum tep_event_type expect, char **tok)
{ {
return __read_expect_type(expect, tok, 1); return __read_expect_type(expect, tok, 1);
} }
static int __read_expected(enum event_type expect, const char *str, static int __read_expected(enum tep_event_type expect, const char *str,
int newline_ok) int newline_ok)
{ {
enum event_type type; enum tep_event_type type;
char *token; char *token;
int ret; int ret;
...@@ -1246,12 +1246,12 @@ static int __read_expected(enum event_type expect, const char *str, ...@@ -1246,12 +1246,12 @@ static int __read_expected(enum event_type expect, const char *str,
return ret; return ret;
} }
static int read_expected(enum event_type expect, const char *str) static int read_expected(enum tep_event_type expect, const char *str)
{ {
return __read_expected(expect, str, 1); return __read_expected(expect, str, 1);
} }
static int read_expected_item(enum event_type expect, const char *str) static int read_expected_item(enum tep_event_type expect, const char *str)
{ {
return __read_expected(expect, str, 0); return __read_expected(expect, str, 0);
} }
...@@ -1260,13 +1260,13 @@ static char *event_read_name(void) ...@@ -1260,13 +1260,13 @@ static char *event_read_name(void)
{ {
char *token; char *token;
if (read_expected(EVENT_ITEM, "name") < 0) if (read_expected(TEP_EVENT_ITEM, "name") < 0)
return NULL; return NULL;
if (read_expected(EVENT_OP, ":") < 0) if (read_expected(TEP_EVENT_OP, ":") < 0)
return NULL; return NULL;
if (read_expect_type(EVENT_ITEM, &token) < 0) if (read_expect_type(TEP_EVENT_ITEM, &token) < 0)
goto fail; goto fail;
return token; return token;
...@@ -1281,13 +1281,13 @@ static int event_read_id(void) ...@@ -1281,13 +1281,13 @@ static int event_read_id(void)
char *token; char *token;
int id; int id;
if (read_expected_item(EVENT_ITEM, "ID") < 0) if (read_expected_item(TEP_EVENT_ITEM, "ID") < 0)
return -1; return -1;
if (read_expected(EVENT_OP, ":") < 0) if (read_expected(TEP_EVENT_OP, ":") < 0)
return -1; return -1;
if (read_expect_type(EVENT_ITEM, &token) < 0) if (read_expect_type(TEP_EVENT_ITEM, &token) < 0)
goto fail; goto fail;
id = strtoul(token, NULL, 0); id = strtoul(token, NULL, 0);
...@@ -1357,7 +1357,7 @@ static unsigned int type_size(const char *name) ...@@ -1357,7 +1357,7 @@ static unsigned int type_size(const char *name)
static int event_read_fields(struct tep_event_format *event, struct tep_format_field **fields) static int event_read_fields(struct tep_event_format *event, struct tep_format_field **fields)
{ {
struct tep_format_field *field = NULL; struct tep_format_field *field = NULL;
enum event_type type; enum tep_event_type type;
char *token; char *token;
char *last_token; char *last_token;
int count = 0; int count = 0;
...@@ -1366,14 +1366,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f ...@@ -1366,14 +1366,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f
unsigned int size_dynamic = 0; unsigned int size_dynamic = 0;
type = read_token(&token); type = read_token(&token);
if (type == EVENT_NEWLINE) { if (type == TEP_EVENT_NEWLINE) {
free_token(token); free_token(token);
return count; return count;
} }
count++; count++;
if (test_type_token(type, token, EVENT_ITEM, "field")) if (test_type_token(type, token, TEP_EVENT_ITEM, "field"))
goto fail; goto fail;
free_token(token); free_token(token);
...@@ -1383,16 +1383,16 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f ...@@ -1383,16 +1383,16 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f
* Just ignore it. * Just ignore it.
*/ */
if (event->flags & EVENT_FL_ISFTRACE && if (event->flags & EVENT_FL_ISFTRACE &&
type == EVENT_ITEM && strcmp(token, "special") == 0) { type == TEP_EVENT_ITEM && strcmp(token, "special") == 0) {
free_token(token); free_token(token);
type = read_token(&token); type = read_token(&token);
} }
if (test_type_token(type, token, EVENT_OP, ":") < 0) if (test_type_token(type, token, TEP_EVENT_OP, ":") < 0)
goto fail; goto fail;
free_token(token); free_token(token);
if (read_expect_type(EVENT_ITEM, &token) < 0) if (read_expect_type(TEP_EVENT_ITEM, &token) < 0)
goto fail; goto fail;
last_token = token; last_token = token;
...@@ -1406,14 +1406,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f ...@@ -1406,14 +1406,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f
/* read the rest of the type */ /* read the rest of the type */
for (;;) { for (;;) {
type = read_token(&token); type = read_token(&token);
if (type == EVENT_ITEM || if (type == TEP_EVENT_ITEM ||
(type == EVENT_OP && strcmp(token, "*") == 0) || (type == TEP_EVENT_OP && strcmp(token, "*") == 0) ||
/* /*
* Some of the ftrace fields are broken and have * Some of the ftrace fields are broken and have
* an illegal "." in them. * an illegal "." in them.
*/ */
(event->flags & EVENT_FL_ISFTRACE && (event->flags & EVENT_FL_ISFTRACE &&
type == EVENT_OP && strcmp(token, ".") == 0)) { type == TEP_EVENT_OP && strcmp(token, ".") == 0)) {
if (strcmp(token, "*") == 0) if (strcmp(token, "*") == 0)
field->flags |= TEP_FIELD_IS_POINTER; field->flags |= TEP_FIELD_IS_POINTER;
...@@ -1446,11 +1446,11 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f ...@@ -1446,11 +1446,11 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f
} }
field->name = field->alias = last_token; field->name = field->alias = last_token;
if (test_type(type, EVENT_OP)) if (test_type(type, TEP_EVENT_OP))
goto fail; goto fail;
if (strcmp(token, "[") == 0) { if (strcmp(token, "[") == 0) {
enum event_type last_type = type; enum tep_event_type last_type = type;
char *brackets = token; char *brackets = token;
char *new_brackets; char *new_brackets;
int len; int len;
...@@ -1459,14 +1459,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f ...@@ -1459,14 +1459,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f
type = read_token(&token); type = read_token(&token);
if (type == EVENT_ITEM) if (type == TEP_EVENT_ITEM)
field->arraylen = strtoul(token, NULL, 0); field->arraylen = strtoul(token, NULL, 0);
else else
field->arraylen = 0; field->arraylen = 0;
while (strcmp(token, "]") != 0) { while (strcmp(token, "]") != 0) {
if (last_type == EVENT_ITEM && if (last_type == TEP_EVENT_ITEM &&
type == EVENT_ITEM) type == TEP_EVENT_ITEM)
len = 2; len = 2;
else else
len = 1; len = 1;
...@@ -1487,7 +1487,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f ...@@ -1487,7 +1487,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f
field->arraylen = strtoul(token, NULL, 0); field->arraylen = strtoul(token, NULL, 0);
free_token(token); free_token(token);
type = read_token(&token); type = read_token(&token);
if (type == EVENT_NONE) { if (type == TEP_EVENT_NONE) {
do_warning_event(event, "failed to find token"); do_warning_event(event, "failed to find token");
goto fail; goto fail;
} }
...@@ -1510,7 +1510,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f ...@@ -1510,7 +1510,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f
* If the next token is not an OP, then it is of * If the next token is not an OP, then it is of
* the format: type [] item; * the format: type [] item;
*/ */
if (type == EVENT_ITEM) { if (type == TEP_EVENT_ITEM) {
char *new_type; char *new_type;
new_type = realloc(field->type, new_type = realloc(field->type,
strlen(field->type) + strlen(field->type) +
...@@ -1550,60 +1550,60 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f ...@@ -1550,60 +1550,60 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f
if (field_is_long(field)) if (field_is_long(field))
field->flags |= TEP_FIELD_IS_LONG; field->flags |= TEP_FIELD_IS_LONG;
if (test_type_token(type, token, EVENT_OP, ";")) if (test_type_token(type, token, TEP_EVENT_OP, ";"))
goto fail; goto fail;
free_token(token); free_token(token);
if (read_expected(EVENT_ITEM, "offset") < 0) if (read_expected(TEP_EVENT_ITEM, "offset") < 0)
goto fail_expect; goto fail_expect;
if (read_expected(EVENT_OP, ":") < 0) if (read_expected(TEP_EVENT_OP, ":") < 0)
goto fail_expect; goto fail_expect;
if (read_expect_type(EVENT_ITEM, &token)) if (read_expect_type(TEP_EVENT_ITEM, &token))
goto fail; goto fail;
field->offset = strtoul(token, NULL, 0); field->offset = strtoul(token, NULL, 0);
free_token(token); free_token(token);
if (read_expected(EVENT_OP, ";") < 0) if (read_expected(TEP_EVENT_OP, ";") < 0)
goto fail_expect; goto fail_expect;
if (read_expected(EVENT_ITEM, "size") < 0) if (read_expected(TEP_EVENT_ITEM, "size") < 0)
goto fail_expect; goto fail_expect;
if (read_expected(EVENT_OP, ":") < 0) if (read_expected(TEP_EVENT_OP, ":") < 0)
goto fail_expect; goto fail_expect;
if (read_expect_type(EVENT_ITEM, &token)) if (read_expect_type(TEP_EVENT_ITEM, &token))
goto fail; goto fail;
field->size = strtoul(token, NULL, 0); field->size = strtoul(token, NULL, 0);
free_token(token); free_token(token);
if (read_expected(EVENT_OP, ";") < 0) if (read_expected(TEP_EVENT_OP, ";") < 0)
goto fail_expect; goto fail_expect;
type = read_token(&token); type = read_token(&token);
if (type != EVENT_NEWLINE) { if (type != TEP_EVENT_NEWLINE) {
/* newer versions of the kernel have a "signed" type */ /* newer versions of the kernel have a "signed" type */
if (test_type_token(type, token, EVENT_ITEM, "signed")) if (test_type_token(type, token, TEP_EVENT_ITEM, "signed"))
goto fail; goto fail;
free_token(token); free_token(token);
if (read_expected(EVENT_OP, ":") < 0) if (read_expected(TEP_EVENT_OP, ":") < 0)
goto fail_expect; goto fail_expect;
if (read_expect_type(EVENT_ITEM, &token)) if (read_expect_type(TEP_EVENT_ITEM, &token))
goto fail; goto fail;
if (strtoul(token, NULL, 0)) if (strtoul(token, NULL, 0))
field->flags |= TEP_FIELD_IS_SIGNED; field->flags |= TEP_FIELD_IS_SIGNED;
free_token(token); free_token(token);
if (read_expected(EVENT_OP, ";") < 0) if (read_expected(TEP_EVENT_OP, ";") < 0)
goto fail_expect; goto fail_expect;
if (read_expect_type(EVENT_NEWLINE, &token)) if (read_expect_type(TEP_EVENT_NEWLINE, &token))
goto fail; goto fail;
} }
...@@ -1646,13 +1646,13 @@ static int event_read_format(struct tep_event_format *event) ...@@ -1646,13 +1646,13 @@ static int event_read_format(struct tep_event_format *event)
char *token; char *token;
int ret; int ret;
if (read_expected_item(EVENT_ITEM, "format") < 0) if (read_expected_item(TEP_EVENT_ITEM, "format") < 0)
return -1; return -1;
if (read_expected(EVENT_OP, ":") < 0) if (read_expected(TEP_EVENT_OP, ":") < 0)
return -1; return -1;
if (read_expect_type(EVENT_NEWLINE, &token)) if (read_expect_type(TEP_EVENT_NEWLINE, &token))
goto fail; goto fail;
free_token(token); free_token(token);
...@@ -1673,14 +1673,14 @@ static int event_read_format(struct tep_event_format *event) ...@@ -1673,14 +1673,14 @@ static int event_read_format(struct tep_event_format *event)
return -1; return -1;
} }
static enum event_type static enum tep_event_type
process_arg_token(struct tep_event_format *event, struct print_arg *arg, process_arg_token(struct tep_event_format *event, struct print_arg *arg,
char **tok, enum event_type type); char **tok, enum tep_event_type type);
static enum event_type static enum tep_event_type
process_arg(struct tep_event_format *event, struct print_arg *arg, char **tok) process_arg(struct tep_event_format *event, struct print_arg *arg, char **tok)
{ {
enum event_type type; enum tep_event_type type;
char *token; char *token;
type = read_token(&token); type = read_token(&token);
...@@ -1689,32 +1689,32 @@ process_arg(struct tep_event_format *event, struct print_arg *arg, char **tok) ...@@ -1689,32 +1689,32 @@ process_arg(struct tep_event_format *event, struct print_arg *arg, char **tok)
return process_arg_token(event, arg, tok, type); return process_arg_token(event, arg, tok, type);
} }
static enum event_type static enum tep_event_type
process_op(struct tep_event_format *event, struct print_arg *arg, char **tok); process_op(struct tep_event_format *event, struct print_arg *arg, char **tok);
/* /*
* For __print_symbolic() and __print_flags, we need to completely * For __print_symbolic() and __print_flags, we need to completely
* evaluate the first argument, which defines what to print next. * evaluate the first argument, which defines what to print next.
*/ */
static enum event_type static enum tep_event_type
process_field_arg(struct tep_event_format *event, struct print_arg *arg, char **tok) process_field_arg(struct tep_event_format *event, struct print_arg *arg, char **tok)
{ {
enum event_type type; enum tep_event_type type;
type = process_arg(event, arg, tok); type = process_arg(event, arg, tok);
while (type == EVENT_OP) { while (type == TEP_EVENT_OP) {
type = process_op(event, arg, tok); type = process_op(event, arg, tok);
} }
return type; return type;
} }
static enum event_type static enum tep_event_type
process_cond(struct tep_event_format *event, struct print_arg *top, char **tok) process_cond(struct tep_event_format *event, struct print_arg *top, char **tok)
{ {
struct print_arg *arg, *left, *right; struct print_arg *arg, *left, *right;
enum event_type type; enum tep_event_type type;
char *token = NULL; char *token = NULL;
arg = alloc_arg(); arg = alloc_arg();
...@@ -1737,16 +1737,16 @@ process_cond(struct tep_event_format *event, struct print_arg *top, char **tok) ...@@ -1737,16 +1737,16 @@ process_cond(struct tep_event_format *event, struct print_arg *top, char **tok)
type = process_arg(event, left, &token); type = process_arg(event, left, &token);
again: again:
if (type == EVENT_ERROR) if (type == TEP_EVENT_ERROR)
goto out_free; goto out_free;
/* Handle other operations in the arguments */ /* Handle other operations in the arguments */
if (type == EVENT_OP && strcmp(token, ":") != 0) { if (type == TEP_EVENT_OP && strcmp(token, ":") != 0) {
type = process_op(event, left, &token); type = process_op(event, left, &token);
goto again; goto again;
} }
if (test_type_token(type, token, EVENT_OP, ":")) if (test_type_token(type, token, TEP_EVENT_OP, ":"))
goto out_free; goto out_free;
arg->op.op = token; arg->op.op = token;
...@@ -1763,14 +1763,14 @@ process_cond(struct tep_event_format *event, struct print_arg *top, char **tok) ...@@ -1763,14 +1763,14 @@ process_cond(struct tep_event_format *event, struct print_arg *top, char **tok)
top->op.right = NULL; top->op.right = NULL;
free_token(token); free_token(token);
free_arg(arg); free_arg(arg);
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_array(struct tep_event_format *event, struct print_arg *top, char **tok) process_array(struct tep_event_format *event, struct print_arg *top, char **tok)
{ {
struct print_arg *arg; struct print_arg *arg;
enum event_type type; enum tep_event_type type;
char *token = NULL; char *token = NULL;
arg = alloc_arg(); arg = alloc_arg();
...@@ -1778,12 +1778,12 @@ process_array(struct tep_event_format *event, struct print_arg *top, char **tok) ...@@ -1778,12 +1778,12 @@ process_array(struct tep_event_format *event, struct print_arg *top, char **tok)
do_warning_event(event, "%s: not enough memory!", __func__); do_warning_event(event, "%s: not enough memory!", __func__);
/* '*tok' is set to top->op.op. No need to free. */ /* '*tok' is set to top->op.op. No need to free. */
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
*tok = NULL; *tok = NULL;
type = process_arg(event, arg, &token); type = process_arg(event, arg, &token);
if (test_type_token(type, token, EVENT_OP, "]")) if (test_type_token(type, token, TEP_EVENT_OP, "]"))
goto out_free; goto out_free;
top->op.right = arg; top->op.right = arg;
...@@ -1797,7 +1797,7 @@ process_array(struct tep_event_format *event, struct print_arg *top, char **tok) ...@@ -1797,7 +1797,7 @@ process_array(struct tep_event_format *event, struct print_arg *top, char **tok)
out_free: out_free:
free_token(token); free_token(token);
free_arg(arg); free_arg(arg);
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static int get_op_prio(char *op) static int get_op_prio(char *op)
...@@ -1868,11 +1868,11 @@ static int set_op_prio(struct print_arg *arg) ...@@ -1868,11 +1868,11 @@ static int set_op_prio(struct print_arg *arg)
} }
/* Note, *tok does not get freed, but will most likely be saved */ /* Note, *tok does not get freed, but will most likely be saved */
static enum event_type static enum tep_event_type
process_op(struct tep_event_format *event, struct print_arg *arg, char **tok) process_op(struct tep_event_format *event, struct print_arg *arg, char **tok)
{ {
struct print_arg *left, *right = NULL; struct print_arg *left, *right = NULL;
enum event_type type; enum tep_event_type type;
char *token; char *token;
/* the op is passed in via tok */ /* the op is passed in via tok */
...@@ -1974,7 +1974,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok) ...@@ -1974,7 +1974,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok)
/* could just be a type pointer */ /* could just be a type pointer */
if ((strcmp(arg->op.op, "*") == 0) && if ((strcmp(arg->op.op, "*") == 0) &&
type == EVENT_DELIM && (strcmp(token, ")") == 0)) { type == TEP_EVENT_DELIM && (strcmp(token, ")") == 0)) {
char *new_atom; char *new_atom;
if (left->type != PRINT_ATOM) { if (left->type != PRINT_ATOM) {
...@@ -2000,7 +2000,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok) ...@@ -2000,7 +2000,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok)
goto out_warn_free; goto out_warn_free;
type = process_arg_token(event, right, tok, type); type = process_arg_token(event, right, tok, type);
if (type == EVENT_ERROR) { if (type == TEP_EVENT_ERROR) {
free_arg(right); free_arg(right);
/* token was freed in process_arg_token() via *tok */ /* token was freed in process_arg_token() via *tok */
token = NULL; token = NULL;
...@@ -2047,7 +2047,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok) ...@@ -2047,7 +2047,7 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok)
goto out_free; goto out_free;
} }
if (type == EVENT_OP && strcmp(*tok, ":") != 0) { if (type == TEP_EVENT_OP && strcmp(*tok, ":") != 0) {
int prio; int prio;
/* higher prios need to be closer to the root */ /* higher prios need to be closer to the root */
...@@ -2066,21 +2066,21 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok) ...@@ -2066,21 +2066,21 @@ process_op(struct tep_event_format *event, struct print_arg *arg, char **tok)
out_free: out_free:
free_token(token); free_token(token);
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_entry(struct tep_event_format *event __maybe_unused, struct print_arg *arg, process_entry(struct tep_event_format *event __maybe_unused, struct print_arg *arg,
char **tok) char **tok)
{ {
enum event_type type; enum tep_event_type type;
char *field; char *field;
char *token; char *token;
if (read_expected(EVENT_OP, "->") < 0) if (read_expected(TEP_EVENT_OP, "->") < 0)
goto out_err; goto out_err;
if (read_expect_type(EVENT_ITEM, &token) < 0) if (read_expect_type(TEP_EVENT_ITEM, &token) < 0)
goto out_free; goto out_free;
field = token; field = token;
...@@ -2106,14 +2106,14 @@ process_entry(struct tep_event_format *event __maybe_unused, struct print_arg *a ...@@ -2106,14 +2106,14 @@ process_entry(struct tep_event_format *event __maybe_unused, struct print_arg *a
free_token(token); free_token(token);
out_err: out_err:
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static int alloc_and_process_delim(struct tep_event_format *event, char *next_token, static int alloc_and_process_delim(struct tep_event_format *event, char *next_token,
struct print_arg **print_arg) struct print_arg **print_arg)
{ {
struct print_arg *field; struct print_arg *field;
enum event_type type; enum tep_event_type type;
char *token; char *token;
int ret = 0; int ret = 0;
...@@ -2126,7 +2126,7 @@ static int alloc_and_process_delim(struct tep_event_format *event, char *next_to ...@@ -2126,7 +2126,7 @@ static int alloc_and_process_delim(struct tep_event_format *event, char *next_to
type = process_arg(event, field, &token); type = process_arg(event, field, &token);
if (test_type_token(type, token, EVENT_DELIM, next_token)) { if (test_type_token(type, token, TEP_EVENT_DELIM, next_token)) {
errno = EINVAL; errno = EINVAL;
ret = -1; ret = -1;
free_arg(field); free_arg(field);
...@@ -2443,10 +2443,10 @@ static char *arg_eval (struct print_arg *arg) ...@@ -2443,10 +2443,10 @@ static char *arg_eval (struct print_arg *arg)
return NULL; return NULL;
} }
static enum event_type static enum tep_event_type
process_fields(struct tep_event_format *event, struct print_flag_sym **list, char **tok) process_fields(struct tep_event_format *event, struct print_flag_sym **list, char **tok)
{ {
enum event_type type; enum tep_event_type type;
struct print_arg *arg = NULL; struct print_arg *arg = NULL;
struct print_flag_sym *field; struct print_flag_sym *field;
char *token = *tok; char *token = *tok;
...@@ -2455,7 +2455,7 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha ...@@ -2455,7 +2455,7 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha
do { do {
free_token(token); free_token(token);
type = read_token_item(&token); type = read_token_item(&token);
if (test_type_token(type, token, EVENT_OP, "{")) if (test_type_token(type, token, TEP_EVENT_OP, "{"))
break; break;
arg = alloc_arg(); arg = alloc_arg();
...@@ -2465,13 +2465,13 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha ...@@ -2465,13 +2465,13 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha
free_token(token); free_token(token);
type = process_arg(event, arg, &token); type = process_arg(event, arg, &token);
if (type == EVENT_OP) if (type == TEP_EVENT_OP)
type = process_op(event, arg, &token); type = process_op(event, arg, &token);
if (type == EVENT_ERROR) if (type == TEP_EVENT_ERROR)
goto out_free; goto out_free;
if (test_type_token(type, token, EVENT_DELIM, ",")) if (test_type_token(type, token, TEP_EVENT_DELIM, ","))
goto out_free; goto out_free;
field = calloc(1, sizeof(*field)); field = calloc(1, sizeof(*field));
...@@ -2492,7 +2492,7 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha ...@@ -2492,7 +2492,7 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha
free_token(token); free_token(token);
type = process_arg(event, arg, &token); type = process_arg(event, arg, &token);
if (test_type_token(type, token, EVENT_OP, "}")) if (test_type_token(type, token, TEP_EVENT_OP, "}"))
goto out_free_field; goto out_free_field;
value = arg_eval(arg); value = arg_eval(arg);
...@@ -2509,7 +2509,7 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha ...@@ -2509,7 +2509,7 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha
free_token(token); free_token(token);
type = read_token_item(&token); type = read_token_item(&token);
} while (type == EVENT_DELIM && strcmp(token, ",") == 0); } while (type == TEP_EVENT_DELIM && strcmp(token, ",") == 0);
*tok = token; *tok = token;
return type; return type;
...@@ -2521,14 +2521,14 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha ...@@ -2521,14 +2521,14 @@ process_fields(struct tep_event_format *event, struct print_flag_sym **list, cha
free_token(token); free_token(token);
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok) process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok)
{ {
struct print_arg *field; struct print_arg *field;
enum event_type type; enum tep_event_type type;
char *token = NULL; char *token = NULL;
memset(arg, 0, sizeof(*arg)); memset(arg, 0, sizeof(*arg));
...@@ -2543,10 +2543,10 @@ process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok) ...@@ -2543,10 +2543,10 @@ process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok)
type = process_field_arg(event, field, &token); type = process_field_arg(event, field, &token);
/* Handle operations in the first argument */ /* Handle operations in the first argument */
while (type == EVENT_OP) while (type == TEP_EVENT_OP)
type = process_op(event, field, &token); type = process_op(event, field, &token);
if (test_type_token(type, token, EVENT_DELIM, ",")) if (test_type_token(type, token, TEP_EVENT_DELIM, ","))
goto out_free_field; goto out_free_field;
free_token(token); free_token(token);
...@@ -2558,11 +2558,11 @@ process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok) ...@@ -2558,11 +2558,11 @@ process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok)
type = read_token_item(&token); type = read_token_item(&token);
} }
if (test_type_token(type, token, EVENT_DELIM, ",")) if (test_type_token(type, token, TEP_EVENT_DELIM, ","))
goto out_free; goto out_free;
type = process_fields(event, &arg->flags.flags, &token); type = process_fields(event, &arg->flags.flags, &token);
if (test_type_token(type, token, EVENT_DELIM, ")")) if (test_type_token(type, token, TEP_EVENT_DELIM, ")"))
goto out_free; goto out_free;
free_token(token); free_token(token);
...@@ -2574,14 +2574,14 @@ process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok) ...@@ -2574,14 +2574,14 @@ process_flags(struct tep_event_format *event, struct print_arg *arg, char **tok)
out_free: out_free:
free_token(token); free_token(token);
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_symbols(struct tep_event_format *event, struct print_arg *arg, char **tok) process_symbols(struct tep_event_format *event, struct print_arg *arg, char **tok)
{ {
struct print_arg *field; struct print_arg *field;
enum event_type type; enum tep_event_type type;
char *token = NULL; char *token = NULL;
memset(arg, 0, sizeof(*arg)); memset(arg, 0, sizeof(*arg));
...@@ -2595,13 +2595,13 @@ process_symbols(struct tep_event_format *event, struct print_arg *arg, char **to ...@@ -2595,13 +2595,13 @@ process_symbols(struct tep_event_format *event, struct print_arg *arg, char **to
type = process_field_arg(event, field, &token); type = process_field_arg(event, field, &token);
if (test_type_token(type, token, EVENT_DELIM, ",")) if (test_type_token(type, token, TEP_EVENT_DELIM, ","))
goto out_free_field; goto out_free_field;
arg->symbol.field = field; arg->symbol.field = field;
type = process_fields(event, &arg->symbol.symbols, &token); type = process_fields(event, &arg->symbol.symbols, &token);
if (test_type_token(type, token, EVENT_DELIM, ")")) if (test_type_token(type, token, TEP_EVENT_DELIM, ")"))
goto out_free; goto out_free;
free_token(token); free_token(token);
...@@ -2613,10 +2613,10 @@ process_symbols(struct tep_event_format *event, struct print_arg *arg, char **to ...@@ -2613,10 +2613,10 @@ process_symbols(struct tep_event_format *event, struct print_arg *arg, char **to
out_free: out_free:
free_token(token); free_token(token);
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_hex_common(struct tep_event_format *event, struct print_arg *arg, process_hex_common(struct tep_event_format *event, struct print_arg *arg,
char **tok, enum print_arg_type type) char **tok, enum print_arg_type type)
{ {
...@@ -2636,23 +2636,23 @@ process_hex_common(struct tep_event_format *event, struct print_arg *arg, ...@@ -2636,23 +2636,23 @@ process_hex_common(struct tep_event_format *event, struct print_arg *arg,
arg->hex.field = NULL; arg->hex.field = NULL;
out: out:
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_hex(struct tep_event_format *event, struct print_arg *arg, char **tok) process_hex(struct tep_event_format *event, struct print_arg *arg, char **tok)
{ {
return process_hex_common(event, arg, tok, PRINT_HEX); return process_hex_common(event, arg, tok, PRINT_HEX);
} }
static enum event_type static enum tep_event_type
process_hex_str(struct tep_event_format *event, struct print_arg *arg, process_hex_str(struct tep_event_format *event, struct print_arg *arg,
char **tok) char **tok)
{ {
return process_hex_common(event, arg, tok, PRINT_HEX_STR); return process_hex_common(event, arg, tok, PRINT_HEX_STR);
} }
static enum event_type static enum tep_event_type
process_int_array(struct tep_event_format *event, struct print_arg *arg, char **tok) process_int_array(struct tep_event_format *event, struct print_arg *arg, char **tok)
{ {
memset(arg, 0, sizeof(*arg)); memset(arg, 0, sizeof(*arg));
...@@ -2677,14 +2677,14 @@ process_int_array(struct tep_event_format *event, struct print_arg *arg, char ** ...@@ -2677,14 +2677,14 @@ process_int_array(struct tep_event_format *event, struct print_arg *arg, char **
arg->int_array.field = NULL; arg->int_array.field = NULL;
out: out:
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, char **tok) process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, char **tok)
{ {
struct tep_format_field *field; struct tep_format_field *field;
enum event_type type; enum tep_event_type type;
char *token; char *token;
memset(arg, 0, sizeof(*arg)); memset(arg, 0, sizeof(*arg));
...@@ -2696,7 +2696,7 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha ...@@ -2696,7 +2696,7 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha
*/ */
type = read_token(&token); type = read_token(&token);
*tok = token; *tok = token;
if (type != EVENT_ITEM) if (type != TEP_EVENT_ITEM)
goto out_free; goto out_free;
/* Find the field */ /* Find the field */
...@@ -2708,13 +2708,13 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha ...@@ -2708,13 +2708,13 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha
arg->dynarray.field = field; arg->dynarray.field = field;
arg->dynarray.index = 0; arg->dynarray.index = 0;
if (read_expected(EVENT_DELIM, ")") < 0) if (read_expected(TEP_EVENT_DELIM, ")") < 0)
goto out_free; goto out_free;
free_token(token); free_token(token);
type = read_token_item(&token); type = read_token_item(&token);
*tok = token; *tok = token;
if (type != EVENT_OP || strcmp(token, "[") != 0) if (type != TEP_EVENT_OP || strcmp(token, "[") != 0)
return type; return type;
free_token(token); free_token(token);
...@@ -2722,14 +2722,14 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha ...@@ -2722,14 +2722,14 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha
if (!arg) { if (!arg) {
do_warning_event(event, "%s: not enough memory!", __func__); do_warning_event(event, "%s: not enough memory!", __func__);
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
type = process_arg(event, arg, &token); type = process_arg(event, arg, &token);
if (type == EVENT_ERROR) if (type == TEP_EVENT_ERROR)
goto out_free_arg; goto out_free_arg;
if (!test_type_token(type, token, EVENT_OP, "]")) if (!test_type_token(type, token, TEP_EVENT_OP, "]"))
goto out_free_arg; goto out_free_arg;
free_token(token); free_token(token);
...@@ -2741,18 +2741,18 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha ...@@ -2741,18 +2741,18 @@ process_dynamic_array(struct tep_event_format *event, struct print_arg *arg, cha
out_free: out_free:
free_token(token); free_token(token);
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_dynamic_array_len(struct tep_event_format *event, struct print_arg *arg, process_dynamic_array_len(struct tep_event_format *event, struct print_arg *arg,
char **tok) char **tok)
{ {
struct tep_format_field *field; struct tep_format_field *field;
enum event_type type; enum tep_event_type type;
char *token; char *token;
if (read_expect_type(EVENT_ITEM, &token) < 0) if (read_expect_type(TEP_EVENT_ITEM, &token) < 0)
goto out_free; goto out_free;
arg->type = PRINT_DYNAMIC_ARRAY_LEN; arg->type = PRINT_DYNAMIC_ARRAY_LEN;
...@@ -2765,7 +2765,7 @@ process_dynamic_array_len(struct tep_event_format *event, struct print_arg *arg, ...@@ -2765,7 +2765,7 @@ process_dynamic_array_len(struct tep_event_format *event, struct print_arg *arg,
arg->dynarray.field = field; arg->dynarray.field = field;
arg->dynarray.index = 0; arg->dynarray.index = 0;
if (read_expected(EVENT_DELIM, ")") < 0) if (read_expected(TEP_EVENT_DELIM, ")") < 0)
goto out_err; goto out_err;
type = read_token(&token); type = read_token(&token);
...@@ -2777,28 +2777,28 @@ process_dynamic_array_len(struct tep_event_format *event, struct print_arg *arg, ...@@ -2777,28 +2777,28 @@ process_dynamic_array_len(struct tep_event_format *event, struct print_arg *arg,
free_token(token); free_token(token);
out_err: out_err:
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_paren(struct tep_event_format *event, struct print_arg *arg, char **tok) process_paren(struct tep_event_format *event, struct print_arg *arg, char **tok)
{ {
struct print_arg *item_arg; struct print_arg *item_arg;
enum event_type type; enum tep_event_type type;
char *token; char *token;
type = process_arg(event, arg, &token); type = process_arg(event, arg, &token);
if (type == EVENT_ERROR) if (type == TEP_EVENT_ERROR)
goto out_free; goto out_free;
if (type == EVENT_OP) if (type == TEP_EVENT_OP)
type = process_op(event, arg, &token); type = process_op(event, arg, &token);
if (type == EVENT_ERROR) if (type == TEP_EVENT_ERROR)
goto out_free; goto out_free;
if (test_type_token(type, token, EVENT_DELIM, ")")) if (test_type_token(type, token, TEP_EVENT_DELIM, ")"))
goto out_free; goto out_free;
free_token(token); free_token(token);
...@@ -2809,7 +2809,7 @@ process_paren(struct tep_event_format *event, struct print_arg *arg, char **tok) ...@@ -2809,7 +2809,7 @@ process_paren(struct tep_event_format *event, struct print_arg *arg, char **tok)
* this was a typecast. * this was a typecast.
*/ */
if (event_item_type(type) || if (event_item_type(type) ||
(type == EVENT_DELIM && strcmp(token, "(") == 0)) { (type == TEP_EVENT_DELIM && strcmp(token, "(") == 0)) {
/* make this a typecast and contine */ /* make this a typecast and contine */
...@@ -2839,25 +2839,25 @@ process_paren(struct tep_event_format *event, struct print_arg *arg, char **tok) ...@@ -2839,25 +2839,25 @@ process_paren(struct tep_event_format *event, struct print_arg *arg, char **tok)
out_free: out_free:
free_token(token); free_token(token);
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_str(struct tep_event_format *event __maybe_unused, struct print_arg *arg, process_str(struct tep_event_format *event __maybe_unused, struct print_arg *arg,
char **tok) char **tok)
{ {
enum event_type type; enum tep_event_type type;
char *token; char *token;
if (read_expect_type(EVENT_ITEM, &token) < 0) if (read_expect_type(TEP_EVENT_ITEM, &token) < 0)
goto out_free; goto out_free;
arg->type = PRINT_STRING; arg->type = PRINT_STRING;
arg->string.string = token; arg->string.string = token;
arg->string.offset = -1; arg->string.offset = -1;
if (read_expected(EVENT_DELIM, ")") < 0) if (read_expected(TEP_EVENT_DELIM, ")") < 0)
goto out_err; goto out_err;
type = read_token(&token); type = read_token(&token);
...@@ -2869,24 +2869,24 @@ process_str(struct tep_event_format *event __maybe_unused, struct print_arg *arg ...@@ -2869,24 +2869,24 @@ process_str(struct tep_event_format *event __maybe_unused, struct print_arg *arg
free_token(token); free_token(token);
out_err: out_err:
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_bitmask(struct tep_event_format *event __maybe_unused, struct print_arg *arg, process_bitmask(struct tep_event_format *event __maybe_unused, struct print_arg *arg,
char **tok) char **tok)
{ {
enum event_type type; enum tep_event_type type;
char *token; char *token;
if (read_expect_type(EVENT_ITEM, &token) < 0) if (read_expect_type(TEP_EVENT_ITEM, &token) < 0)
goto out_free; goto out_free;
arg->type = PRINT_BITMASK; arg->type = PRINT_BITMASK;
arg->bitmask.bitmask = token; arg->bitmask.bitmask = token;
arg->bitmask.offset = -1; arg->bitmask.offset = -1;
if (read_expected(EVENT_DELIM, ")") < 0) if (read_expected(TEP_EVENT_DELIM, ")") < 0)
goto out_err; goto out_err;
type = read_token(&token); type = read_token(&token);
...@@ -2898,7 +2898,7 @@ process_bitmask(struct tep_event_format *event __maybe_unused, struct print_arg ...@@ -2898,7 +2898,7 @@ process_bitmask(struct tep_event_format *event __maybe_unused, struct print_arg
free_token(token); free_token(token);
out_err: out_err:
*tok = NULL; *tok = NULL;
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static struct tep_function_handler * static struct tep_function_handler *
...@@ -2933,13 +2933,13 @@ static void remove_func_handler(struct tep_handle *pevent, char *func_name) ...@@ -2933,13 +2933,13 @@ static void remove_func_handler(struct tep_handle *pevent, char *func_name)
} }
} }
static enum event_type static enum tep_event_type
process_func_handler(struct tep_event_format *event, struct tep_function_handler *func, process_func_handler(struct tep_event_format *event, struct tep_function_handler *func,
struct print_arg *arg, char **tok) struct print_arg *arg, char **tok)
{ {
struct print_arg **next_arg; struct print_arg **next_arg;
struct print_arg *farg; struct print_arg *farg;
enum event_type type; enum tep_event_type type;
char *token; char *token;
int i; int i;
...@@ -2954,12 +2954,12 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handler ...@@ -2954,12 +2954,12 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handler
if (!farg) { if (!farg) {
do_warning_event(event, "%s: not enough memory!", do_warning_event(event, "%s: not enough memory!",
__func__); __func__);
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
type = process_arg(event, farg, &token); type = process_arg(event, farg, &token);
if (i < (func->nr_args - 1)) { if (i < (func->nr_args - 1)) {
if (type != EVENT_DELIM || strcmp(token, ",") != 0) { if (type != TEP_EVENT_DELIM || strcmp(token, ",") != 0) {
do_warning_event(event, do_warning_event(event,
"Error: function '%s()' expects %d arguments but event %s only uses %d", "Error: function '%s()' expects %d arguments but event %s only uses %d",
func->name, func->nr_args, func->name, func->nr_args,
...@@ -2967,7 +2967,7 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handler ...@@ -2967,7 +2967,7 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handler
goto err; goto err;
} }
} else { } else {
if (type != EVENT_DELIM || strcmp(token, ")") != 0) { if (type != TEP_EVENT_DELIM || strcmp(token, ")") != 0) {
do_warning_event(event, do_warning_event(event,
"Error: function '%s()' only expects %d arguments but event %s has more", "Error: function '%s()' only expects %d arguments but event %s has more",
func->name, func->nr_args, event->name); func->name, func->nr_args, event->name);
...@@ -2988,10 +2988,10 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handler ...@@ -2988,10 +2988,10 @@ process_func_handler(struct tep_event_format *event, struct tep_function_handler
err: err:
free_arg(farg); free_arg(farg);
free_token(token); free_token(token);
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_function(struct tep_event_format *event, struct print_arg *arg, process_function(struct tep_event_format *event, struct print_arg *arg,
char *token, char **tok) char *token, char **tok)
{ {
...@@ -3044,12 +3044,12 @@ process_function(struct tep_event_format *event, struct print_arg *arg, ...@@ -3044,12 +3044,12 @@ process_function(struct tep_event_format *event, struct print_arg *arg,
do_warning_event(event, "function %s not defined", token); do_warning_event(event, "function %s not defined", token);
free_token(token); free_token(token);
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
static enum event_type static enum tep_event_type
process_arg_token(struct tep_event_format *event, struct print_arg *arg, process_arg_token(struct tep_event_format *event, struct print_arg *arg,
char **tok, enum event_type type) char **tok, enum tep_event_type type)
{ {
char *token; char *token;
char *atom; char *atom;
...@@ -3057,7 +3057,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg, ...@@ -3057,7 +3057,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,
token = *tok; token = *tok;
switch (type) { switch (type) {
case EVENT_ITEM: case TEP_EVENT_ITEM:
if (strcmp(token, "REC") == 0) { if (strcmp(token, "REC") == 0) {
free_token(token); free_token(token);
type = process_entry(event, arg, &token); type = process_entry(event, arg, &token);
...@@ -3071,7 +3071,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg, ...@@ -3071,7 +3071,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,
* If the next token is a parenthesis, then this * If the next token is a parenthesis, then this
* is a function. * is a function.
*/ */
if (type == EVENT_DELIM && strcmp(token, "(") == 0) { if (type == TEP_EVENT_DELIM && strcmp(token, "(") == 0) {
free_token(token); free_token(token);
token = NULL; token = NULL;
/* this will free atom. */ /* this will free atom. */
...@@ -3079,7 +3079,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg, ...@@ -3079,7 +3079,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,
break; break;
} }
/* atoms can be more than one token long */ /* atoms can be more than one token long */
while (type == EVENT_ITEM) { while (type == TEP_EVENT_ITEM) {
char *new_atom; char *new_atom;
new_atom = realloc(atom, new_atom = realloc(atom,
strlen(atom) + strlen(token) + 2); strlen(atom) + strlen(token) + 2);
...@@ -3087,7 +3087,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg, ...@@ -3087,7 +3087,7 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,
free(atom); free(atom);
*tok = NULL; *tok = NULL;
free_token(token); free_token(token);
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
atom = new_atom; atom = new_atom;
strcat(atom, " "); strcat(atom, " ");
...@@ -3100,19 +3100,19 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg, ...@@ -3100,19 +3100,19 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,
arg->atom.atom = atom; arg->atom.atom = atom;
break; break;
case EVENT_DQUOTE: case TEP_EVENT_DQUOTE:
case EVENT_SQUOTE: case TEP_EVENT_SQUOTE:
arg->type = PRINT_ATOM; arg->type = PRINT_ATOM;
arg->atom.atom = token; arg->atom.atom = token;
type = read_token_item(&token); type = read_token_item(&token);
break; break;
case EVENT_DELIM: case TEP_EVENT_DELIM:
if (strcmp(token, "(") == 0) { if (strcmp(token, "(") == 0) {
free_token(token); free_token(token);
type = process_paren(event, arg, &token); type = process_paren(event, arg, &token);
break; break;
} }
case EVENT_OP: case TEP_EVENT_OP:
/* handle single ops */ /* handle single ops */
arg->type = PRINT_OP; arg->type = PRINT_OP;
arg->op.op = token; arg->op.op = token;
...@@ -3120,16 +3120,16 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg, ...@@ -3120,16 +3120,16 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,
type = process_op(event, arg, &token); type = process_op(event, arg, &token);
/* On error, the op is freed */ /* On error, the op is freed */
if (type == EVENT_ERROR) if (type == TEP_EVENT_ERROR)
arg->op.op = NULL; arg->op.op = NULL;
/* return error type if errored */ /* return error type if errored */
break; break;
case EVENT_ERROR ... EVENT_NEWLINE: case TEP_EVENT_ERROR ... TEP_EVENT_NEWLINE:
default: default:
do_warning_event(event, "unexpected type %d", type); do_warning_event(event, "unexpected type %d", type);
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
*tok = token; *tok = token;
...@@ -3138,13 +3138,13 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg, ...@@ -3138,13 +3138,13 @@ process_arg_token(struct tep_event_format *event, struct print_arg *arg,
static int event_read_print_args(struct tep_event_format *event, struct print_arg **list) static int event_read_print_args(struct tep_event_format *event, struct print_arg **list)
{ {
enum event_type type = EVENT_ERROR; enum tep_event_type type = TEP_EVENT_ERROR;
struct print_arg *arg; struct print_arg *arg;
char *token; char *token;
int args = 0; int args = 0;
do { do {
if (type == EVENT_NEWLINE) { if (type == TEP_EVENT_NEWLINE) {
type = read_token_item(&token); type = read_token_item(&token);
continue; continue;
} }
...@@ -3158,7 +3158,7 @@ static int event_read_print_args(struct tep_event_format *event, struct print_ar ...@@ -3158,7 +3158,7 @@ static int event_read_print_args(struct tep_event_format *event, struct print_ar
type = process_arg(event, arg, &token); type = process_arg(event, arg, &token);
if (type == EVENT_ERROR) { if (type == TEP_EVENT_ERROR) {
free_token(token); free_token(token);
free_arg(arg); free_arg(arg);
return -1; return -1;
...@@ -3167,10 +3167,10 @@ static int event_read_print_args(struct tep_event_format *event, struct print_ar ...@@ -3167,10 +3167,10 @@ static int event_read_print_args(struct tep_event_format *event, struct print_ar
*list = arg; *list = arg;
args++; args++;
if (type == EVENT_OP) { if (type == TEP_EVENT_OP) {
type = process_op(event, arg, &token); type = process_op(event, arg, &token);
free_token(token); free_token(token);
if (type == EVENT_ERROR) { if (type == TEP_EVENT_ERROR) {
*list = NULL; *list = NULL;
free_arg(arg); free_arg(arg);
return -1; return -1;
...@@ -3179,16 +3179,16 @@ static int event_read_print_args(struct tep_event_format *event, struct print_ar ...@@ -3179,16 +3179,16 @@ static int event_read_print_args(struct tep_event_format *event, struct print_ar
continue; continue;
} }
if (type == EVENT_DELIM && strcmp(token, ",") == 0) { if (type == TEP_EVENT_DELIM && strcmp(token, ",") == 0) {
free_token(token); free_token(token);
*list = arg; *list = arg;
list = &arg->next; list = &arg->next;
continue; continue;
} }
break; break;
} while (type != EVENT_NONE); } while (type != TEP_EVENT_NONE);
if (type != EVENT_NONE && type != EVENT_ERROR) if (type != TEP_EVENT_NONE && type != TEP_EVENT_ERROR)
free_token(token); free_token(token);
return args; return args;
...@@ -3196,20 +3196,20 @@ static int event_read_print_args(struct tep_event_format *event, struct print_ar ...@@ -3196,20 +3196,20 @@ static int event_read_print_args(struct tep_event_format *event, struct print_ar
static int event_read_print(struct tep_event_format *event) static int event_read_print(struct tep_event_format *event)
{ {
enum event_type type; enum tep_event_type type;
char *token; char *token;
int ret; int ret;
if (read_expected_item(EVENT_ITEM, "print") < 0) if (read_expected_item(TEP_EVENT_ITEM, "print") < 0)
return -1; return -1;
if (read_expected(EVENT_ITEM, "fmt") < 0) if (read_expected(TEP_EVENT_ITEM, "fmt") < 0)
return -1; return -1;
if (read_expected(EVENT_OP, ":") < 0) if (read_expected(TEP_EVENT_OP, ":") < 0)
return -1; return -1;
if (read_expect_type(EVENT_DQUOTE, &token) < 0) if (read_expect_type(TEP_EVENT_DQUOTE, &token) < 0)
goto fail; goto fail;
concat: concat:
...@@ -3219,11 +3219,11 @@ static int event_read_print(struct tep_event_format *event) ...@@ -3219,11 +3219,11 @@ static int event_read_print(struct tep_event_format *event)
/* ok to have no arg */ /* ok to have no arg */
type = read_token_item(&token); type = read_token_item(&token);
if (type == EVENT_NONE) if (type == TEP_EVENT_NONE)
return 0; return 0;
/* Handle concatenation of print lines */ /* Handle concatenation of print lines */
if (type == EVENT_DQUOTE) { if (type == TEP_EVENT_DQUOTE) {
char *cat; char *cat;
if (asprintf(&cat, "%s%s", event->print_fmt.format, token) < 0) if (asprintf(&cat, "%s%s", event->print_fmt.format, token) < 0)
...@@ -3235,7 +3235,7 @@ static int event_read_print(struct tep_event_format *event) ...@@ -3235,7 +3235,7 @@ static int event_read_print(struct tep_event_format *event)
goto concat; goto concat;
} }
if (test_type_token(type, token, EVENT_DELIM, ",")) if (test_type_token(type, token, TEP_EVENT_DELIM, ","))
goto fail; goto fail;
free_token(token); free_token(token);
...@@ -5617,7 +5617,7 @@ static int events_system_cmp(const void *a, const void *b) ...@@ -5617,7 +5617,7 @@ static int events_system_cmp(const void *a, const void *b)
return events_id_cmp(a, b); return events_id_cmp(a, b);
} }
struct tep_event_format **tep_list_events(struct tep_handle *pevent, enum event_sort_type sort_type) struct tep_event_format **tep_list_events(struct tep_handle *pevent, enum tep_event_sort_type sort_type)
{ {
struct tep_event_format **events; struct tep_event_format **events;
int (*sort)(const void *a, const void *b); int (*sort)(const void *a, const void *b);
...@@ -5638,20 +5638,20 @@ struct tep_event_format **tep_list_events(struct tep_handle *pevent, enum event_ ...@@ -5638,20 +5638,20 @@ struct tep_event_format **tep_list_events(struct tep_handle *pevent, enum event_
pevent->sort_events = events; pevent->sort_events = events;
/* the internal events are sorted by id */ /* the internal events are sorted by id */
if (sort_type == EVENT_SORT_ID) { if (sort_type == TEP_EVENT_SORT_ID) {
pevent->last_type = sort_type; pevent->last_type = sort_type;
return events; return events;
} }
} }
switch (sort_type) { switch (sort_type) {
case EVENT_SORT_ID: case TEP_EVENT_SORT_ID:
sort = events_id_cmp; sort = events_id_cmp;
break; break;
case EVENT_SORT_NAME: case TEP_EVENT_SORT_NAME:
sort = events_name_cmp; sort = events_name_cmp;
break; break;
case EVENT_SORT_SYSTEM: case TEP_EVENT_SORT_SYSTEM:
sort = events_system_cmp; sort = events_system_cmp;
break; break;
default: default:
...@@ -5834,13 +5834,13 @@ static void parse_header_field(const char *field, ...@@ -5834,13 +5834,13 @@ static void parse_header_field(const char *field,
save_input_buf_ptr = input_buf_ptr; save_input_buf_ptr = input_buf_ptr;
save_input_buf_siz = input_buf_siz; save_input_buf_siz = input_buf_siz;
if (read_expected(EVENT_ITEM, "field") < 0) if (read_expected(TEP_EVENT_ITEM, "field") < 0)
return; return;
if (read_expected(EVENT_OP, ":") < 0) if (read_expected(TEP_EVENT_OP, ":") < 0)
return; return;
/* type */ /* type */
if (read_expect_type(EVENT_ITEM, &token) < 0) if (read_expect_type(TEP_EVENT_ITEM, &token) < 0)
goto fail; goto fail;
free_token(token); free_token(token);
...@@ -5848,42 +5848,42 @@ static void parse_header_field(const char *field, ...@@ -5848,42 +5848,42 @@ static void parse_header_field(const char *field,
* If this is not a mandatory field, then test it first. * If this is not a mandatory field, then test it first.
*/ */
if (mandatory) { if (mandatory) {
if (read_expected(EVENT_ITEM, field) < 0) if (read_expected(TEP_EVENT_ITEM, field) < 0)
return; return;
} else { } else {
if (read_expect_type(EVENT_ITEM, &token) < 0) if (read_expect_type(TEP_EVENT_ITEM, &token) < 0)
goto fail; goto fail;
if (strcmp(token, field) != 0) if (strcmp(token, field) != 0)
goto discard; goto discard;
free_token(token); free_token(token);
} }
if (read_expected(EVENT_OP, ";") < 0) if (read_expected(TEP_EVENT_OP, ";") < 0)
return; return;
if (read_expected(EVENT_ITEM, "offset") < 0) if (read_expected(TEP_EVENT_ITEM, "offset") < 0)
return; return;
if (read_expected(EVENT_OP, ":") < 0) if (read_expected(TEP_EVENT_OP, ":") < 0)
return; return;
if (read_expect_type(EVENT_ITEM, &token) < 0) if (read_expect_type(TEP_EVENT_ITEM, &token) < 0)
goto fail; goto fail;
*offset = atoi(token); *offset = atoi(token);
free_token(token); free_token(token);
if (read_expected(EVENT_OP, ";") < 0) if (read_expected(TEP_EVENT_OP, ";") < 0)
return; return;
if (read_expected(EVENT_ITEM, "size") < 0) if (read_expected(TEP_EVENT_ITEM, "size") < 0)
return; return;
if (read_expected(EVENT_OP, ":") < 0) if (read_expected(TEP_EVENT_OP, ":") < 0)
return; return;
if (read_expect_type(EVENT_ITEM, &token) < 0) if (read_expect_type(TEP_EVENT_ITEM, &token) < 0)
goto fail; goto fail;
*size = atoi(token); *size = atoi(token);
free_token(token); free_token(token);
if (read_expected(EVENT_OP, ";") < 0) if (read_expected(TEP_EVENT_OP, ";") < 0)
return; return;
type = read_token(&token); type = read_token(&token);
if (type != EVENT_NEWLINE) { if (type != TEP_EVENT_NEWLINE) {
/* newer versions of the kernel have a "signed" type */ /* newer versions of the kernel have a "signed" type */
if (type != EVENT_ITEM) if (type != TEP_EVENT_ITEM)
goto fail; goto fail;
if (strcmp(token, "signed") != 0) if (strcmp(token, "signed") != 0)
...@@ -5891,17 +5891,17 @@ static void parse_header_field(const char *field, ...@@ -5891,17 +5891,17 @@ static void parse_header_field(const char *field,
free_token(token); free_token(token);
if (read_expected(EVENT_OP, ":") < 0) if (read_expected(TEP_EVENT_OP, ":") < 0)
return; return;
if (read_expect_type(EVENT_ITEM, &token)) if (read_expect_type(TEP_EVENT_ITEM, &token))
goto fail; goto fail;
free_token(token); free_token(token);
if (read_expected(EVENT_OP, ";") < 0) if (read_expected(TEP_EVENT_OP, ";") < 0)
return; return;
if (read_expect_type(EVENT_NEWLINE, &token)) if (read_expect_type(TEP_EVENT_NEWLINE, &token))
goto fail; goto fail;
} }
fail: fail:
......
tools/lib/traceevent/event-parse.h
View file @ f25d9e09
...@@ -301,22 +301,22 @@ enum { ...@@ -301,22 +301,22 @@ enum {
EVENT_FL_FAILED = 0x80000000 EVENT_FL_FAILED = 0x80000000
}; };
enum event_sort_type { enum tep_event_sort_type {
EVENT_SORT_ID, TEP_EVENT_SORT_ID,
EVENT_SORT_NAME, TEP_EVENT_SORT_NAME,
EVENT_SORT_SYSTEM, TEP_EVENT_SORT_SYSTEM,
}; };
enum event_type { enum tep_event_type {
EVENT_ERROR, TEP_EVENT_ERROR,
EVENT_NONE, TEP_EVENT_NONE,
EVENT_SPACE, TEP_EVENT_SPACE,
EVENT_NEWLINE, TEP_EVENT_NEWLINE,
EVENT_OP, TEP_EVENT_OP,
EVENT_DELIM, TEP_EVENT_DELIM,
EVENT_ITEM, TEP_EVENT_ITEM,
EVENT_DQUOTE, TEP_EVENT_DQUOTE,
EVENT_SQUOTE, TEP_EVENT_SQUOTE,
}; };
typedef unsigned long long (*tep_func_handler)(struct trace_seq *s, typedef unsigned long long (*tep_func_handler)(struct trace_seq *s,
...@@ -454,7 +454,7 @@ struct tep_handle { ...@@ -454,7 +454,7 @@ struct tep_handle {
struct tep_event_format **events; struct tep_event_format **events;
int nr_events; int nr_events;
struct tep_event_format **sort_events; struct tep_event_format **sort_events;
enum event_sort_type last_type; enum tep_event_sort_type last_type;
int type_offset; int type_offset;
int type_size; int type_size;
...@@ -685,7 +685,7 @@ void tep_event_info(struct trace_seq *s, struct tep_event_format *event, ...@@ -685,7 +685,7 @@ void tep_event_info(struct trace_seq *s, struct tep_event_format *event,
int tep_strerror(struct tep_handle *pevent, enum tep_errno errnum, int tep_strerror(struct tep_handle *pevent, enum tep_errno errnum,
char *buf, size_t buflen); char *buf, size_t buflen);
struct tep_event_format **tep_list_events(struct tep_handle *pevent, enum event_sort_type); struct tep_event_format **tep_list_events(struct tep_handle *pevent, enum tep_event_sort_type);
struct tep_format_field **tep_event_common_fields(struct tep_event_format *event); struct tep_format_field **tep_event_common_fields(struct tep_event_format *event);
struct tep_format_field **tep_event_fields(struct tep_event_format *event); struct tep_format_field **tep_event_fields(struct tep_event_format *event);
...@@ -756,7 +756,7 @@ void tep_unref(struct tep_handle *pevent); ...@@ -756,7 +756,7 @@ void tep_unref(struct tep_handle *pevent);
/* access to the internal parser */ /* access to the internal parser */
void tep_buffer_init(const char *buf, unsigned long long size); void tep_buffer_init(const char *buf, unsigned long long size);
enum event_type tep_read_token(char **tok); enum tep_event_type tep_read_token(char **tok);
void tep_free_token(char *token); void tep_free_token(char *token);
int tep_peek_char(void); int tep_peek_char(void);
const char *tep_get_input_buf(void); const char *tep_get_input_buf(void);
......
tools/lib/traceevent/parse-filter.c
View file @ f25d9e09
...@@ -61,15 +61,15 @@ static void free_token(char *token) ...@@ -61,15 +61,15 @@ static void free_token(char *token)
tep_free_token(token); tep_free_token(token);
} }
static enum event_type read_token(char **tok) static enum tep_event_type read_token(char **tok)
{ {
enum event_type type; enum tep_event_type type;
char *token = NULL; char *token = NULL;
do { do {
free_token(token); free_token(token);
type = tep_read_token(&token); type = tep_read_token(&token);
} while (type == EVENT_NEWLINE || type == EVENT_SPACE); } while (type == TEP_EVENT_NEWLINE || type == TEP_EVENT_SPACE);
/* If token is = or ! check to see if the next char is ~ */ /* If token is = or ! check to see if the next char is ~ */
if (token && if (token &&
...@@ -79,7 +79,7 @@ static enum event_type read_token(char **tok) ...@@ -79,7 +79,7 @@ static enum event_type read_token(char **tok)
*tok = malloc(3); *tok = malloc(3);
if (*tok == NULL) { if (*tok == NULL) {
free_token(token); free_token(token);
return EVENT_ERROR; return TEP_EVENT_ERROR;
} }
sprintf(*tok, "%c%c", *token, '~'); sprintf(*tok, "%c%c", *token, '~');
free_token(token); free_token(token);
...@@ -334,7 +334,7 @@ static void free_events(struct event_list *events) ...@@ -334,7 +334,7 @@ static void free_events(struct event_list *events)
static enum tep_errno static enum tep_errno
create_arg_item(struct tep_event_format *event, const char *token, create_arg_item(struct tep_event_format *event, const char *token,
enum event_type type, struct filter_arg **parg, char *error_str) enum tep_event_type type, struct filter_arg **parg, char *error_str)
{ {
struct tep_format_field *field; struct tep_format_field *field;
struct filter_arg *arg; struct filter_arg *arg;
...@@ -347,11 +347,11 @@ create_arg_item(struct tep_event_format *event, const char *token, ...@@ -347,11 +347,11 @@ create_arg_item(struct tep_event_format *event, const char *token,
switch (type) { switch (type) {
case EVENT_SQUOTE: case TEP_EVENT_SQUOTE:
case EVENT_DQUOTE: case TEP_EVENT_DQUOTE:
arg->type = FILTER_ARG_VALUE; arg->type = FILTER_ARG_VALUE;
arg->value.type = arg->value.type =
type == EVENT_DQUOTE ? FILTER_STRING : FILTER_CHAR; type == TEP_EVENT_DQUOTE ? FILTER_STRING : FILTER_CHAR;
arg->value.str = strdup(token); arg->value.str = strdup(token);
if (!arg->value.str) { if (!arg->value.str) {
free_arg(arg); free_arg(arg);
...@@ -359,7 +359,7 @@ create_arg_item(struct tep_event_format *event, const char *token, ...@@ -359,7 +359,7 @@ create_arg_item(struct tep_event_format *event, const char *token,
return TEP_ERRNO__MEM_ALLOC_FAILED; return TEP_ERRNO__MEM_ALLOC_FAILED;
} }
break; break;
case EVENT_ITEM: case TEP_EVENT_ITEM:
/* if it is a number, then convert it */ /* if it is a number, then convert it */
if (isdigit(token[0])) { if (isdigit(token[0])) {
arg->type = FILTER_ARG_VALUE; arg->type = FILTER_ARG_VALUE;
...@@ -942,7 +942,7 @@ static enum tep_errno ...@@ -942,7 +942,7 @@ static enum tep_errno
process_filter(struct tep_event_format *event, struct filter_arg **parg, process_filter(struct tep_event_format *event, struct filter_arg **parg,
char *error_str, int not) char *error_str, int not)
{ {
enum event_type type; enum tep_event_type type;
char *token = NULL; char *token = NULL;
struct filter_arg *current_op = NULL; struct filter_arg *current_op = NULL;
struct filter_arg *current_exp = NULL; struct filter_arg *current_exp = NULL;
...@@ -960,9 +960,9 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg, ...@@ -960,9 +960,9 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg,
free(token); free(token);
type = read_token(&token); type = read_token(&token);
switch (type) { switch (type) {
case EVENT_SQUOTE: case TEP_EVENT_SQUOTE:
case EVENT_DQUOTE: case TEP_EVENT_DQUOTE:
case EVENT_ITEM: case TEP_EVENT_ITEM:
ret = create_arg_item(event, token, type, &arg, error_str); ret = create_arg_item(event, token, type, &arg, error_str);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
...@@ -987,7 +987,7 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg, ...@@ -987,7 +987,7 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg,
arg = NULL; arg = NULL;
break; break;
case EVENT_DELIM: case TEP_EVENT_DELIM:
if (*token == ',') { if (*token == ',') {
show_error(error_str, "Illegal token ','"); show_error(error_str, "Illegal token ','");
ret = TEP_ERRNO__ILLEGAL_TOKEN; ret = TEP_ERRNO__ILLEGAL_TOKEN;
...@@ -1054,7 +1054,7 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg, ...@@ -1054,7 +1054,7 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg,
} }
break; break;
case EVENT_OP: case TEP_EVENT_OP:
op_type = process_op(token, &btype, &ctype, &etype); op_type = process_op(token, &btype, &ctype, &etype);
/* All expect a left arg except for NOT */ /* All expect a left arg except for NOT */
...@@ -1139,14 +1139,14 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg, ...@@ -1139,14 +1139,14 @@ process_filter(struct tep_event_format *event, struct filter_arg **parg,
if (ret < 0) if (ret < 0)
goto fail_syntax; goto fail_syntax;
break; break;
case EVENT_NONE: case TEP_EVENT_NONE:
break; break;
case EVENT_ERROR: case TEP_EVENT_ERROR:
goto fail_alloc; goto fail_alloc;
default: default:
goto fail_syntax; goto fail_syntax;
} }
} while (type != EVENT_NONE); } while (type != TEP_EVENT_NONE);
if (!current_op && !current_exp) if (!current_op && !current_exp)
goto fail_syntax; goto fail_syntax;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7