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

Configure Feed

Select the types of activity you want to include in your feed.

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: Arnaldo Carvalho de Melo <acme@redhat.com>

Arnaldo Carvalho de Melo e861964a 814b3f51

-41
-36
tools/perf/perf.c
··· 139 139 OPT_ARGUMENT("html-path", "html-path"), 140 140 OPT_ARGUMENT("paginate", "paginate"), 141 141 OPT_ARGUMENT("no-pager", "no-pager"), 142 - OPT_ARGUMENT("perf-dir", "perf-dir"), 143 - OPT_ARGUMENT("work-tree", "work-tree"), 144 142 OPT_ARGUMENT("debugfs-dir", "debugfs-dir"), 145 143 OPT_ARGUMENT("buildid-dir", "buildid-dir"), 146 144 OPT_ARGUMENT("list-cmds", "list-cmds"), ··· 196 198 use_pager = 1; 197 199 } else if (!strcmp(cmd, "--no-pager")) { 198 200 use_pager = 0; 199 - if (envchanged) 200 - *envchanged = 1; 201 - } else if (!strcmp(cmd, "--perf-dir")) { 202 - if (*argc < 2) { 203 - fprintf(stderr, "No directory given for --perf-dir.\n"); 204 - usage(perf_usage_string); 205 - } 206 - setenv(PERF_DIR_ENVIRONMENT, (*argv)[1], 1); 207 - if (envchanged) 208 - *envchanged = 1; 209 - (*argv)++; 210 - (*argc)--; 211 - handled++; 212 - } else if (!prefixcmp(cmd, CMD_PERF_DIR)) { 213 - setenv(PERF_DIR_ENVIRONMENT, cmd + strlen(CMD_PERF_DIR), 1); 214 - if (envchanged) 215 - *envchanged = 1; 216 - } else if (!strcmp(cmd, "--work-tree")) { 217 - if (*argc < 2) { 218 - fprintf(stderr, "No directory given for --work-tree.\n"); 219 - usage(perf_usage_string); 220 - } 221 - setenv(PERF_WORK_TREE_ENVIRONMENT, (*argv)[1], 1); 222 - if (envchanged) 223 - *envchanged = 1; 224 - (*argv)++; 225 - (*argc)--; 226 - } else if (!prefixcmp(cmd, CMD_WORK_TREE)) { 227 - setenv(PERF_WORK_TREE_ENVIRONMENT, cmd + strlen(CMD_WORK_TREE), 1); 228 201 if (envchanged) 229 202 *envchanged = 1; 230 203 } else if (!strcmp(cmd, "--debugfs-dir")) { ··· 332 363 333 364 #define RUN_SETUP (1<<0) 334 365 #define USE_PAGER (1<<1) 335 - /* 336 - * require working tree to be present -- anything uses this needs 337 - * RUN_SETUP for reading from the configuration file. 338 - */ 339 - #define NEED_WORK_TREE (1<<2) 340 366 341 367 static int run_builtin(struct cmd_struct *p, int argc, const char **argv) 342 368 {
-5
tools/perf/util/cache.h
··· 11 11 #include <linux/string.h> 12 12 13 13 #define CMD_EXEC_PATH "--exec-path" 14 - #define CMD_PERF_DIR "--perf-dir=" 15 - #define CMD_WORK_TREE "--work-tree=" 16 14 #define CMD_DEBUGFS_DIR "--debugfs-dir=" 17 15 18 - #define PERF_DIR_ENVIRONMENT "PERF_DIR" 19 - #define PERF_WORK_TREE_ENVIRONMENT "PERF_WORK_TREE" 20 16 #define EXEC_PATH_ENVIRONMENT "PERF_EXEC_PATH" 21 - #define DEFAULT_PERF_DIR_ENVIRONMENT ".perf" 22 17 #define PERF_DEBUGFS_ENVIRONMENT "PERF_DEBUGFS_DIR" 23 18 #define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR" 24 19 #define PERF_PAGER_ENVIRONMENT "PERF_PAGER"