From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752105AbdFHWx1 (ORCPT ); Thu, 8 Jun 2017 18:53:27 -0400 Received: from terminus.zytor.com ([65.50.211.136]:59399 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751842AbdFHWxZ (ORCPT ); Thu, 8 Jun 2017 18:53:25 -0400 Date: Thu, 8 Jun 2017 15:51:11 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: tglx@linutronix.de, wangnan0@huawei.com, acme@redhat.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, dsahern@gmail.com, jolsa@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, namhyung@kernel.org, mingo@kernel.org Reply-To: mingo@kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, hpa@zytor.com, dsahern@gmail.com, jolsa@kernel.org, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, acme@redhat.com, wangnan0@huawei.com, tglx@linutronix.de In-Reply-To: <20170608073109.30699-5-namhyung@kernel.org> References: <20170608073109.30699-5-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf annotate: Use dso__decompress_kmodule_path() Git-Commit-ID: 3c84fd53044f98017271101b59a21ddb20fb312b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3c84fd53044f98017271101b59a21ddb20fb312b Gitweb: http://git.kernel.org/tip/3c84fd53044f98017271101b59a21ddb20fb312b Author: Namhyung Kim AuthorDate: Thu, 8 Jun 2017 16:31:04 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 8 Jun 2017 15:39:02 -0300 perf annotate: Use dso__decompress_kmodule_path() Convert open-coded decompress routine to use the function. Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: David Ahern Cc: Peter Zijlstra Cc: Wang Nan Cc: kernel-team@lge.com Link: http://lkml.kernel.org/r/20170608073109.30699-5-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 df4486c..ddbd56d 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);