]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
perf tools: Use kmod_path__parse in is_kernel_module
authorJiri Olsa <jolsa@kernel.org>
Thu, 12 Feb 2015 14:56:21 +0000 (15:56 +0100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 23 Mar 2015 15:38:37 +0000 (12:38 -0300)
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>
tools/perf/util/dso.c

index 7a7c54b42b41bc7bae4a766a4e6992c4045aeaf3..f37548322c9debe2218bb538f1758585f440a797 100644 (file)
@@ -178,19 +178,15 @@ bool is_kmodule_extension(const char *ext)
 
 bool is_kernel_module(const char *pathname, bool *compressed)
 {
-       const char *ext = strrchr(pathname, '.');
+       struct kmod_path m;
 
-       if (ext == NULL)
-               return false;
+       if (kmod_path__parse(&m, pathname))
+               return NULL;
 
-       if (is_supported_compression(ext + 1)) {
-               if (compressed)
-                       *compressed = true;
-               ext -= 3;
-       } else if (compressed)
-               *compressed = false;
+       if (compressed)
+               *compressed = m.comp;
 
-       return is_kmodule_extension(ext + 1);
+       return m.kmod;
 }
 
 bool decompress_to_file(const char *ext, const char *filename, int output_fd)