perf trace: Consume the augmented_raw_syscalls payload
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 8195168e877948bb9a943ce11ad3e6ee71014bd5 Gitweb: https://git.kernel.org/tip/8195168e877948bb9a943ce11ad3e6ee71014bd5 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 5 Jun 2019 10:34:47 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 5 Jun 2019 10:52:19 -0300
perf trace: Consume the augmented_raw_syscalls payload
To support the SCA_FILENAME beautifier in more than one syscall arg, as needed for syscalls such as the rename* family, we need to, after processing one such arg, bump the augmented pointers so that the next augmented arg don't reuse data for the previous augmented arguments.
Cc Adrian Hunter <[email protected]>
Cc Brendan Gregg <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Luis Cláudio Gonçalves <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-trace.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
tools/perf/builtin-trace.c +10 -1
@@ -1233,8 +1233,17 @@ static void thread__set_filename_pos(struct thread *thread, const char *bf,static size_t syscall_arg__scnprintf_augmented_string (struct syscall_arg *arg,char *bf,size_t size) {struct augmented_arg *augmented_arg = arg->augmented.args; +size_t printed =scnprintf (bf, size,"\"%.*s\"" , augmented_arg->size, augmented_arg->value); +/* +* So that the next arg with a payload can consume its augmented arg, i.e. for rename* syscalls +* we would have two strings, each prefixed by its size. +*/ +int consumed =sizeof (*augmented_arg) + augmented_arg->size; -return scnprintf (bf, size,"\"%.*s\"" , augmented_arg->size, augmented_arg->value); + arg->augmented.args += consumed; + arg->augmented.size -= consumed; + +return printed; } static size_t syscall_arg__scnprintf_filename(char *bf, size_t size,