Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e861964a authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Remove --perf-dir and --work-dir 

Completely unused in perf, carried along all this time from the initial
copy of git infrastructure, ditch'em.

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-wtiln26gyqndprmkl0kdswvi@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 814b3f51

tools/perf/perf.c

+0 −36
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ struct option options[] = { 
	OPT_ARGUMENT("html-path", "html-path"),

	OPT_ARGUMENT("paginate", "paginate"),

	OPT_ARGUMENT("no-pager", "no-pager"),

	OPT_ARGUMENT("perf-dir", "perf-dir"),

	OPT_ARGUMENT("work-tree", "work-tree"),

	OPT_ARGUMENT("debugfs-dir", "debugfs-dir"),

	OPT_ARGUMENT("buildid-dir", "buildid-dir"),

	OPT_ARGUMENT("list-cmds", "list-cmds"),
@@ -200,35 +198,6 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) 
			use_pager = 0;

			if (envchanged)

				*envchanged = 1;

		} else if (!strcmp(cmd, "--perf-dir")) {

			if (*argc < 2) {

				fprintf(stderr, "No directory given for --perf-dir.\n");

				usage(perf_usage_string);

			}

			setenv(PERF_DIR_ENVIRONMENT, (*argv)[1], 1);

			if (envchanged)

				*envchanged = 1;

			(*argv)++;

			(*argc)--;

			handled++;

		} else if (!prefixcmp(cmd, CMD_PERF_DIR)) {

			setenv(PERF_DIR_ENVIRONMENT, cmd + strlen(CMD_PERF_DIR), 1);

			if (envchanged)

				*envchanged = 1;

		} else if (!strcmp(cmd, "--work-tree")) {

			if (*argc < 2) {

				fprintf(stderr, "No directory given for --work-tree.\n");

				usage(perf_usage_string);

			}

			setenv(PERF_WORK_TREE_ENVIRONMENT, (*argv)[1], 1);

			if (envchanged)

				*envchanged = 1;

			(*argv)++;

			(*argc)--;

		} else if (!prefixcmp(cmd, CMD_WORK_TREE)) {

			setenv(PERF_WORK_TREE_ENVIRONMENT, cmd + strlen(CMD_WORK_TREE), 1);

			if (envchanged)

				*envchanged = 1;

		} else if (!strcmp(cmd, "--debugfs-dir")) {

			if (*argc < 2) {

				fprintf(stderr, "No directory given for --debugfs-dir.\n");
@@ -363,11 +332,6 @@ const char perf_version_string[] = PERF_VERSION; 


#define RUN_SETUP	(1<<0)

#define USE_PAGER	(1<<1)

/*

 * require working tree to be present -- anything uses this needs

 * RUN_SETUP for reading from the configuration file.

 */

#define NEED_WORK_TREE	(1<<2)



static int run_builtin(struct cmd_struct *p, int argc, const char **argv)

{

tools/perf/util/cache.h

+0 −5
Original line number Diff line number Diff line
@@ -11,14 +11,9 @@ 
#include <linux/string.h>



#define CMD_EXEC_PATH "--exec-path"

#define CMD_PERF_DIR "--perf-dir="

#define CMD_WORK_TREE "--work-tree="

#define CMD_DEBUGFS_DIR "--debugfs-dir="



#define PERF_DIR_ENVIRONMENT "PERF_DIR"

#define PERF_WORK_TREE_ENVIRONMENT "PERF_WORK_TREE"

#define EXEC_PATH_ENVIRONMENT "PERF_EXEC_PATH"

#define DEFAULT_PERF_DIR_ENVIRONMENT ".perf"

#define PERF_DEBUGFS_ENVIRONMENT "PERF_DEBUGFS_DIR"

#define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR"

#define PERF_PAGER_ENVIRONMENT "PERF_PAGER"