[tip:perf/core] perf tools: Remove --perf-dir and --work-dir

[tip-bot for Arnaldo Carvalho de Melo]

Commit-ID:  e861964a26b786d349add4db4825597ec65b5780
Gitweb: http://git.kernel.org/tip/e861964a26b786d349add4db4825597ec65b5780
Author: Arnaldo Carvalho de Melo 
AuthorDate: Thu, 16 Jun 2016 17:36:22 -0300
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Tue, 21 Jun 2016 13:18:34 -0300

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 
Cc: David Ahern 
Cc: Jiri Olsa 
Cc: Namhyung Kim 
Cc: Wang Nan 
Link: http://lkml.kernel.org/n/tip-wtiln26gyqndprmkl0kds...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/perf.c   | 36 
 tools/perf/util/cache.h |  5 -
 2 files changed, 41 deletions(-)

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 15982ce..634bf7c 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -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)
 {
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index f260040..369f382 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -11,14 +11,9 @@
 #include 
 
 #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"

[tip:perf/core] perf tools: Remove --perf-dir and --work-dir

[tip-bot for Arnaldo Carvalho de Melo]

Commit-ID:  e861964a26b786d349add4db4825597ec65b5780
Gitweb: http://git.kernel.org/tip/e861964a26b786d349add4db4825597ec65b5780
Author: Arnaldo Carvalho de Melo 
AuthorDate: Thu, 16 Jun 2016 17:36:22 -0300
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Tue, 21 Jun 2016 13:18:34 -0300

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 
Cc: David Ahern 
Cc: Jiri Olsa 
Cc: Namhyung Kim 
Cc: Wang Nan 
Link: http://lkml.kernel.org/n/tip-wtiln26gyqndprmkl0kds...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/perf.c   | 36 
 tools/perf/util/cache.h |  5 -
 2 files changed, 41 deletions(-)

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 15982ce..634bf7c 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -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)
 {
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index f260040..369f382 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -11,14 +11,9 @@
 #include 
 
 #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"