libtraceevent: Fix backward compatibility with tep_print_arg_string
PATCH 1/1 libtraceevent: Fix backward compatibility with tep_print_arg_string
From: "Steven Rostedt (Google)" <[email protected]>
It appears that trace-cmd 2.9.6 referenced the tep_print_arg_string to get to the offset, which was removed by libtraceevent commit 512d7be1 ("libtraceevent: Add __rel_loc relative location attribute support"). Add the offset back to both tep_print_arg_string and to tep_print_arg_bitmask (yeah, it adds a hole in the structure), for backward compatibility.
Reported-by Vitaly Chikunov <[email protected]>
Fixes 512d7be1 ("libtraceevent: Add __rel_loc relative location attribute support")
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=215521
Signed-off-by Steven Rostedt (Google) <[email protected]>
--- include/traceevent/event-parse.h | 2 ++ src/event-parse.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)
include/traceevent/event-parse.h +2 -0
@@ -154,11 +154,13 @@ struct tep_print_arg_atom {struct tep_print_arg_string {char *string; +int offset;// for backward compatibility struct tep_format_field *field; };struct tep_print_arg_bitmask {char *bitmask; +int offset;// for backward compatibility struct tep_format_field *field; };
src/event-parse.c +8 -2
@@ -3135,6 +3135,7 @@ process_str(struct tep_event *event __maybe_unused, struct tep_print_arg *arg, arg->type =TEP_PRINT_STRING ; arg->string.string = token; + arg->string.offset =-1 ; arg->string.field =NULL ;if (read_expected (TEP_EVENT_DELIM ,")" ) <0 )
@@ -3164,6 +3165,7 @@ process_bitmask(struct tep_event *event __maybe_unused, struct tep_print_arg *ar arg->type =TEP_PRINT_BITMASK ; arg->bitmask.bitmask = token; + arg->bitmask.offset =-1 ; arg->bitmask.field =NULL ;if (read_expected (TEP_EVENT_DELIM ,")" ) <0 )
@@ -4444,8 +4446,10 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,case TEP_PRINT_TYPE :break ;case TEP_PRINT_STRING : { -if (!arg->string.field) +if (!arg->string.field) { arg->string.field =tep_find_any_field (event, arg->string.string); + arg->string.offset = arg->string.field->offset; + }if (!arg->string.field)break ;dynamic_offset_field (tep, arg->string.field, data, size, &offset, &len);
@@ -4459,8 +4463,10 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,print_str_to_seq (s, format, len_arg, arg->string.string);break ;case TEP_PRINT_BITMASK : { -if (!arg->bitmask.field) +if (!arg->bitmask.field) { arg->bitmask.field =tep_find_any_field (event, arg->bitmask.bitmask); + arg->bitmask.offset = arg->bitmask.field->offset; + }if (!arg->bitmask.field)break ;dynamic_offset_field (tep, arg->bitmask.field, data, size, &offset, &len);
Signature · 1 line
2.33.0