[PATCH] tools lib traceevent: Support %ps/%pS

[PATCH] tools lib traceevent: Support %ps/%pS

[Scott Wood]

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 <scottwood@freescale.com>
---
 tools/lib/traceevent/event-parse.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index cc25f05..f05e5b0 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -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') {
-- 
2.1.4

Re: [PATCH] tools lib traceevent: Support %ps/%pS

[Steven Rostedt]

This fell through the abyss of my INBOX.

Arnaldo, can you take this.

Acked-by: Steven Rostedt <rostedt@goodmis.org>

-- Steve


On Mon, 31 Aug 2015 16:16:37 -0500
Scott Wood <scottwood@freescale.com> 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 <scottwood@freescale.com>
> ---
>  tools/lib/traceevent/event-parse.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
> index cc25f05..f05e5b0 100644
> --- a/tools/lib/traceevent/event-parse.c
> +++ b/tools/lib/traceevent/event-parse.c
> @@ -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') {

Re: [PATCH] tools lib traceevent: Support %ps/%pS

[Arnaldo Carvalho de Melo]

Em Thu, Oct 22, 2015 at 01:07:29PM -0400, Steven Rostedt escreveu:
> 
> This fell through the abyss of my INBOX.
> 
> Arnaldo, can you take this.

Sure
 
> Acked-by: Steven Rostedt <rostedt@goodmis.org>
> 
> -- Steve
> 
> 
> On Mon, 31 Aug 2015 16:16:37 -0500
> Scott Wood <scottwood@freescale.com> 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 <scottwood@freescale.com>
> > ---
> >  tools/lib/traceevent/event-parse.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
> > index cc25f05..f05e5b0 100644
> > --- a/tools/lib/traceevent/event-parse.c
> > +++ b/tools/lib/traceevent/event-parse.c
> > @@ -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:perf/core] tools lib traceevent: Support %ps/%pS

[tip-bot for Scott Wood]

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

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 <scottwood@freescale.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Dave Chinner <david@fromorbit.com>
Link: http://lkml.kernel.org/r/20150831211637.GA12848@home.buserror.net
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/traceevent/event-parse.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 9aa107a..2a912df 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -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') {