[PATCH resend] libtraceevent: fix parsing event argument types

[PATCH resend] libtraceevent: fix parsing event argument types

[Konstantin Khlebnikov]

Add missing "%o" and "%X". Ext4 events use "%o" for printing i_mode.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
---
 tools/lib/traceevent/event-parse.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index d948475585ce..beaa8b8c08ff 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4395,8 +4395,10 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s
 				/* fall through */
 			case 'd':
 			case 'u':
-			case 'x':
 			case 'i':
+			case 'x':
+			case 'X':
+			case 'o':
 				switch (ls) {
 				case 0:
 					vsize = 4;
@@ -5078,10 +5080,11 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e
 
 				/* fall through */
 			case 'd':
+			case 'u':
 			case 'i':
 			case 'x':
 			case 'X':
-			case 'u':
+			case 'o':
 				if (!arg) {
 					do_warning_event(event, "no argument match");
 					event->flags |= TEP_EVENT_FL_FAILED;

Re: [PATCH resend] libtraceevent: fix parsing event argument types

[Steven Rostedt]

On Sun, 10 Nov 2019 13:11:01 +0300
Konstantin Khlebnikov <khlebnikov@yandex-team.ru> wrote:

> Add missing "%o" and "%X". Ext4 events use "%o" for printing i_mode.

Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

Arnaldo, can you take this?

Thanks! (this time I mean it ;)

-- Steve

> 
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
> ---
>  tools/lib/traceevent/event-parse.c |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
> index d948475585ce..beaa8b8c08ff 100644
> --- a/tools/lib/traceevent/event-parse.c
> +++ b/tools/lib/traceevent/event-parse.c
> @@ -4395,8 +4395,10 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s
>  				/* fall through */
>  			case 'd':
>  			case 'u':
> -			case 'x':
>  			case 'i':
> +			case 'x':
> +			case 'X':
> +			case 'o':
>  				switch (ls) {
>  				case 0:
>  					vsize = 4;
> @@ -5078,10 +5080,11 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e
>  
>  				/* fall through */
>  			case 'd':
> +			case 'u':
>  			case 'i':
>  			case 'x':
>  			case 'X':
> -			case 'u':
> +			case 'o':
>  				if (!arg) {
>  					do_warning_event(event, "no argument match");
>  					event->flags |= TEP_EVENT_FL_FAILED;

[tip: perf/core] libtraceevent: Fix parsing of event %o and %X argument types

[tip-bot2 for Konstantin Khlebnikov]

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     10f64581b1b79f3b0121c987e9ef272195940bf7
Gitweb:        https://git.kernel.org/tip/10f64581b1b79f3b0121c987e9ef272195940bf7
Author:        Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
AuthorDate:    Sun, 10 Nov 2019 13:11:01 +03:00
Committer:     Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Mon, 18 Nov 2019 13:01:59 -03:00

libtraceevent: Fix parsing of event %o and %X argument types

Add missing "%o" and "%X". Ext4 events use "%o" for printing i_mode.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Link: http://lore.kernel.org/lkml/157338066113.6548.11461421296091086041.stgit@buzz
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/traceevent/event-parse.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index d948475..beaa8b8 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4395,8 +4395,10 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s
 				/* fall through */
 			case 'd':
 			case 'u':
-			case 'x':
 			case 'i':
+			case 'x':
+			case 'X':
+			case 'o':
 				switch (ls) {
 				case 0:
 					vsize = 4;
@@ -5078,10 +5080,11 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e
 
 				/* fall through */
 			case 'd':
+			case 'u':
 			case 'i':
 			case 'x':
 			case 'X':
-			case 'u':
+			case 'o':
 				if (!arg) {
 					do_warning_event(event, "no argument match");
 					event->flags |= TEP_EVENT_FL_FAILED;