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

perf tools: Remove unused 'prefix' from builtin functions

We got it from the git sources but never used it for anything, with the
place where this would be somehow used remaining:

static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
{
prefix = NULL;
if (p->option & RUN_SETUP)
prefix = NULL; /* setup_perf_directory(); */

Ditch it.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-uw5swz05vol0qpr32c5lpvus@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Arnaldo Carvalho de Melo b0ad8ea6 6963d3c3

+110 -126
+10 -10
tools/perf/bench/bench.h
··· 25 25 # endif 26 26 #endif 27 27 28 - int bench_numa(int argc, const char **argv, const char *prefix); 29 - int bench_sched_messaging(int argc, const char **argv, const char *prefix); 30 - int bench_sched_pipe(int argc, const char **argv, const char *prefix); 31 - int bench_mem_memcpy(int argc, const char **argv, const char *prefix); 32 - int bench_mem_memset(int argc, const char **argv, const char *prefix); 33 - int bench_futex_hash(int argc, const char **argv, const char *prefix); 34 - int bench_futex_wake(int argc, const char **argv, const char *prefix); 35 - int bench_futex_wake_parallel(int argc, const char **argv, const char *prefix); 36 - int bench_futex_requeue(int argc, const char **argv, const char *prefix); 28 + int bench_numa(int argc, const char **argv); 29 + int bench_sched_messaging(int argc, const char **argv); 30 + int bench_sched_pipe(int argc, const char **argv); 31 + int bench_mem_memcpy(int argc, const char **argv); 32 + int bench_mem_memset(int argc, const char **argv); 33 + int bench_futex_hash(int argc, const char **argv); 34 + int bench_futex_wake(int argc, const char **argv); 35 + int bench_futex_wake_parallel(int argc, const char **argv); 36 + int bench_futex_requeue(int argc, const char **argv); 37 37 /* pi futexes */ 38 - int bench_futex_lock_pi(int argc, const char **argv, const char *prefix); 38 + int bench_futex_lock_pi(int argc, const char **argv); 39 39 40 40 #define BENCH_FORMAT_DEFAULT_STR "default" 41 41 #define BENCH_FORMAT_DEFAULT 0
+1 -2
tools/perf/bench/futex-hash.c
··· 114 114 (int) runtime.tv_sec); 115 115 } 116 116 117 - int bench_futex_hash(int argc, const char **argv, 118 - const char *prefix __maybe_unused) 117 + int bench_futex_hash(int argc, const char **argv) 119 118 { 120 119 int ret = 0; 121 120 cpu_set_t cpu;
+1 -2
tools/perf/bench/futex-lock-pi.c
··· 140 140 } 141 141 } 142 142 143 - int bench_futex_lock_pi(int argc, const char **argv, 144 - const char *prefix __maybe_unused) 143 + int bench_futex_lock_pi(int argc, const char **argv) 145 144 { 146 145 int ret = 0; 147 146 unsigned int i;
+1 -2
tools/perf/bench/futex-requeue.c
··· 109 109 done = true; 110 110 } 111 111 112 - int bench_futex_requeue(int argc, const char **argv, 113 - const char *prefix __maybe_unused) 112 + int bench_futex_requeue(int argc, const char **argv) 114 113 { 115 114 int ret = 0; 116 115 unsigned int i, j;
+1 -2
tools/perf/bench/futex-wake-parallel.c
··· 197 197 done = true; 198 198 } 199 199 200 - int bench_futex_wake_parallel(int argc, const char **argv, 201 - const char *prefix __maybe_unused) 200 + int bench_futex_wake_parallel(int argc, const char **argv) 202 201 { 203 202 int ret = 0; 204 203 unsigned int i, j;
+1 -2
tools/perf/bench/futex-wake.c
··· 115 115 done = true; 116 116 } 117 117 118 - int bench_futex_wake(int argc, const char **argv, 119 - const char *prefix __maybe_unused) 118 + int bench_futex_wake(int argc, const char **argv) 120 119 { 121 120 int ret = 0; 122 121 unsigned int i, j;
+2 -2
tools/perf/bench/mem-functions.c
··· 284 284 NULL 285 285 }; 286 286 287 - int bench_mem_memcpy(int argc, const char **argv, const char *prefix __maybe_unused) 287 + int bench_mem_memcpy(int argc, const char **argv) 288 288 { 289 289 struct bench_mem_info info = { 290 290 .functions = memcpy_functions, ··· 358 358 { .name = NULL, } 359 359 }; 360 360 361 - int bench_mem_memset(int argc, const char **argv, const char *prefix __maybe_unused) 361 + int bench_mem_memset(int argc, const char **argv) 362 362 { 363 363 struct bench_mem_info info = { 364 364 .functions = memset_functions,
+1 -1
tools/perf/bench/numa.c
··· 1767 1767 return 0; 1768 1768 } 1769 1769 1770 - int bench_numa(int argc, const char **argv, const char *prefix __maybe_unused) 1770 + int bench_numa(int argc, const char **argv) 1771 1771 { 1772 1772 init_params(&p0, "main,", argc, argv); 1773 1773 argc = parse_options(argc, argv, options, bench_numa_usage, 0);
+1 -2
tools/perf/bench/sched-messaging.c
··· 260 260 NULL 261 261 }; 262 262 263 - int bench_sched_messaging(int argc, const char **argv, 264 - const char *prefix __maybe_unused) 263 + int bench_sched_messaging(int argc, const char **argv) 265 264 { 266 265 unsigned int i, total_children; 267 266 struct timeval start, stop, diff;
+1 -1
tools/perf/bench/sched-pipe.c
··· 76 76 return NULL; 77 77 } 78 78 79 - int bench_sched_pipe(int argc, const char **argv, const char *prefix __maybe_unused) 79 + int bench_sched_pipe(int argc, const char **argv) 80 80 { 81 81 struct thread_data threads[2], *td; 82 82 int pipe_1[2], pipe_2[2];
+1 -1
tools/perf/builtin-annotate.c
··· 383 383 NULL 384 384 }; 385 385 386 - int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 386 + int cmd_annotate(int argc, const char **argv) 387 387 { 388 388 struct perf_annotate annotate = { 389 389 .tool = {
+6 -6
tools/perf/builtin-bench.c
··· 25 25 #include <string.h> 26 26 #include <sys/prctl.h> 27 27 28 - typedef int (*bench_fn_t)(int argc, const char **argv, const char *prefix); 28 + typedef int (*bench_fn_t)(int argc, const char **argv); 29 29 30 30 struct bench { 31 31 const char *name; ··· 155 155 * to something meaningful: 156 156 */ 157 157 static int run_bench(const char *coll_name, const char *bench_name, bench_fn_t fn, 158 - int argc, const char **argv, const char *prefix) 158 + int argc, const char **argv) 159 159 { 160 160 int size; 161 161 char *name; ··· 171 171 prctl(PR_SET_NAME, name); 172 172 argv[0] = name; 173 173 174 - ret = fn(argc, argv, prefix); 174 + ret = fn(argc, argv); 175 175 176 176 free(name); 177 177 ··· 198 198 fflush(stdout); 199 199 200 200 argv[1] = bench->name; 201 - run_bench(coll->name, bench->name, bench->fn, 1, argv, NULL); 201 + run_bench(coll->name, bench->name, bench->fn, 1, argv); 202 202 printf("\n"); 203 203 } 204 204 } ··· 211 211 run_collection(coll); 212 212 } 213 213 214 - int cmd_bench(int argc, const char **argv, const char *prefix __maybe_unused) 214 + int cmd_bench(int argc, const char **argv) 215 215 { 216 216 struct collection *coll; 217 217 int ret = 0; ··· 270 270 if (bench_format == BENCH_FORMAT_DEFAULT) 271 271 printf("# Running '%s/%s' benchmark:\n", coll->name, bench->name); 272 272 fflush(stdout); 273 - ret = run_bench(coll->name, bench->name, bench->fn, argc-1, argv+1, prefix); 273 + ret = run_bench(coll->name, bench->name, bench->fn, argc-1, argv+1); 274 274 goto end; 275 275 } 276 276
+1 -2
tools/perf/builtin-buildid-cache.c
··· 276 276 return err; 277 277 } 278 278 279 - int cmd_buildid_cache(int argc, const char **argv, 280 - const char *prefix __maybe_unused) 279 + int cmd_buildid_cache(int argc, const char **argv) 281 280 { 282 281 struct strlist *list; 283 282 struct str_node *pos;
+1 -2
tools/perf/builtin-buildid-list.c
··· 87 87 return 0; 88 88 } 89 89 90 - int cmd_buildid_list(int argc, const char **argv, 91 - const char *prefix __maybe_unused) 90 + int cmd_buildid_list(int argc, const char **argv) 92 91 { 93 92 bool show_kernel = false; 94 93 bool with_hits = false;
+2 -2
tools/perf/builtin-c2c.c
··· 2755 2755 pr_debug("\n"); 2756 2756 } 2757 2757 2758 - ret = cmd_record(i, rec_argv, NULL); 2758 + ret = cmd_record(i, rec_argv); 2759 2759 free(rec_argv); 2760 2760 return ret; 2761 2761 } 2762 2762 2763 - int cmd_c2c(int argc, const char **argv, const char *prefix __maybe_unused) 2763 + int cmd_c2c(int argc, const char **argv) 2764 2764 { 2765 2765 argc = parse_options(argc, argv, c2c_options, c2c_usage, 2766 2766 PARSE_OPT_STOP_AT_NON_OPTION);
+1 -1
tools/perf/builtin-config.c
··· 154 154 return 0; 155 155 } 156 156 157 - int cmd_config(int argc, const char **argv, const char *prefix __maybe_unused) 157 + int cmd_config(int argc, const char **argv) 158 158 { 159 159 int i, ret = 0; 160 160 struct perf_config_set *set;
+4 -5
tools/perf/builtin-data.c
··· 6 6 #include "data-convert.h" 7 7 #include "data-convert-bt.h" 8 8 9 - typedef int (*data_cmd_fn_t)(int argc, const char **argv, const char *prefix); 9 + typedef int (*data_cmd_fn_t)(int argc, const char **argv); 10 10 11 11 struct data_cmd { 12 12 const char *name; ··· 50 50 NULL 51 51 }; 52 52 53 - static int cmd_data_convert(int argc, const char **argv, 54 - const char *prefix __maybe_unused) 53 + static int cmd_data_convert(int argc, const char **argv) 55 54 { 56 55 const char *to_ctf = NULL; 57 56 struct perf_data_convert_opts opts = { ··· 97 98 { .name = NULL, }, 98 99 }; 99 100 100 - int cmd_data(int argc, const char **argv, const char *prefix) 101 + int cmd_data(int argc, const char **argv) 101 102 { 102 103 struct data_cmd *cmd; 103 104 const char *cmdstr; ··· 117 118 if (strcmp(cmd->name, cmdstr)) 118 119 continue; 119 120 120 - return cmd->fn(argc, argv, prefix); 121 + return cmd->fn(argc, argv); 121 122 } 122 123 123 124 pr_err("Unknown command: %s\n", cmdstr);
+1 -1
tools/perf/builtin-diff.c
··· 1321 1321 return 0; 1322 1322 } 1323 1323 1324 - int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused) 1324 + int cmd_diff(int argc, const char **argv) 1325 1325 { 1326 1326 int ret = hists__init(); 1327 1327
+1 -1
tools/perf/builtin-evlist.c
··· 46 46 return 0; 47 47 } 48 48 49 - int cmd_evlist(int argc, const char **argv, const char *prefix __maybe_unused) 49 + int cmd_evlist(int argc, const char **argv) 50 50 { 51 51 struct perf_attr_details details = { .verbose = false, }; 52 52 const struct option options[] = {
+1 -1
tools/perf/builtin-ftrace.c
··· 304 304 return -1; 305 305 } 306 306 307 - int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused) 307 + int cmd_ftrace(int argc, const char **argv) 308 308 { 309 309 int ret; 310 310 struct perf_ftrace ftrace = {
+1 -1
tools/perf/builtin-help.c
··· 418 418 return 0; 419 419 } 420 420 421 - int cmd_help(int argc, const char **argv, const char *prefix __maybe_unused) 421 + int cmd_help(int argc, const char **argv) 422 422 { 423 423 bool show_all = false; 424 424 enum help_format help_format = HELP_FORMAT_MAN;
+1 -1
tools/perf/builtin-inject.c
··· 738 738 return ret; 739 739 } 740 740 741 - int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 741 + int cmd_inject(int argc, const char **argv) 742 742 { 743 743 struct perf_inject inject = { 744 744 .tool = {
+1 -1
tools/perf/builtin-kallsyms.c
··· 43 43 return 0; 44 44 } 45 45 46 - int cmd_kallsyms(int argc, const char **argv, const char *prefix __maybe_unused) 46 + int cmd_kallsyms(int argc, const char **argv) 47 47 { 48 48 const struct option options[] = { 49 49 OPT_INCR('v', "verbose", &verbose, "be more verbose (show counter open errors, etc)"),
+2 -2
tools/perf/builtin-kmem.c
··· 1866 1866 for (j = 1; j < (unsigned int)argc; j++, i++) 1867 1867 rec_argv[i] = argv[j]; 1868 1868 1869 - return cmd_record(i, rec_argv, NULL); 1869 + return cmd_record(i, rec_argv); 1870 1870 } 1871 1871 1872 1872 static int kmem_config(const char *var, const char *value, void *cb __maybe_unused) ··· 1885 1885 return 0; 1886 1886 } 1887 1887 1888 - int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) 1888 + int cmd_kmem(int argc, const char **argv) 1889 1889 { 1890 1890 const char * const default_slab_sort = "frag,hit,bytes"; 1891 1891 const char * const default_page_sort = "bytes,hit";
+8 -8
tools/perf/builtin-kvm.c
··· 1209 1209 set_option_flag(record_options, 0, "transaction", PARSE_OPT_DISABLED); 1210 1210 1211 1211 record_usage = kvm_stat_record_usage; 1212 - return cmd_record(i, rec_argv, NULL); 1212 + return cmd_record(i, rec_argv); 1213 1213 } 1214 1214 1215 1215 static int ··· 1477 1477 #endif 1478 1478 1479 1479 perf_stat: 1480 - return cmd_stat(argc, argv, NULL); 1480 + return cmd_stat(argc, argv); 1481 1481 } 1482 1482 #endif /* HAVE_KVM_STAT_SUPPORT */ 1483 1483 ··· 1496 1496 1497 1497 BUG_ON(i != rec_argc); 1498 1498 1499 - return cmd_record(i, rec_argv, NULL); 1499 + return cmd_record(i, rec_argv); 1500 1500 } 1501 1501 1502 1502 static int __cmd_report(const char *file_name, int argc, const char **argv) ··· 1514 1514 1515 1515 BUG_ON(i != rec_argc); 1516 1516 1517 - return cmd_report(i, rec_argv, NULL); 1517 + return cmd_report(i, rec_argv); 1518 1518 } 1519 1519 1520 1520 static int ··· 1533 1533 1534 1534 BUG_ON(i != rec_argc); 1535 1535 1536 - return cmd_buildid_list(i, rec_argv, NULL); 1536 + return cmd_buildid_list(i, rec_argv); 1537 1537 } 1538 1538 1539 - int cmd_kvm(int argc, const char **argv, const char *prefix __maybe_unused) 1539 + int cmd_kvm(int argc, const char **argv) 1540 1540 { 1541 1541 const char *file_name = NULL; 1542 1542 const struct option kvm_options[] = { ··· 1591 1591 else if (!strncmp(argv[0], "rep", 3)) 1592 1592 return __cmd_report(file_name, argc, argv); 1593 1593 else if (!strncmp(argv[0], "diff", 4)) 1594 - return cmd_diff(argc, argv, NULL); 1594 + return cmd_diff(argc, argv); 1595 1595 else if (!strncmp(argv[0], "top", 3)) 1596 - return cmd_top(argc, argv, NULL); 1596 + return cmd_top(argc, argv); 1597 1597 else if (!strncmp(argv[0], "buildid-list", 12)) 1598 1598 return __cmd_buildid_list(file_name, argc, argv); 1599 1599 #ifdef HAVE_KVM_STAT_SUPPORT
+1 -1
tools/perf/builtin-list.c
··· 20 20 static bool desc_flag = true; 21 21 static bool details_flag; 22 22 23 - int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) 23 + int cmd_list(int argc, const char **argv) 24 24 { 25 25 int i; 26 26 bool raw_dump = false;
+3 -3
tools/perf/builtin-lock.c
··· 941 941 942 942 BUG_ON(i != rec_argc); 943 943 944 - ret = cmd_record(i, rec_argv, NULL); 944 + ret = cmd_record(i, rec_argv); 945 945 free(rec_argv); 946 946 return ret; 947 947 } 948 948 949 - int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused) 949 + int cmd_lock(int argc, const char **argv) 950 950 { 951 951 const struct option lock_options[] = { 952 952 OPT_STRING('i', "input", &input_name, "file", "input file name"), ··· 1009 1009 rc = __cmd_report(false); 1010 1010 } else if (!strcmp(argv[0], "script")) { 1011 1011 /* Aliased to 'perf script' */ 1012 - return cmd_script(argc, argv, prefix); 1012 + return cmd_script(argc, argv); 1013 1013 } else if (!strcmp(argv[0], "info")) { 1014 1014 if (argc) { 1015 1015 argc = parse_options(argc, argv,
+3 -3
tools/perf/builtin-mem.c
··· 129 129 pr_debug("\n"); 130 130 } 131 131 132 - ret = cmd_record(i, rec_argv, NULL); 132 + ret = cmd_record(i, rec_argv); 133 133 free(rec_argv); 134 134 return ret; 135 135 } ··· 256 256 for (j = 1; j < argc; j++, i++) 257 257 rep_argv[i] = argv[j]; 258 258 259 - ret = cmd_report(i, rep_argv, NULL); 259 + ret = cmd_report(i, rep_argv); 260 260 free(rep_argv); 261 261 return ret; 262 262 } ··· 330 330 return ret; 331 331 } 332 332 333 - int cmd_mem(int argc, const char **argv, const char *prefix __maybe_unused) 333 + int cmd_mem(int argc, const char **argv) 334 334 { 335 335 struct stat st; 336 336 struct perf_mem mem = {
+3 -3
tools/perf/builtin-probe.c
··· 468 468 469 469 470 470 static int 471 - __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) 471 + __cmd_probe(int argc, const char **argv) 472 472 { 473 473 const char * const probe_usage[] = { 474 474 "perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]", ··· 687 687 return 0; 688 688 } 689 689 690 - int cmd_probe(int argc, const char **argv, const char *prefix) 690 + int cmd_probe(int argc, const char **argv) 691 691 { 692 692 int ret; 693 693 694 694 ret = init_params(); 695 695 if (!ret) { 696 - ret = __cmd_probe(argc, argv, prefix); 696 + ret = __cmd_probe(argc, argv); 697 697 cleanup_params(); 698 698 } 699 699
+1 -1
tools/perf/builtin-record.c
··· 1667 1667 1668 1668 struct option *record_options = __record_options; 1669 1669 1670 - int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) 1670 + int cmd_record(int argc, const char **argv) 1671 1671 { 1672 1672 int err; 1673 1673 struct record *rec = &record;
+1 -1
tools/perf/builtin-report.c
··· 681 681 CALLCHAIN_REPORT_HELP 682 682 "\n\t\t\t\tDefault: " CALLCHAIN_DEFAULT_OPT; 683 683 684 - int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 684 + int cmd_report(int argc, const char **argv) 685 685 { 686 686 struct perf_session *session; 687 687 struct itrace_synth_opts itrace_synth_opts = { .set = 0, };
+3 -3
tools/perf/builtin-sched.c
··· 3272 3272 3273 3273 BUG_ON(i != rec_argc); 3274 3274 3275 - return cmd_record(i, rec_argv, NULL); 3275 + return cmd_record(i, rec_argv); 3276 3276 } 3277 3277 3278 - int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) 3278 + int cmd_sched(int argc, const char **argv) 3279 3279 { 3280 3280 const char default_sort_order[] = "avg, max, switch, runtime"; 3281 3281 struct perf_sched sched = { ··· 3412 3412 * Aliased to 'perf script' for now: 3413 3413 */ 3414 3414 if (!strcmp(argv[0], "script")) 3415 - return cmd_script(argc, argv, prefix); 3415 + return cmd_script(argc, argv); 3416 3416 3417 3417 if (!strncmp(argv[0], "rec", 3)) { 3418 3418 return __cmd_record(argc, argv);
+2 -2
tools/perf/builtin-script.c
··· 2359 2359 return set_maps(script); 2360 2360 } 2361 2361 2362 - int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) 2362 + int cmd_script(int argc, const char **argv) 2363 2363 { 2364 2364 bool show_full_info = false; 2365 2365 bool header = false; ··· 2504 2504 if (argc > 1 && !strncmp(argv[0], "rec", strlen("rec"))) { 2505 2505 rec_script_path = get_script_path(argv[1], RECORD_SUFFIX); 2506 2506 if (!rec_script_path) 2507 - return cmd_record(argc, argv, NULL); 2507 + return cmd_record(argc, argv); 2508 2508 } 2509 2509 2510 2510 if (argc > 1 && !strncmp(argv[0], "rep", strlen("rep"))) {
+1 -1
tools/perf/builtin-stat.c
··· 2478 2478 } 2479 2479 } 2480 2480 2481 - int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) 2481 + int cmd_stat(int argc, const char **argv) 2482 2482 { 2483 2483 const char * const stat_usage[] = { 2484 2484 "perf stat [<options>] [<command>]",
+3 -4
tools/perf/builtin-timechart.c
··· 1773 1773 for (i = 0; i < (unsigned int)argc; i++) 1774 1774 *p++ = argv[i]; 1775 1775 1776 - return cmd_record(rec_argc, rec_argv, NULL); 1776 + return cmd_record(rec_argc, rec_argv); 1777 1777 } 1778 1778 1779 1779 ··· 1864 1864 for (j = 0; j < (unsigned int)argc; j++) 1865 1865 *p++ = argv[j]; 1866 1866 1867 - return cmd_record(rec_argc, rec_argv, NULL); 1867 + return cmd_record(rec_argc, rec_argv); 1868 1868 } 1869 1869 1870 1870 static int ··· 1917 1917 return 0; 1918 1918 } 1919 1919 1920 - int cmd_timechart(int argc, const char **argv, 1921 - const char *prefix __maybe_unused) 1920 + int cmd_timechart(int argc, const char **argv) 1922 1921 { 1923 1922 struct timechart tchart = { 1924 1923 .tool = {
+1 -1
tools/perf/builtin-top.c
··· 1075 1075 const char top_callchain_help[] = CALLCHAIN_RECORD_HELP CALLCHAIN_REPORT_HELP 1076 1076 "\n\t\t\t\tDefault: fp,graph,0.5,caller,function"; 1077 1077 1078 - int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 1078 + int cmd_top(int argc, const char **argv) 1079 1079 { 1080 1080 char errbuf[BUFSIZ]; 1081 1081 struct perf_top top = {
+2 -2
tools/perf/builtin-trace.c
··· 1993 1993 for (i = 0; i < (unsigned int)argc; i++) 1994 1994 rec_argv[j++] = argv[i]; 1995 1995 1996 - return cmd_record(j, rec_argv, NULL); 1996 + return cmd_record(j, rec_argv); 1997 1997 } 1998 1998 1999 1999 static size_t trace__fprintf_thread_summary(struct trace *trace, FILE *fp); ··· 2791 2791 return err; 2792 2792 } 2793 2793 2794 - int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) 2794 + int cmd_trace(int argc, const char **argv) 2795 2795 { 2796 2796 const char *trace_usage[] = { 2797 2797 "perf trace [<options>] [<command>]",
+1 -2
tools/perf/builtin-version.c
··· 2 2 #include "builtin.h" 3 3 #include "perf.h" 4 4 5 - int cmd_version(int argc __maybe_unused, const char **argv __maybe_unused, 6 - const char *prefix __maybe_unused) 5 + int cmd_version(int argc __maybe_unused, const char **argv __maybe_unused) 7 6 { 8 7 printf("perf version %s\n", perf_version_string); 9 8 return 0;
+29 -29
tools/perf/builtin.h
··· 13 13 int read_line_with_nul(char *buf, int size, FILE *file); 14 14 int check_pager_config(const char *cmd); 15 15 16 - int cmd_annotate(int argc, const char **argv, const char *prefix); 17 - int cmd_bench(int argc, const char **argv, const char *prefix); 18 - int cmd_buildid_cache(int argc, const char **argv, const char *prefix); 19 - int cmd_buildid_list(int argc, const char **argv, const char *prefix); 20 - int cmd_config(int argc, const char **argv, const char *prefix); 21 - int cmd_c2c(int argc, const char **argv, const char *prefix); 22 - int cmd_diff(int argc, const char **argv, const char *prefix); 23 - int cmd_evlist(int argc, const char **argv, const char *prefix); 24 - int cmd_help(int argc, const char **argv, const char *prefix); 25 - int cmd_sched(int argc, const char **argv, const char *prefix); 26 - int cmd_kallsyms(int argc, const char **argv, const char *prefix); 27 - int cmd_list(int argc, const char **argv, const char *prefix); 28 - int cmd_record(int argc, const char **argv, const char *prefix); 29 - int cmd_report(int argc, const char **argv, const char *prefix); 30 - int cmd_stat(int argc, const char **argv, const char *prefix); 31 - int cmd_timechart(int argc, const char **argv, const char *prefix); 32 - int cmd_top(int argc, const char **argv, const char *prefix); 33 - int cmd_script(int argc, const char **argv, const char *prefix); 34 - int cmd_version(int argc, const char **argv, const char *prefix); 35 - int cmd_probe(int argc, const char **argv, const char *prefix); 36 - int cmd_kmem(int argc, const char **argv, const char *prefix); 37 - int cmd_lock(int argc, const char **argv, const char *prefix); 38 - int cmd_kvm(int argc, const char **argv, const char *prefix); 39 - int cmd_test(int argc, const char **argv, const char *prefix); 40 - int cmd_trace(int argc, const char **argv, const char *prefix); 41 - int cmd_inject(int argc, const char **argv, const char *prefix); 42 - int cmd_mem(int argc, const char **argv, const char *prefix); 43 - int cmd_data(int argc, const char **argv, const char *prefix); 44 - int cmd_ftrace(int argc, const char **argv, const char *prefix); 16 + int cmd_annotate(int argc, const char **argv); 17 + int cmd_bench(int argc, const char **argv); 18 + int cmd_buildid_cache(int argc, const char **argv); 19 + int cmd_buildid_list(int argc, const char **argv); 20 + int cmd_config(int argc, const char **argv); 21 + int cmd_c2c(int argc, const char **argv); 22 + int cmd_diff(int argc, const char **argv); 23 + int cmd_evlist(int argc, const char **argv); 24 + int cmd_help(int argc, const char **argv); 25 + int cmd_sched(int argc, const char **argv); 26 + int cmd_kallsyms(int argc, const char **argv); 27 + int cmd_list(int argc, const char **argv); 28 + int cmd_record(int argc, const char **argv); 29 + int cmd_report(int argc, const char **argv); 30 + int cmd_stat(int argc, const char **argv); 31 + int cmd_timechart(int argc, const char **argv); 32 + int cmd_top(int argc, const char **argv); 33 + int cmd_script(int argc, const char **argv); 34 + int cmd_version(int argc, const char **argv); 35 + int cmd_probe(int argc, const char **argv); 36 + int cmd_kmem(int argc, const char **argv); 37 + int cmd_lock(int argc, const char **argv); 38 + int cmd_kvm(int argc, const char **argv); 39 + int cmd_test(int argc, const char **argv); 40 + int cmd_trace(int argc, const char **argv); 41 + int cmd_inject(int argc, const char **argv); 42 + int cmd_mem(int argc, const char **argv); 43 + int cmd_data(int argc, const char **argv); 44 + int cmd_ftrace(int argc, const char **argv); 45 45 46 46 int find_scripts(char **scripts_array, char **scripts_path_array); 47 47 #endif
+3 -8
tools/perf/perf.c
··· 34 34 35 35 struct cmd_struct { 36 36 const char *cmd; 37 - int (*fn)(int, const char **, const char *); 37 + int (*fn)(int, const char **); 38 38 int option; 39 39 }; 40 40 ··· 339 339 { 340 340 int status; 341 341 struct stat st; 342 - const char *prefix; 343 342 char sbuf[STRERR_BUFSIZE]; 344 - 345 - prefix = NULL; 346 - if (p->option & RUN_SETUP) 347 - prefix = NULL; /* setup_perf_directory(); */ 348 343 349 344 if (use_browser == -1) 350 345 use_browser = check_browser_config(p->cmd); ··· 351 356 commit_pager_choice(); 352 357 353 358 perf_env__set_cmdline(&perf_env, argc, argv); 354 - status = p->fn(argc, argv, prefix); 359 + status = p->fn(argc, argv); 355 360 perf_config__exit(); 356 361 exit_browser(status); 357 362 perf_env__exit(&perf_env); ··· 561 566 #ifdef HAVE_LIBAUDIT_SUPPORT 562 567 setup_path(); 563 568 argv[0] = "trace"; 564 - return cmd_trace(argc, argv, NULL); 569 + return cmd_trace(argc, argv); 565 570 #else 566 571 fprintf(stderr, 567 572 "trace command not available: missing audit-libs devel package at build time.\n");
+1 -1
tools/perf/tests/builtin-test.c
··· 464 464 return 0; 465 465 } 466 466 467 - int cmd_test(int argc, const char **argv, const char *prefix __maybe_unused) 467 + int cmd_test(int argc, const char **argv) 468 468 { 469 469 const char *test_usage[] = { 470 470 "perf test [<options>] [{list <test-name-fragment>|[<test-name-fragments>|<test-numbers>]}]",