perf trace beauty: Always show param if show_zero is set

For some parameters, it is best to also display them when they are 0,
e.g. flags.

Here we only check the show_zero property and let arg printer handle
special cases.

Signed-off-by: Changbin Du <changbin.du@huawei.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240522033542.1359421-2-changbin.du@huawei.com

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 51eca671c797607e24cf3232f0361c38e8543f4f..a36e98c7a1c5a8e9ed66b2788d8b660d319942ed 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2091,17 +2091,11 @@ static size_t syscall__scnprintf_args(struct syscall *sc, char *bf, size_t size,
                        val = syscall_arg_fmt__mask_val(&sc->arg_fmt[arg.idx], &arg, val);
 
                        /*
-                        * Suppress this argument if its value is zero and
-                        * and we don't have a string associated in an
-                        * strarray for it.
-                        */
-                       if (val == 0 &&
-                           !trace->show_zeros &&
-                           !(sc->arg_fmt &&
-                             (sc->arg_fmt[arg.idx].show_zero ||
-                              sc->arg_fmt[arg.idx].scnprintf == SCA_STRARRAY ||
-                              sc->arg_fmt[arg.idx].scnprintf == SCA_STRARRAYS) &&
-                             sc->arg_fmt[arg.idx].parm))
+                        * Suppress this argument if its value is zero and show_zero
+                        * property isn't set.
+                        */
+                       if (val == 0 && !trace->show_zeros &&
+                           !(sc->arg_fmt && sc->arg_fmt[arg.idx].show_zero))
                                continue;
 
                        printed += scnprintf(bf + printed, size - printed, "%s", printed ? ", " : "");
@@ -2796,17 +2790,8 @@ static size_t trace__fprintf_tp_fields(struct trace *trace, struct evsel *evsel,
                 */
                val = syscall_arg_fmt__mask_val(arg, &syscall_arg, val);
 
-               /*
-                * Suppress this argument if its value is zero and
-                * we don't have a string associated in an
-                * strarray for it.
-                */
-               if (val == 0 &&
-                   !trace->show_zeros &&
-                   !((arg->show_zero ||
-                      arg->scnprintf == SCA_STRARRAY ||
-                      arg->scnprintf == SCA_STRARRAYS) &&
-                     arg->parm))
+               /* Suppress this argument if its value is zero and show_zero property isn't set. */
+               if (val == 0 && !trace->show_zeros && !arg->show_zero)
                        continue;
 
                printed += scnprintf(bf + printed, size - printed, "%s", printed ? ", " : "");