diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2015-02-12 09:56:21 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-23 11:38:37 -0400 |
| commit | 8dee9ff110f11fa536caef3cd2da23b74dceaf5b (patch) | |
| tree | 521d4589e9c314c9a0fcb3c8535c1fea0d3c27c5 /tools | |
| parent | 914f85c4a2db34429b146a57652d2db24d063379 (diff) | |
perf tools: Use kmod_path__parse in is_kernel_module
Replacing the current parsing code with kmod_path__parse function call.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-r9mpbbgkp39wp1cdmv13ddq0@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/dso.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 7a7c54b42b41..f37548322c9d 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c | |||
| @@ -178,19 +178,15 @@ bool is_kmodule_extension(const char *ext) | |||
| 178 | 178 | ||
| 179 | bool is_kernel_module(const char *pathname, bool *compressed) | 179 | bool is_kernel_module(const char *pathname, bool *compressed) |
| 180 | { | 180 | { |
| 181 | const char *ext = strrchr(pathname, '.'); | 181 | struct kmod_path m; |
| 182 | 182 | ||
| 183 | if (ext == NULL) | 183 | if (kmod_path__parse(&m, pathname)) |
| 184 | return false; | 184 | return NULL; |
| 185 | 185 | ||
| 186 | if (is_supported_compression(ext + 1)) { | 186 | if (compressed) |
| 187 | if (compressed) | 187 | *compressed = m.comp; |
| 188 | *compressed = true; | ||
| 189 | ext -= 3; | ||
| 190 | } else if (compressed) | ||
| 191 | *compressed = false; | ||
| 192 | 188 | ||
| 193 | return is_kmodule_extension(ext + 1); | 189 | return m.kmod; |
| 194 | } | 190 | } |
| 195 | 191 | ||
| 196 | bool decompress_to_file(const char *ext, const char *filename, int output_fd) | 192 | bool decompress_to_file(const char *ext, const char *filename, int output_fd) |
