Skip to contentSkip to conversation

tracing: minor fixes

PATCH In review Tom Zanussi 1 participant 5 messages Nov 25, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover 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(-)
#1 lore raw

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.

---
 tools/perf/util/trace-event-parse.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
tools/perf/util/trace-event-parse.c +2 -1
index 180368b..0302405 100644
@@ -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)
Signature · 1 line
1.6.4.GIT
#2 lore raw

[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.

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]>

---
 tools/perf/util/trace-event-parse.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
tools/perf/util/trace-event-parse.c +2 -1
index eae5605..7021dc1 100644
@@ -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)
#3 lore raw

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

In reply to Tom Zanussi

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

---
 kernel/trace/trace.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace.h +1 -1
index 5d6398b..ea5dda4 100644
@@ -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 {
Signature · 1 line
1.6.4.GIT
#4 lore raw

[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.

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]>

---
 kernel/trace/trace.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace.h +1 -1
index 4da6ede..1d7f483 100644
@@ -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 {