From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Hemant Kumar <hemant@linux.vnet.ibm.com>,
Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>,
Brendan Gregg <brendan.d.gregg@gmail.com>
Subject: Re: [PATCH perf/core v7 04/21] perf: Use SBUILD_ID_SIZE macro instead of BUILD_ID_SIZE macro
Date: Wed, 11 May 2016 12:47:35 -0300 [thread overview]
Message-ID: <20160511154735.GG3619@kernel.org> (raw)
In-Reply-To: <20160511135159.23943.57120.stgit@devbox>
Em Wed, May 11, 2016 at 10:51:59PM +0900, Masami Hiramatsu escreveu:
> Use SBUILD_ID_SIZE macro instead of BUILD_ID_SIZE * 2 + 1 for
> allocating a buffer for build-id string.
Applied
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> ---
> tools/perf/util/annotate.c | 2 +-
> tools/perf/util/dso.c | 4 ++--
> tools/perf/util/header.c | 2 +-
> tools/perf/util/map.c | 2 +-
> .../util/scripting-engines/trace-event-python.c | 2 +-
> tools/perf/util/symbol.c | 2 +-
> 6 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 1168442..b811924 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -1138,7 +1138,7 @@ fallback:
>
> if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS &&
> !dso__is_kcore(dso)) {
> - char bf[BUILD_ID_SIZE * 2 + 16] = " with build id ";
> + char bf[SBUILD_ID_SIZE + 15] = " with build id ";
> char *build_id_msg = NULL;
>
> if (dso->annotate_warned)
> diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
> index 8e639543..3357479 100644
> --- a/tools/perf/util/dso.c
> +++ b/tools/perf/util/dso.c
> @@ -38,7 +38,7 @@ int dso__read_binary_type_filename(const struct dso *dso,
> enum dso_binary_type type,
> char *root_dir, char *filename, size_t size)
> {
> - char build_id_hex[BUILD_ID_SIZE * 2 + 1];
> + char build_id_hex[SBUILD_ID_SIZE];
> int ret = 0;
> size_t len;
>
> @@ -1301,7 +1301,7 @@ size_t __dsos__fprintf(struct list_head *head, FILE *fp)
>
> size_t dso__fprintf_buildid(struct dso *dso, FILE *fp)
> {
> - char sbuild_id[BUILD_ID_SIZE * 2 + 1];
> + char sbuild_id[SBUILD_ID_SIZE];
>
> build_id__sprintf(dso->build_id, sizeof(dso->build_id), sbuild_id);
> return fprintf(fp, "%s", sbuild_id);
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index c6000d4..08852dd 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -1474,7 +1474,7 @@ static int __event_process_build_id(struct build_id_event *bev,
>
> dso = machine__findnew_dso(machine, filename);
> if (dso != NULL) {
> - char sbuild_id[BUILD_ID_SIZE * 2 + 1];
> + char sbuild_id[SBUILD_ID_SIZE];
>
> dso__set_build_id(dso, &bev->build_id);
>
> diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
> index 02c3186..b19bcd3 100644
> --- a/tools/perf/util/map.c
> +++ b/tools/perf/util/map.c
> @@ -289,7 +289,7 @@ int map__load(struct map *map, symbol_filter_t filter)
> nr = dso__load(map->dso, map, filter);
> if (nr < 0) {
> if (map->dso->has_build_id) {
> - char sbuild_id[BUILD_ID_SIZE * 2 + 1];
> + char sbuild_id[SBUILD_ID_SIZE];
>
> build_id__sprintf(map->dso->build_id,
> sizeof(map->dso->build_id),
> diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
> index 73ee12d..ff13470 100644
> --- a/tools/perf/util/scripting-engines/trace-event-python.c
> +++ b/tools/perf/util/scripting-engines/trace-event-python.c
> @@ -618,7 +618,7 @@ static int python_export_dso(struct db_export *dbe, struct dso *dso,
> struct machine *machine)
> {
> struct tables *tables = container_of(dbe, struct tables, dbe);
> - char sbuild_id[BUILD_ID_SIZE * 2 + 1];
> + char sbuild_id[SBUILD_ID_SIZE];
> PyObject *t;
>
> build_id__sprintf(dso->build_id, sizeof(dso->build_id), sbuild_id);
> diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
> index 49caa91..18d81c1 100644
> --- a/tools/perf/util/symbol.c
> +++ b/tools/perf/util/symbol.c
> @@ -1630,7 +1630,7 @@ static int find_matching_kcore(struct map *map, char *dir, size_t dir_sz)
> static char *dso__find_kallsyms(struct dso *dso, struct map *map)
> {
> u8 host_build_id[BUILD_ID_SIZE];
> - char sbuild_id[BUILD_ID_SIZE * 2 + 1];
> + char sbuild_id[SBUILD_ID_SIZE];
> bool is_host = false;
> char path[PATH_MAX];
>
next prev parent reply other threads:[~2016-05-11 15:47 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-11 13:51 [PATCH perf/core v7 00/21] perf-probe --cache and SDT support Masami Hiramatsu
2016-05-11 13:51 ` [PATCH perf/core v7 01/21] tools/perf: Fix lsdir to set errno correctly Masami Hiramatsu
2016-05-11 13:59 ` Arnaldo Carvalho de Melo
2016-05-12 1:46 ` Masami Hiramatsu
2016-05-12 10:25 ` [tip:perf/core] perf tools: " tip-bot for Masami Hiramatsu
2016-05-11 13:51 ` [PATCH perf/core v7 02/21] perf buildid: Fix to set correct dso name for kallsyms Masami Hiramatsu
2016-05-11 15:45 ` Arnaldo Carvalho de Melo
2016-05-12 2:02 ` Masami Hiramatsu
2016-05-12 8:57 ` Masami Hiramatsu
2016-05-11 13:51 ` [PATCH perf/core v7 03/21] perf buildid: Introduce DSO__NAME_KALLSYMS and DSO__NAME_KCORE Masami Hiramatsu
2016-05-11 15:47 ` Arnaldo Carvalho de Melo
2016-05-11 13:51 ` [PATCH perf/core v7 04/21] perf: Use SBUILD_ID_SIZE macro instead of BUILD_ID_SIZE macro Masami Hiramatsu
2016-05-11 15:47 ` Arnaldo Carvalho de Melo [this message]
2016-05-12 10:25 ` [tip:perf/core] perf tools: Use SBUILD_ID_SIZE where applicable tip-bot for Masami Hiramatsu
2016-05-11 13:52 ` [PATCH perf/core v7 05/21] perf symbol: Use lsdir for search in kcore cache directory Masami Hiramatsu
2016-05-11 15:49 ` Arnaldo Carvalho de Melo
2016-05-12 10:26 ` [tip:perf/core] perf symbols: Use lsdir() for the " tip-bot for Masami Hiramatsu
2016-05-11 13:52 ` [PATCH perf/core v7 06/21] perf-buildid-cache: Use lsdir for looking up buildid caches Masami Hiramatsu
2016-05-11 15:50 ` Arnaldo Carvalho de Melo
2016-05-12 10:26 ` [tip:perf/core] perf buildid-cache: Use lsdir() " tip-bot for Masami Hiramatsu
2016-05-11 13:52 ` [PATCH perf/core v7 07/21] perf symbol: Cleanup the code flow of dso__find_kallsyms Masami Hiramatsu
2016-05-11 15:55 ` Arnaldo Carvalho de Melo
2016-05-12 1:46 ` Masami Hiramatsu
2016-05-11 13:52 ` [PATCH perf/core v7 08/21] perf-buildid-cache: Use path/to/bin/buildid/elf instead of path/to/bin/buildid Masami Hiramatsu
2016-05-11 13:52 ` [PATCH perf/core v7 09/21] perf probe: Add --cache option to cache the probe definitions Masami Hiramatsu
2016-05-11 13:52 ` [PATCH perf/core v7 10/21] perf probe: Use cache entry if possible Masami Hiramatsu
2016-05-11 13:53 ` [PATCH perf/core v7 11/21] perf probe: Show all cached probes Masami Hiramatsu
2016-05-11 13:53 ` [PATCH perf/core v7 12/21] perf probe: Remove caches when --cache is given Masami Hiramatsu
2016-05-11 13:53 ` [PATCH perf/core v7 13/21] perf/sdt: ELF support for SDT Masami Hiramatsu
2016-05-11 13:53 ` [PATCH perf/core v7 14/21] perf probe: Add group name support Masami Hiramatsu
2016-05-11 13:54 ` [PATCH perf/core v7 15/21] perf buildid-cache: Scan and import user SDT events to probe cache Masami Hiramatsu
2016-05-11 13:54 ` [PATCH perf/core v7 16/21] perf probe: Accept %sdt and %cached event name Masami Hiramatsu
2016-05-11 13:54 ` [PATCH perf/core v7 17/21] perf-list: Show SDT and pre-cached events Masami Hiramatsu
2016-05-11 13:54 ` [PATCH perf/core v7 18/21] perf-list: Skip SDTs placed in invalid binaries Masami Hiramatsu
2016-05-11 13:54 ` [PATCH perf/core v7 19/21] perf probe: Allow wildcard for cached events Masami Hiramatsu
2016-05-11 13:54 ` [PATCH perf/core v7 20/21] perf probe: Support @BUILDID or @FILE suffix for SDT events Masami Hiramatsu
2016-05-11 13:55 ` [PATCH perf/core v7 21/21] perf probe: Support a special SDT probe format Masami Hiramatsu
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=20160511154735.GG3619@kernel.org \
--to=acme@kernel.org \
--cc=ananth@linux.vnet.ibm.com \
--cc=brendan.d.gregg@gmail.com \
--cc=hemant@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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;
as well as URLs for NNTP newsgroup(s).