From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
kernel-team@lge.com, David Ahern <dsahern@gmail.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Wang Nan <wangnan0@huawei.com>
Subject: [PATCH v4 4/9] perf annotate: Use dso__decompress_kmodule_path()
Date: Thu, 8 Jun 2017 16:31:04 +0900 [thread overview]
Message-ID: <20170608073109.30699-5-namhyung@kernel.org> (raw)
In-Reply-To: <20170608073109.30699-1-namhyung@kernel.org>
Convert open-coded decompress routine to use the function.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/annotate.c | 27 +++------------------------
1 file changed, 3 insertions(+), 24 deletions(-)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index df4486c3a2fa..ddbd56df9187 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1431,31 +1431,10 @@ int symbol__disassemble(struct symbol *sym, struct map *map, const char *arch_na
sizeof(symfs_filename));
}
} else if (dso__needs_decompress(dso)) {
- char tmp[PATH_MAX];
- struct kmod_path m;
- int fd;
- bool ret;
+ char tmp[KMOD_DECOMP_LEN];
- if (kmod_path__parse_ext(&m, symfs_filename))
- goto out;
-
- snprintf(tmp, PATH_MAX, "/tmp/perf-kmod-XXXXXX");
-
- fd = mkstemp(tmp);
- if (fd < 0) {
- free(m.ext);
- goto out;
- }
-
- ret = decompress_to_file(m.ext, symfs_filename, fd);
-
- if (ret)
- pr_err("Cannot decompress %s %s\n", m.ext, symfs_filename);
-
- free(m.ext);
- close(fd);
-
- if (!ret)
+ if (dso__decompress_kmodule_path(dso, symfs_filename,
+ tmp, sizeof(tmp)) < 0)
goto out;
strcpy(symfs_filename, tmp);
--
2.13.1
next prev parent reply other threads:[~2017-06-08 7:31 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 7:31 [PATCHSET 0/9] perf tools: Fix for compressed kernel modules (v4) Namhyung Kim
2017-06-08 7:31 ` [PATCH v4 1/9] perf annotate: Fix symbolic link of build-id cache Namhyung Kim
2017-06-08 22:49 ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08 7:31 ` [PATCH v4 2/9] perf tools: Fix a memory leak in __open_dso() Namhyung Kim
2017-06-08 22:50 ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08 7:31 ` [PATCH v4 3/9] perf tools: Introduce dso__decompress_kmodule_{fd,path} Namhyung Kim
2017-06-08 22:50 ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08 7:31 ` Namhyung Kim [this message]
2017-06-08 22:51 ` [tip:perf/urgent] perf annotate: Use dso__decompress_kmodule_path() tip-bot for Namhyung Kim
2017-06-08 7:31 ` [PATCH v4 5/9] perf tools: Decompress kernel module when reading DSO data Namhyung Kim
2017-06-08 22:51 ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08 7:31 ` [PATCH v4 6/9] perf tools: Consolidate error path in __open_dso() Namhyung Kim
2017-06-08 22:52 ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08 7:31 ` [PATCH v4 7/9] perf test: Decompress kernel module before objdump Namhyung Kim
2017-06-08 7:34 ` Adrian Hunter
2017-06-08 22:52 ` [tip:perf/urgent] perf tests: " tip-bot for Namhyung Kim
2017-06-08 7:31 ` [PATCH v4 8/9] perf symbols: Keep DSO->symtab_type after decompress Namhyung Kim
2017-06-08 22:53 ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08 7:31 ` [PATCH v4 9/9] perf symbols: Kill dso__build_id_is_kmod() Namhyung Kim
2017-06-08 22:53 ` [tip:perf/urgent] " tip-bot for Namhyung Kim
2017-06-08 12:10 ` [PATCHSET 0/9] perf tools: Fix for compressed kernel modules (v4) Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170608073109.30699-5-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=kernel-team@lge.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).