Skip to contentSkip to conversation

perf tools: Use kmod_path__parse in is_kernel_module

tip:perf/core tip-bot for Jiri Olsa 1 participant 1 message Mar 24, 2015 perf events

lore
Share & tools
lore

tip-bot for Jiri Olsa

author merge bot
#0 lore raw
Commit-ID:  8dee9ff110f11fa536caef3cd2da23b74dceaf5b
Gitweb:     http://git.kernel.org/tip/8dee9ff110f11fa536caef3cd2da23b74dceaf5b
Author:     Jiri Olsa <[email protected]>
AuthorDate: Thu, 12 Feb 2015 15:56:21 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 23 Mar 2015 12:38:37 -0300

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 <[email protected]>
Acked-by Namhyung Kim <[email protected]>
Cc Adrian Hunter <[email protected]>
Cc Corey Ashford <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/util/dso.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
tools/perf/util/dso.c +6 -10
index 7a7c54b..f375483 100644
@@ -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)