perf tools: Use SBUILD_ID_SIZE where applicable

Use the existing SBUILD_ID_SIZE macro instead of the equivalent
BUILD_ID_SIZE * 2 + 1 expression for allocating a buffer for build-id
strings.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20160511135159.23943.57120.stgit@devbox
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Masami Hiramatsu 2016-05-11 22:51:59 +09:00 committed by Arnaldo Carvalho de Melo
parent 357a54f32a
commit b5d8bbe860
6 changed files with 7 additions and 7 deletions

View File

@ -1138,7 +1138,7 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)
if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS && if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS &&
!dso__is_kcore(dso)) { !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; char *build_id_msg = NULL;
if (dso->annotate_warned) if (dso->annotate_warned)

View File

@ -38,7 +38,7 @@ int dso__read_binary_type_filename(const struct dso *dso,
enum dso_binary_type type, enum dso_binary_type type,
char *root_dir, char *filename, size_t size) 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; int ret = 0;
size_t len; 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) 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); build_id__sprintf(dso->build_id, sizeof(dso->build_id), sbuild_id);
return fprintf(fp, "%s", sbuild_id); return fprintf(fp, "%s", sbuild_id);

View File

@ -1474,7 +1474,7 @@ static int __event_process_build_id(struct build_id_event *bev,
dso = machine__findnew_dso(machine, filename); dso = machine__findnew_dso(machine, filename);
if (dso != NULL) { 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); dso__set_build_id(dso, &bev->build_id);

View File

@ -289,7 +289,7 @@ int map__load(struct map *map, symbol_filter_t filter)
nr = dso__load(map->dso, map, filter); nr = dso__load(map->dso, map, filter);
if (nr < 0) { if (nr < 0) {
if (map->dso->has_build_id) { 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, build_id__sprintf(map->dso->build_id,
sizeof(map->dso->build_id), sizeof(map->dso->build_id),

View File

@ -618,7 +618,7 @@ static int python_export_dso(struct db_export *dbe, struct dso *dso,
struct machine *machine) struct machine *machine)
{ {
struct tables *tables = container_of(dbe, struct tables, dbe); 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; PyObject *t;
build_id__sprintf(dso->build_id, sizeof(dso->build_id), sbuild_id); build_id__sprintf(dso->build_id, sizeof(dso->build_id), sbuild_id);

View File

@ -1642,7 +1642,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) static char *dso__find_kallsyms(struct dso *dso, struct map *map)
{ {
u8 host_build_id[BUILD_ID_SIZE]; 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; bool is_host = false;
char path[PATH_MAX]; char path[PATH_MAX];