From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753463AbbHVGyZ (ORCPT ); Sat, 22 Aug 2015 02:54:25 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60149 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753440AbbHVGyX (ORCPT ); Sat, 22 Aug 2015 02:54:23 -0400 Date: Fri, 21 Aug 2015 23:54:07 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@redhat.com, acme@redhat.com, hpa@zytor.com, dsahern@gmail.com, tglx@linutronix.de, mingo@kernel.org, eranian@google.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, bp@suse.de, adrian.hunter@intel.com, fweisbec@gmail.com Reply-To: eranian@google.com, linux-kernel@vger.kernel.org, acme@redhat.com, jolsa@redhat.com, mingo@kernel.org, tglx@linutronix.de, dsahern@gmail.com, hpa@zytor.com, fweisbec@gmail.com, adrian.hunter@intel.com, bp@suse.de, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Initialize reference counts in map__clone() Git-Commit-ID: 66671d001aeb525b9101e0ccb9062627539de555 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: 66671d001aeb525b9101e0ccb9062627539de555 Gitweb: http://git.kernel.org/tip/66671d001aeb525b9101e0ccb9062627539de555 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 18 Aug 2015 15:19:50 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 21 Aug 2015 12:39:30 -0300 perf tools: Initialize reference counts in map__clone() Map clone was written before we introduced reference counts for maps and dsos, so all that was needed was just a copy and then we would insert it into the new map_groups instance. Fix it by, after copying, initializing the map->refcnt, grabbing a struct dso refcount and resetting pointers that may be used to determine if a map, when deleted, is in a rb_tree. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-pd4mr80o5b9gvk50iineacec@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/map.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index ce37e95..b1c475d 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -348,9 +348,18 @@ struct symbol *map__find_symbol_by_name(struct map *map, const char *name, return dso__find_symbol_by_name(map->dso, map->type, name); } -struct map *map__clone(struct map *map) +struct map *map__clone(struct map *from) { - return memdup(map, sizeof(*map)); + struct map *map = memdup(from, sizeof(*map)); + + if (map != NULL) { + atomic_set(&map->refcnt, 1); + RB_CLEAR_NODE(&map->rb_node); + dso__get(map->dso); + map->groups = NULL; + } + + return map; } int map__overlap(struct map *l, struct map *r)