tools lib traceevent: Support %ps/%pS

PATCH In review Scott Wood 4 participants 4 messages Aug 31, 2015 – Oct 23, 2015

Share & tools

Scott Wood

author

2015-08-31 21:16 UTC #0 lore raw

PATCH 1/1 tools lib traceevent: Support %ps/%pS

Commits such as 65dd297ac25565 ("xfs: %pF is only for function pointers") caused a regression because pretty_print() didn't support %ps/%pS. The current %pf/%pF implementation in pretty_print() is what %ps/%pS is supposed to do, so use the same code for %ps/%pS.

Addressing the incorrect %pf/%pF implementation is beyond the scope of this patch.

Signed-off-by Scott Wood <[email protected]>

---
 tools/lib/traceevent/event-parse.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

tools/lib/traceevent/event-parse.c +2 -2

index cc25f05..f05e5b0 100644
@@ -4761,8 +4761,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
 				else
 					ls = 2;
 
-				if (*(ptr+1) == 'F' ||
-				    *(ptr+1) == 'f') {
+				if (*(ptr+1) == 'F' || *(ptr+1) == 'f' ||
+				    *(ptr+1) == 'S' || *(ptr+1) == 's') {
 					ptr++;
 					show_func = *ptr;
 				} else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') {

Signature · 1 line

2.1.4

Steven Rostedt

Acked-by on v1 1/1

2015-10-22 17:07 UTC #1 lore raw

This fell through the abyss of my INBOX.

Arnaldo, can you take this.

Acked-by Steven Rostedt <[email protected]>

-- Steve

Quoted 28 lines · On Mon, 31 Aug 2015 16:16:37 -0500 Scott Wood <[email protected]> wrote:

Commits such as 65dd297ac25565 ("xfs: %pF is only for function pointers") caused a regression because pretty_print() didn't support %ps/%pS. The current %pf/%pF implementation in pretty_print() is what %ps/%pS is supposed to do, so use the same code for %ps/%pS.
Addressing the incorrect %pf/%pF implementation is beyond the scope of this patch.
Signed-off-by Scott Wood <[email protected]>
---
 tools/lib/traceevent/event-parse.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/traceevent/event-parse.c +2 -2
index cc25f05..f05e5b0 100644
@@ -4761,8 +4761,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
 				else
 					ls = 2;
 
-				if (*(ptr+1) == 'F' ||
-				    *(ptr+1) == 'f') {
+				if (*(ptr+1) == 'F' || *(ptr+1) == 'f' ||
+				    *(ptr+1) == 'S' || *(ptr+1) == 's') {
 					ptr++;
 					show_func = *ptr;
 				} else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') {

Arnaldo Carvalho de Melo

2015-10-22 18:26 UTC #2 lore raw

Em Thu, Oct 22, 2015 at 01:07:29PM -0400, Steven Rostedt escreveu:

Quoted 4 lines

This fell through the abyss of my INBOX.
Arnaldo, can you take this.

Sure

Quoted 36 lines

Acked-by Steven Rostedt <[email protected]>
-- Steve
Quoted 28 lines · On Mon, 31 Aug 2015 16:16:37 -0500 Scott Wood <[email protected]> wrote:
Commits such as 65dd297ac25565 ("xfs: %pF is only for function pointers") caused a regression because pretty_print() didn't support %ps/%pS. The current %pf/%pF implementation in pretty_print() is what %ps/%pS is supposed to do, so use the same code for %ps/%pS.
Addressing the incorrect %pf/%pF implementation is beyond the scope of this patch.
Signed-off-by Scott Wood <[email protected]>
---
 tools/lib/traceevent/event-parse.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/traceevent/event-parse.c +2 -2
index cc25f05..f05e5b0 100644
@@ -4761,8 +4761,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
 				else
 					ls = 2;
 
-				if (*(ptr+1) == 'F' ||
-				    *(ptr+1) == 'f') {
+				if (*(ptr+1) == 'F' || *(ptr+1) == 'f' ||
+				    *(ptr+1) == 'S' || *(ptr+1) == 's') {
 					ptr++;
 					show_func = *ptr;
 				} else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') {

tip-bot for Scott Wood

merge bot

2015-10-23 08:31 UTC #3 lore raw

In reply to Scott Wood

tools lib traceevent: Support %ps/%pS

Commit-ID:  b6bd9c7d543ac160646a667470158c5da319a85c
Gitweb:     http://git.kernel.org/tip/b6bd9c7d543ac160646a667470158c5da319a85c
Author:     Scott Wood <[email protected]>
AuthorDate: Mon, 31 Aug 2015 16:16:37 -0500
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 22 Oct 2015 15:39:42 -0300

tools lib traceevent: Support %ps/%pS

Addressing the incorrect %pf/%pF implementation is beyond the scope of this patch.

Signed-off-by Scott Wood <[email protected]>

Acked-by Steven Rostedt <[email protected]>

Cc Dave Chinner <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/lib/traceevent/event-parse.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

tools/lib/traceevent/event-parse.c +2 -2

index 9aa107a..2a912df 100644
@@ -4905,8 +4905,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
 				else
 					ls = 2;
 
-				if (*(ptr+1) == 'F' ||
-				    *(ptr+1) == 'f') {
+				if (*(ptr+1) == 'F' || *(ptr+1) == 'f' ||
+				    *(ptr+1) == 'S' || *(ptr+1) == 's') {
 					ptr++;
 					show_func = *ptr;
 				} else if (*(ptr+1) == 'M' || *(ptr+1) == 'm') {