Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf tools: Fix usage of the verbose variable

The data type of the verbose variable is integer and can be negative,
replace improperly used cases in a unified manner:
1. if (verbose) => if (verbose > 0)
2. if (!verbose) => if (verbose <= 0)
3. if (XX && verbose) => if (XX && verbose > 0)
4. if (XX && !verbose) => if (XX && verbose <= 0)

Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Carsten Haitzler <carsten.haitzler@arm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin KaFai Lau <martin.lau@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Link: https://lore.kernel.org/r/20221220035702.188413-3-yangjihong1@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Yang Jihong and committed by
Arnaldo Carvalho de Melo
7c0a6144 188ac720

+13 -13
+3 -3
tools/perf/builtin-lock.c
··· 1029 1029 if (!ls) 1030 1030 return -ENOMEM; 1031 1031 1032 - if (aggr_mode == LOCK_AGGR_CALLER && verbose) { 1032 + if (aggr_mode == LOCK_AGGR_CALLER && verbose > 0) { 1033 1033 ls->callstack = get_callstack(sample, max_stack_depth); 1034 1034 if (ls->callstack == NULL) 1035 1035 return -ENOMEM; ··· 1214 1214 for (i = 0; i < BROKEN_MAX; i++) 1215 1215 broken += bad_hist[i]; 1216 1216 1217 - if (quiet || (broken == 0 && !verbose)) 1217 + if (quiet || (broken == 0 && verbose <= 0)) 1218 1218 return; 1219 1219 1220 1220 pr_info("\n=== output for debug===\n\n"); ··· 1529 1529 break; 1530 1530 } 1531 1531 1532 - if (aggr_mode == LOCK_AGGR_CALLER && verbose) { 1532 + if (aggr_mode == LOCK_AGGR_CALLER && verbose > 0) { 1533 1533 struct map *kmap; 1534 1534 struct symbol *sym; 1535 1535 char buf[128];
+2 -2
tools/perf/builtin-record.c
··· 3629 3629 for (t = 0; t < rec->nr_threads; t++) { 3630 3630 __set_bit(perf_cpu_map__cpu(cpus, t).cpu, rec->thread_masks[t].maps.bits); 3631 3631 __set_bit(perf_cpu_map__cpu(cpus, t).cpu, rec->thread_masks[t].affinity.bits); 3632 - if (verbose) { 3632 + if (verbose > 0) { 3633 3633 pr_debug("thread_masks[%d]: ", t); 3634 3634 mmap_cpu_mask__scnprintf(&rec->thread_masks[t].maps, "maps"); 3635 3635 pr_debug("thread_masks[%d]: ", t); ··· 3726 3726 } 3727 3727 rec->thread_masks = thread_masks; 3728 3728 rec->thread_masks[t] = thread_mask; 3729 - if (verbose) { 3729 + if (verbose > 0) { 3730 3730 pr_debug("thread_masks[%d]: ", t); 3731 3731 mmap_cpu_mask__scnprintf(&rec->thread_masks[t].maps, "maps"); 3732 3732 pr_debug("thread_masks[%d]: ", t);
+1 -1
tools/perf/builtin-script.c
··· 2233 2233 if (PRINT_FIELD(METRIC)) 2234 2234 perf_sample__fprint_metric(script, thread, evsel, sample, fp); 2235 2235 2236 - if (verbose) 2236 + if (verbose > 0) 2237 2237 fflush(fp); 2238 2238 } 2239 2239
+2 -2
tools/perf/builtin-stat.c
··· 266 266 evsel__group_desc(leader, buf, sizeof(buf)); 267 267 pr_warning(" %s\n", buf); 268 268 269 - if (verbose) { 269 + if (verbose > 0) { 270 270 cpu_map__snprint(leader->core.cpus, buf, sizeof(buf)); 271 271 pr_warning(" %s: %s\n", leader->name, buf); 272 272 cpu_map__snprint(evsel->core.cpus, buf, sizeof(buf)); ··· 2493 2493 if (iostat_mode == IOSTAT_LIST) { 2494 2494 iostat_list(evsel_list, &stat_config); 2495 2495 goto out; 2496 - } else if (verbose) 2496 + } else if (verbose > 0) 2497 2497 iostat_list(evsel_list, &stat_config); 2498 2498 if (iostat_mode == IOSTAT_RUN && !target__has_cpu(&target)) 2499 2499 target.system_wide = true;
+1 -1
tools/perf/dlfilters/dlfilter-test-api-v0.c
··· 119 119 static int verbose; 120 120 121 121 #define pr_debug(fmt, ...) do { \ 122 - if (verbose) \ 122 + if (verbose > 0) \ 123 123 fprintf(stderr, fmt, ##__VA_ARGS__); \ 124 124 } while (0) 125 125
+1 -1
tools/perf/tests/builtin-test.c
··· 305 305 306 306 path__join(script, sizeof(script) - 3, st->dir, st->file); 307 307 308 - if (verbose) 308 + if (verbose > 0) 309 309 strncat(script, " -v", sizeof(script) - strlen(script) - 1); 310 310 311 311 err = system(script);
+1 -1
tools/perf/tests/dlfilter-test.c
··· 88 88 if (ret <= 0 || ret >= MAXCMD) 89 89 return -1; 90 90 91 - if (!verbose) 91 + if (verbose <= 0) 92 92 strcat(cmd, REDIRECT_TO_DEV_NULL); 93 93 94 94 pr_debug("Command: %s\n", cmd);
+1 -1
tools/perf/util/bpf_lock_contention.c
··· 215 215 break; 216 216 } 217 217 218 - if (verbose) { 218 + if (verbose > 0) { 219 219 st->callstack = memdup(stack_trace, stack_size); 220 220 if (st->callstack == NULL) 221 221 break;
+1 -1
tools/perf/util/dlfilter.c
··· 579 579 if (!get_filter_desc(dirname, entry->d_name, &desc, &long_desc)) 580 580 continue; 581 581 printf(" %-36s %s\n", entry->d_name, desc ? desc : ""); 582 - if (verbose) { 582 + if (verbose > 0) { 583 583 char *p = long_desc; 584 584 char *line; 585 585