diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-05-18 17:29:23 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-05-18 22:03:35 -0400 |
| commit | a41794cdd7ee94a5199e14f642c26d649d383fa5 (patch) | |
| tree | 17fdd252cf12f184f6a75702f140f799b4f20a7b /tools/perf/util/abspath.c | |
| parent | 5af52b51f76d8f8dce0e5b2a33c20b2231c8046d (diff) | |
perf tools: Remove some unused functions
Without the bloated cplus_demangle from binutils, i.e building with:
$ make NO_DEMANGLE=1 O=~acme/git/build/perf -j3 -C tools/perf/ install
Before:
text data bss dec hex filename
471851 29280 4025056 4526187 45106b /home/acme/bin/perf
After:
[acme@doppio linux-2.6-tip]$ size ~/bin/perf
text data bss dec hex filename
446886 29232 4008576 4484694 446e56 /home/acme/bin/perf
So its a 5.3% size reduction in code, but the interesting part is in the git
diff --stat output:
19 files changed, 20 insertions(+), 1909 deletions(-)
If we ever need some of the things we got from git but weren't using, we just
have to go to the git repo and get fresh, uptodate source code bits.
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/abspath.c')
| -rw-r--r-- | tools/perf/util/abspath.c | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/tools/perf/util/abspath.c b/tools/perf/util/abspath.c index a791dd467261..0e76affe9c36 100644 --- a/tools/perf/util/abspath.c +++ b/tools/perf/util/abspath.c | |||
| @@ -1,86 +1,5 @@ | |||
| 1 | #include "cache.h" | 1 | #include "cache.h" |
| 2 | 2 | ||
| 3 | /* | ||
| 4 | * Do not use this for inspecting *tracked* content. When path is a | ||
| 5 | * symlink to a directory, we do not want to say it is a directory when | ||
| 6 | * dealing with tracked content in the working tree. | ||
| 7 | */ | ||
| 8 | static int is_directory(const char *path) | ||
| 9 | { | ||
| 10 | struct stat st; | ||
| 11 | return (!stat(path, &st) && S_ISDIR(st.st_mode)); | ||
| 12 | } | ||
| 13 | |||
| 14 | /* We allow "recursive" symbolic links. Only within reason, though. */ | ||
| 15 | #define MAXDEPTH 5 | ||
| 16 | |||
| 17 | const char *make_absolute_path(const char *path) | ||
| 18 | { | ||
| 19 | static char bufs[2][PATH_MAX + 1], *buf = bufs[0], *next_buf = bufs[1]; | ||
| 20 | char cwd[1024] = ""; | ||
| 21 | int buf_index = 1, len; | ||
| 22 | |||
| 23 | int depth = MAXDEPTH; | ||
| 24 | char *last_elem = NULL; | ||
| 25 | struct stat st; | ||
| 26 | |||
| 27 | if (strlcpy(buf, path, PATH_MAX) >= PATH_MAX) | ||
| 28 | die ("Too long path: %.*s", 60, path); | ||
| 29 | |||
| 30 | while (depth--) { | ||
| 31 | if (!is_directory(buf)) { | ||
| 32 | char *last_slash = strrchr(buf, '/'); | ||
| 33 | if (last_slash) { | ||
| 34 | *last_slash = '\0'; | ||
| 35 | last_elem = xstrdup(last_slash + 1); | ||
| 36 | } else { | ||
| 37 | last_elem = xstrdup(buf); | ||
| 38 | *buf = '\0'; | ||
| 39 | } | ||
| 40 | } | ||
| 41 | |||
| 42 | if (*buf) { | ||
| 43 | if (!*cwd && !getcwd(cwd, sizeof(cwd))) | ||
| 44 | die ("Could not get current working directory"); | ||
| 45 | |||
| 46 | if (chdir(buf)) | ||
| 47 | die ("Could not switch to '%s'", buf); | ||
| 48 | } | ||
| 49 | if (!getcwd(buf, PATH_MAX)) | ||
| 50 | die ("Could not get current working directory"); | ||
| 51 | |||
| 52 | if (last_elem) { | ||
| 53 | len = strlen(buf); | ||
| 54 | |||
| 55 | if (len + strlen(last_elem) + 2 > PATH_MAX) | ||
| 56 | die ("Too long path name: '%s/%s'", | ||
| 57 | buf, last_elem); | ||
| 58 | buf[len] = '/'; | ||
| 59 | strcpy(buf + len + 1, last_elem); | ||
| 60 | free(last_elem); | ||
| 61 | last_elem = NULL; | ||
| 62 | } | ||
| 63 | |||
| 64 | if (!lstat(buf, &st) && S_ISLNK(st.st_mode)) { | ||
| 65 | len = readlink(buf, next_buf, PATH_MAX); | ||
| 66 | if (len < 0) | ||
| 67 | die ("Invalid symlink: %s", buf); | ||
| 68 | if (PATH_MAX <= len) | ||
| 69 | die("symbolic link too long: %s", buf); | ||
| 70 | next_buf[len] = '\0'; | ||
| 71 | buf = next_buf; | ||
| 72 | buf_index = 1 - buf_index; | ||
| 73 | next_buf = bufs[buf_index]; | ||
| 74 | } else | ||
| 75 | break; | ||
| 76 | } | ||
| 77 | |||
| 78 | if (*cwd && chdir(cwd)) | ||
| 79 | die ("Could not change back to '%s'", cwd); | ||
| 80 | |||
| 81 | return buf; | ||
| 82 | } | ||
| 83 | |||
| 84 | static const char *get_pwd_cwd(void) | 3 | static const char *get_pwd_cwd(void) |
| 85 | { | 4 | { |
| 86 | static char cwd[PATH_MAX + 1]; | 5 | static char cwd[PATH_MAX + 1]; |
