Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755109AbbLIOQj (ORCPT ); Wed, 9 Dec 2015 09:16:39 -0500 Received: from mail.kernel.org ([198.145.29.136]:49819 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754991AbbLIOQK (ORCPT ); Wed, 9 Dec 2015 09:16:10 -0500 Date: Wed, 9 Dec 2015 11:16:01 -0300 From: Arnaldo Carvalho de Melo To: Masami Hiramatsu Cc: Peter Zijlstra , Adrian Hunter , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Ingo Molnar , Namhyung Kim , Jiri Olsa Subject: Re: [PATCH perf/core 14/22] perf: Fix dso__load_sym to put dso Message-ID: <20151209141601.GE15864@kernel.org> References: <20151209021047.10245.8918.stgit@localhost.localdomain> <20151209021118.10245.49869.stgit@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151209021118.10245.49869.stgit@localhost.localdomain> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1458 Lines: 36 Em Wed, Dec 09, 2015 at 11:11:18AM +0900, Masami Hiramatsu escreveu: > +++ b/tools/perf/util/symbol-elf.c > @@ -1045,6 +1045,8 @@ int dso__load_sym(struct dso *dso, struct map *map, > /* kmaps already got it */ > map__put(curr_map); > dsos__add(&map->groups->machine->dsos, curr_dso); > + /* curr_map and machine->dsos already got it */ > + dso__put(curr_dso); > dso__set_loaded(curr_dso, map->type); > } else > curr_dso = curr_map->dso; Right, to make the code smaller, how about doing it this way, i.e. drop the reference once we have that curr_dso object with a ref held by curr_map, if curr_map doesn't get it, then we don't need and will drop it anyway: diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 53f19968bfa2..84d787074152 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -1026,8 +1026,8 @@ int dso__load_sym(struct dso *dso, struct map *map, curr_dso->long_name_len = dso->long_name_len; curr_map = map__new2(start, curr_dso, map->type); + dso__put(curr_dso); if (curr_map == NULL) { - dso__put(curr_dso); goto out_elf_end; } if (adjust_kernel_syms) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/