From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Michael Petlan <mpetlan@redhat.com>,
Ian Rogers <irogers@google.com>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH 9/9] perf tools: Align buildid list output for short build ids
Date: Wed, 30 Sep 2020 19:15:12 +0200 [thread overview]
Message-ID: <20200930171512.3986425-10-jolsa@kernel.org> (raw)
In-Reply-To: <20200930171512.3986425-1-jolsa@kernel.org>
With shorter md5 build ids we need to align their
paths properly with other build ids:
$ perf buildid-list
17f4e448cc746582ea1881528deb549f7fdb3fd5 [kernel.kallsyms]
a50e350e97c43b4708d09bcd85ebfff7 .../tools/perf/buildid-ex-md5
1805c738c8f3ec0f47b7ea09080c28f34d18a82b /usr/lib64/ld-2.31.so
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/util/dso.c | 2 +-
tools/perf/util/dso.h | 1 -
tools/perf/util/dsos.c | 6 ++++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index ca965845b35e..55c11e854fe4 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -1369,7 +1369,7 @@ int dso__kernel_module_get_build_id(struct dso *dso,
return 0;
}
-size_t dso__fprintf_buildid(struct dso *dso, FILE *fp)
+static size_t dso__fprintf_buildid(struct dso *dso, FILE *fp)
{
char sbuild_id[SBUILD_ID_SIZE];
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index f926c96bf230..d8cb4f5680a4 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -362,7 +362,6 @@ struct dso *machine__findnew_kernel(struct machine *machine, const char *name,
void dso__reset_find_symbol_cache(struct dso *dso);
-size_t dso__fprintf_buildid(struct dso *dso, FILE *fp);
size_t dso__fprintf_symbols_by_name(struct dso *dso, FILE *fp);
size_t dso__fprintf(struct dso *dso, FILE *fp);
diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c
index 87161e431830..183a81d5b2f9 100644
--- a/tools/perf/util/dsos.c
+++ b/tools/perf/util/dsos.c
@@ -287,10 +287,12 @@ size_t __dsos__fprintf_buildid(struct list_head *head, FILE *fp,
size_t ret = 0;
list_for_each_entry(pos, head, node) {
+ char sbuild_id[SBUILD_ID_SIZE];
+
if (skip && skip(pos, parm))
continue;
- ret += dso__fprintf_buildid(pos, fp);
- ret += fprintf(fp, " %s\n", pos->long_name);
+ build_id__sprintf(&pos->bid, sbuild_id);
+ ret += fprintf(fp, "%-40s %s\n", sbuild_id, pos->long_name);
}
return ret;
}
--
2.26.2
next prev parent reply other threads:[~2020-09-30 17:22 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 17:15 [PATCH 0/9] perf tools: Add support for build id with different sizes Jiri Olsa
2020-09-30 17:15 ` [PATCH 1/9] perf tools: Add build id shell test Jiri Olsa
2020-10-01 2:00 ` Ian Rogers
2020-10-01 9:25 ` Jiri Olsa
2020-10-01 10:25 ` Jiri Olsa
2020-10-01 16:58 ` Ian Rogers
2020-10-01 19:05 ` [PATCHv2 " Jiri Olsa
2020-10-02 13:07 ` Namhyung Kim
2020-10-02 17:34 ` Ian Rogers
2020-10-02 19:29 ` Jiri Olsa
2020-10-06 1:37 ` Namhyung Kim
2020-10-08 9:11 ` Jiri Olsa
2020-10-08 15:22 ` Ian Rogers
2020-10-02 20:55 ` Arnaldo Carvalho de Melo
2020-10-05 15:58 ` [PATCHv3 " Jiri Olsa
2020-10-13 16:13 ` [PATCH " Arnaldo Carvalho de Melo
2020-10-13 19:15 ` Jiri Olsa
2020-09-30 17:15 ` [PATCH 2/9] perf tools: Use build_id object in dso Jiri Olsa
2020-10-01 2:01 ` Ian Rogers
2020-09-30 17:15 ` [PATCH 3/9] perf tools: Pass build_id object to filename__read_build_id Jiri Olsa
2020-10-01 5:17 ` Ian Rogers
2020-09-30 17:15 ` [PATCH 4/9] perf tools: Pass build id object to sysfs__read_build_id Jiri Olsa
2020-10-01 5:20 ` Ian Rogers
2020-09-30 17:15 ` [PATCH 5/9] perf tools: Pass build_id object to build_id__sprintf Jiri Olsa
2020-10-01 5:24 ` Ian Rogers
2020-09-30 17:15 ` [PATCH 6/9] perf tools: Pass build_id object to dso__set_build_id Jiri Olsa
2020-10-01 5:25 ` Ian Rogers
2020-09-30 17:15 ` [PATCH 7/9] perf tools: Pass build_id object to dso__build_id_equal Jiri Olsa
2020-10-01 5:25 ` Ian Rogers
2020-09-30 17:15 ` [PATCH 8/9] perf tools: Add size to struct perf_record_header_build_id Jiri Olsa
2020-10-01 5:31 ` Ian Rogers
2020-09-30 17:15 ` Jiri Olsa [this message]
2020-10-01 5:35 ` [PATCH 9/9] perf tools: Align buildid list output for short build ids Ian Rogers
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=20200930171512.3986425-10-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
/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
all inboxes | Powered by JetHome®