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>
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
#include <string.h>
|
||||
#include <sys/prctl.h>
|
||||
|
||||
typedef int (*bench_fn_t)(int argc, const char **argv, const char *prefix);
|
||||
typedef int (*bench_fn_t)(int argc, const char **argv);
|
||||
|
||||
struct bench {
|
||||
const char *name;
|
||||
@@ -155,7 +155,7 @@ static int bench_str2int(const char *str)
|
||||
* to something meaningful:
|
||||
*/
|
||||
static int run_bench(const char *coll_name, const char *bench_name, bench_fn_t fn,
|
||||
int argc, const char **argv, const char *prefix)
|
||||
int argc, const char **argv)
|
||||
{
|
||||
int size;
|
||||
char *name;
|
||||
@@ -171,7 +171,7 @@ static int run_bench(const char *coll_name, const char *bench_name, bench_fn_t f
|
||||
prctl(PR_SET_NAME, name);
|
||||
argv[0] = name;
|
||||
|
||||
ret = fn(argc, argv, prefix);
|
||||
ret = fn(argc, argv);
|
||||
|
||||
free(name);
|
||||
|
||||
@@ -198,7 +198,7 @@ static void run_collection(struct collection *coll)
|
||||
fflush(stdout);
|
||||
|
||||
argv[1] = bench->name;
|
||||
run_bench(coll->name, bench->name, bench->fn, 1, argv, NULL);
|
||||
run_bench(coll->name, bench->name, bench->fn, 1, argv);
|
||||
printf("\n");
|
||||
}
|
||||
}
|
||||
@@ -211,7 +211,7 @@ static void run_all_collections(void)
|
||||
run_collection(coll);
|
||||
}
|
||||
|
||||
int cmd_bench(int argc, const char **argv, const char *prefix __maybe_unused)
|
||||
int cmd_bench(int argc, const char **argv)
|
||||
{
|
||||
struct collection *coll;
|
||||
int ret = 0;
|
||||
@@ -270,7 +270,7 @@ int cmd_bench(int argc, const char **argv, const char *prefix __maybe_unused)
|
||||
if (bench_format == BENCH_FORMAT_DEFAULT)
|
||||
printf("# Running '%s/%s' benchmark:\n", coll->name, bench->name);
|
||||
fflush(stdout);
|
||||
ret = run_bench(coll->name, bench->name, bench->fn, argc-1, argv+1, prefix);
|
||||
ret = run_bench(coll->name, bench->name, bench->fn, argc-1, argv+1);
|
||||
goto end;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user