| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 15 Oct 2009 08:49:39 GMT
From: tip-bot for Steven Rostedt <srostedt@...hat.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, acme@...hat.com, hpa@...or.com,
mingo@...hat.com, peterz@...radead.org, fweisbec@...il.com,
srostedt@...hat.com, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:perf/core] perf tools: Handle the case with and without the "signed" trace field
Commit-ID: 13999e59343b042b0807be2df6ae5895d29782a0
Gitweb: http://git.kernel.org/tip/13999e59343b042b0807be2df6ae5895d29782a0
Author: Steven Rostedt <srostedt@...hat.com>
AuthorDate: Wed, 14 Oct 2009 15:43:38 -0400
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Thu, 15 Oct 2009 10:42:37 +0200
perf tools: Handle the case with and without the "signed" trace field
The trace format files now have a "signed" field. But we should
still be able to handle the kernels that do not have this field.
Signed-off-by: Steven Rostedt <srostedt@...hat.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
LKML-Reference: <20091014194358.888239553@...dmis.org>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
tools/perf/util/trace-event-parse.c | 81 ++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 29 deletions(-)
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 59e4e4d..0739b12 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -924,23 +924,30 @@ static int event_read_fields(struct event *event, struct format_field **fields)
if (read_expected(EVENT_OP, (char *)";") < 0)
goto fail_expect;
- if (read_expected(EVENT_ITEM, (char *)"signed") < 0)
- goto fail_expect;
+ type = read_token(&token);
+ if (type != EVENT_NEWLINE) {
+ /* newer versions of the kernel have a "signed" type */
+ if (test_type_token(type, token, EVENT_ITEM, (char *)"signed"))
+ goto fail;
- if (read_expected(EVENT_OP, (char *)":") < 0)
- goto fail_expect;
+ free_token(token);
- if (read_expect_type(EVENT_ITEM, &token))
- goto fail;
- if (strtoul(token, NULL, 0))
- field->flags |= FIELD_IS_SIGNED;
- free_token(token);
+ if (read_expected(EVENT_OP, (char *)":") < 0)
+ goto fail_expect;
- if (read_expected(EVENT_OP, (char *)";") < 0)
- goto fail_expect;
+ if (read_expect_type(EVENT_ITEM, &token))
+ goto fail;
+
+ /* add signed type */
+
+ free_token(token);
+ if (read_expected(EVENT_OP, (char *)";") < 0)
+ goto fail_expect;
+
+ if (read_expect_type(EVENT_NEWLINE, &token))
+ goto fail;
+ }
- if (read_expect_type(EVENT_NEWLINE, &token) < 0)
- goto fail;
free_token(token);
*fields = field;
@@ -2949,21 +2956,23 @@ static void print_args(struct print_arg *args)
}
}
-static void parse_header_field(char *type,
+static void parse_header_field(char *field,
int *offset, int *size)
{
char *token;
+ int type;
if (read_expected(EVENT_ITEM, (char *)"field") < 0)
return;
if (read_expected(EVENT_OP, (char *)":") < 0)
return;
+
/* type */
if (read_expect_type(EVENT_ITEM, &token) < 0)
- return;
+ goto fail;
free_token(token);
- if (read_expected(EVENT_ITEM, type) < 0)
+ if (read_expected(EVENT_ITEM, field) < 0)
return;
if (read_expected(EVENT_OP, (char *)";") < 0)
return;
@@ -2972,7 +2981,7 @@ static void parse_header_field(char *type,
if (read_expected(EVENT_OP, (char *)":") < 0)
return;
if (read_expect_type(EVENT_ITEM, &token) < 0)
- return;
+ goto fail;
*offset = atoi(token);
free_token(token);
if (read_expected(EVENT_OP, (char *)";") < 0)
@@ -2982,22 +2991,36 @@ static void parse_header_field(char *type,
if (read_expected(EVENT_OP, (char *)":") < 0)
return;
if (read_expect_type(EVENT_ITEM, &token) < 0)
- return;
+ goto fail;
*size = atoi(token);
free_token(token);
if (read_expected(EVENT_OP, (char *)";") < 0)
return;
- if (read_expected(EVENT_ITEM, (char *)"signed") < 0)
- return;
- if (read_expected(EVENT_OP, (char *)":") < 0)
- return;
- if (read_expect_type(EVENT_ITEM, &token) < 0)
- return;
- free_token(token);
- if (read_expected(EVENT_OP, (char *)";") < 0)
- return;
- if (read_expect_type(EVENT_NEWLINE, &token) < 0)
- return;
+ type = read_token(&token);
+ if (type != EVENT_NEWLINE) {
+ /* newer versions of the kernel have a "signed" type */
+ if (type != EVENT_ITEM)
+ goto fail;
+
+ if (strcmp(token, (char *)"signed") != 0)
+ goto fail;
+
+ free_token(token);
+
+ if (read_expected(EVENT_OP, (char *)":") < 0)
+ return;
+
+ if (read_expect_type(EVENT_ITEM, &token))
+ goto fail;
+
+ free_token(token);
+ if (read_expected(EVENT_OP, (char *)";") < 0)
+ return;
+
+ if (read_expect_type(EVENT_NEWLINE, &token))
+ goto fail;
+ }
+ fail:
free_token(token);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists