2009-11-25 07:15:01

by Tom Zanussi

Subject: [PATCH 0/2] tracing: minor fixes

A couple of minor fixes for things that were overlooked in previous patches.

Tom Zanussi (2):
perf tools: Add 'signed' flag setting back into trace-event-parse.c
trace/syscalls: Change ret param in struct syscall_trace_exit to long

kernel/trace/trace.h | 2 +-
tools/perf/util/trace-event-parse.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)

2009-11-25 07:15:10

by Tom Zanussi

Subject: [PATCH 1/2] perf tools: Add 'signed' flag setting back into trace-event-parse.c

Commit 13999e59343b042b0807be2df6ae5895d29782a0 (perf tools: Handle
the case with and without the "signed" trace field) removed code to
set the FIELD_IS_SIGNED flag that was originally added by commit
26a50744b21fff65bd754874072857bee8967f4d (tracing/events: Add 'signed'
field to format files). This adds it back.

Signed-off-by: Tom Zanussi <[email protected]>
---
tools/perf/util/trace-event-parse.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 180368b..0302405 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -946,7 +946,8 @@ static int event_read_fields(struct event *event, struct format_field **fields)
if (read_expect_type(EVENT_ITEM, &token))
goto fail;

- /* add signed type */
+ if (strtoul(token, NULL, 0))
+ field->flags |= FIELD_IS_SIGNED;

free_token(token);
if (read_expected(EVENT_OP, ";") < 0)
--
1.6.4.GIT

2009-11-25 07:15:06

by Tom Zanussi

Subject: [PATCH 2/2] trace/syscalls: Change ret param in struct syscall_trace_exit to long

Commit ee949a86b3aef15845ea677aa60231008de62672 changed the syscall
exit return type to long, but forgot to change it in the struct.

Signed-off-by: Tom Zanussi <[email protected]>
---
kernel/trace/trace.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 5d6398b..ea5dda4 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -100,7 +100,7 @@ struct syscall_trace_enter {
struct syscall_trace_exit {
struct trace_entry ent;
int nr;
- unsigned long ret;
+ long ret;
};

struct kprobe_trace_entry {
--
1.6.4.GIT

2009-11-25 08:32:42

by Tom Zanussi

Subject: [tip:perf/core] perf tools: Add 'signed' flag setting back into trace-event-parse.c

Commit-ID: 0d0bea5ea4a0e91feff22ac5e32e14ff3a682247
Gitweb: http://git.kernel.org/tip/0d0bea5ea4a0e91feff22ac5e32e14ff3a682247
Author: Tom Zanussi <[email protected]>
AuthorDate: Wed, 25 Nov 2009 01:14:58 -0600
Committer: Ingo Molnar <[email protected]>
CommitDate: Wed, 25 Nov 2009 09:06:09 +0100

perf tools: Add 'signed' flag setting back into trace-event-parse.c

Commit 13999e59343b042b0807be2df6ae5895d29782a0 (perf tools:
Handle the case with and without the "signed" trace field)
removed code to set the FIELD_IS_SIGNED flag that was originally
added by commit 26a50744b21fff65bd754874072857bee8967f4d
(tracing/events: Add 'signed' field to format files).

This adds it back.

Signed-off-by: Tom Zanussi <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
tools/perf/util/trace-event-parse.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index eae5605..7021dc1 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -941,7 +941,8 @@ static int event_read_fields(struct event *event, struct format_field **fields)
if (read_expect_type(EVENT_ITEM, &token))
goto fail;

- /* add signed type */
+ if (strtoul(token, NULL, 0))
+ field->flags |= FIELD_IS_SIGNED;

free_token(token);
if (read_expected(EVENT_OP, ";") < 0)

2009-11-25 08:32:46

by Tom Zanussi

Subject: [tip:perf/core] trace/syscalls: Change ret param in struct syscall_trace_exit to long

Commit-ID: 99df5a6a215f026e62287083de2b44b22edd3623
Gitweb: http://git.kernel.org/tip/99df5a6a215f026e62287083de2b44b22edd3623
Author: Tom Zanussi <[email protected]>
AuthorDate: Wed, 25 Nov 2009 01:14:59 -0600
Committer: Ingo Molnar <[email protected]>
CommitDate: Wed, 25 Nov 2009 09:06:10 +0100

trace/syscalls: Change ret param in struct syscall_trace_exit to long

Commit ee949a86b3aef15845ea677aa60231008de62672 ("tracing/syscalls:
Use long for syscall ret format and field definitions") changed the
syscall exit return type to long, but forgot to change it in the
struct.

Signed-off-by: Tom Zanussi <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
kernel/trace/trace.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 4da6ede..1d7f483 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -100,7 +100,7 @@ struct syscall_trace_enter {
struct syscall_trace_exit {
struct trace_entry ent;
int nr;
- unsigned long ret;
+ long ret;
};

struct kprobe_trace_entry {