From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f200.google.com (mail-dy1-f200.google.com [74.125.82.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84346539764 for ; Tue, 13 Oct 2026 18:26:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.200 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791916020; cv=none; b=FG0oOzLM54Y/Rui0nQTy5w1053N5DlwA7FXq7qiw/iAB9j/9ihIk2tBF55FQIkJtSFHnwhL9gzp6qhsw8/tYoNTBO/IXAFNI0MpDyLKWMhEER6RtRI0ZosTOfNL3oX8cJs3K5J7iCNLz+d6JZlDz/6QYKFT6ysHiVXLDdw65xzc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791916020; c=relaxed/simple; bh=U0LVYrsjOhCuX5dewl7Cw+Whp2dL+e/N7jb/m8VCaAo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JrVLbAopkgHIyM5U48TwjNbEpwsPZ94Igs6WKem5hKepi/LSP8VbVT2RmddSM6+SR38EJyess685gdJ1qDJbb3dlfkgptyOK01ypSxURg2FRByystFnnROevAS3tmihKbUOkjjQVyhGA0nwFSqsPFsy/WitCokX2ObNywVZl6PA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Q7nZ+cmK; arc=none smtp.client-ip=74.125.82.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Q7nZ+cmK" Received: by mail-dy1-f200.google.com with SMTP id 5a478bee46e88-357e2bc3b1bso5565741eec.0 for ; Tue, 13 Oct 2026 11:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1791916016; x=1792520816; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=uLX2MWhtq5GCu3dY8VwmYs6yACC/NfE7NR8TUX/w2xA=; b=Q7nZ+cmK63NHGWx4QCoidVsG6BCeOltwGXfGXPaLa+Vy+hb6HICeCfXEibxUxBkMvF 1Xpz0GAZbOQo43vDeYB9Rt2Q/a8N+10B26q6dt8h9sO7lDH1SuC/Qw+mi4yx9GttPtmP EtAdIuIr+/zIBtAhotD9pWqcuGB6kAWeEpRE+EQJctnV9zjK4ElULggJWGet9sMbWyhU FiNZG7jZS6/Ob5tGgotjCf+jDA7FwV92vYK+0psDC7ASiMS0BJps4Eyk73VXIcR3iaFC hVokyvbxhaO1TooPrxi8/yzZ9BCQmVwlOKHqT3AM5tex7NFGyn0bGc+ETuvUxW6+vPem ByMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791916016; x=1792520816; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=uLX2MWhtq5GCu3dY8VwmYs6yACC/NfE7NR8TUX/w2xA=; b=AfzfLRnFQL+B4Dx4BJITTFnLE8epbSt17iCUmd/GoRMxQ8e4Oq1NrrcraUSD4NzLBs OTxuTDpPiLhH5guw4YOQeijT29aihEoawR750ssq7p4Y2VzmkRaNi0tr+5tUEPDbrAzz TRJD721tfAKW8cpVT/h9ick/BcRR/7U8vqQbM+Mlx4a6iV3Jvj1vw6gCsSf7lBAWIFzQ y1KURVpj8iqkerhbcHVkR7rrhq9BPPZ7c2Gx4MPYNoOod9FPTtJolIHHm3iR1WPOgGsb S15llpE1xsmVjWNTc08qeM6pKKbS1ko+96ai7TwRMrox5Zzw6PkFTPl3Qltd6gtl5Bh8 kOEw== X-Forwarded-Encrypted: i=1; AKwUvBwtyqAb1gLZkqiOIiS3F/38X99N4zaJGsTHUjPSixN5Z+S5FiINjpH2DCDWImnhvVYtISekjzoz3Lm8THk=@vger.kernel.org X-Gm-Message-State: AFq9FYLHelvg/0xLaIO6iOgUnVdcea86wnf09OAUz2yLpuFoapvfu6q1 cttn3JUbt0OhwVBdG08uF8ls0u32p+gHzSlEbRccdW0B9Xm5iy7aB/zskBgddVUnu3Nso+NBl44 bPPvypCd1Bw== X-Received: from dydr19.prod.google.com ([2002:a05:7300:50f3:b0:33e:5767:2163]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:693c:8954:20b0:351:8cc4:e18b with SMTP id 5a478bee46e88-3537dfb8632mr16972398eec.20.1791916016121; Tue, 13 Oct 2026 11:26:56 -0700 (PDT) Date: Tue, 13 Oct 2026 11:24:58 -0700 In-Reply-To: <20261013182458.1234616-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20261013182458.1234616-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.385.gd3acb90ef8-goog Message-ID: <20261013182458.1234616-11-irogers@google.com> Subject: [PATCH v1 10/10] perf maps: Add context analysis annotations From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Marco Elver Cc: Bart Van Assche , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Lorenzo Stoakes , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev Content-Type: text/plain; charset="UTF-8" Add __returns_ctx_lock() to maps__lock(), annotate DECLARE_RC_STRUCT(maps) members protected by lock with __guarded_by(&lock), and annotate internal maps helpers with __must_hold() and __must_hold_shared(). Assisted-by: Antigravity:gemini-3.1-pro Signed-off-by: Ian Rogers --- tools/perf/util/maps.c | 122 ++++++++++++++++++++++++++--------------- 1 file changed, 78 insertions(+), 44 deletions(-) diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c index f808df2fe77b..d87732f72aa6 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -30,12 +30,12 @@ DECLARE_RC_STRUCT(maps) { * @maps_by_address: array of maps sorted by their starting address if * maps_by_address_sorted is true. */ - struct map **maps_by_address; + struct map **maps_by_address __guarded_by(&lock); /** * @maps_by_name: optional array of maps sorted by their dso name if * maps_by_name_sorted is true. */ - struct map **maps_by_name; + struct map **maps_by_name __guarded_by(&lock); struct machine *machine; #ifdef HAVE_LIBUNWIND_SUPPORT void *addr_space; @@ -50,26 +50,33 @@ DECLARE_RC_STRUCT(maps) { * @nr_maps: number of maps_by_address, and possibly maps_by_name, * entries that contain maps. */ - unsigned int nr_maps; + unsigned int nr_maps __guarded_by(&lock); /** * @nr_maps_allocated: number of entries in maps_by_address and possibly * maps_by_name. */ - unsigned int nr_maps_allocated; + unsigned int nr_maps_allocated __guarded_by(&lock); /** * @last_search_by_name_idx: cache of last found by name entry's index * as frequent searches for the same dso name are common. */ unsigned int last_search_by_name_idx; /** @maps_by_address_sorted: is maps_by_address sorted. */ - bool maps_by_address_sorted; + bool maps_by_address_sorted __guarded_by(&lock); /** @maps_by_name_sorted: is maps_by_name sorted. */ - bool maps_by_name_sorted; + bool maps_by_name_sorted __guarded_by(&lock); /** @ends_broken: does the map contain a map where end values are unset/unsorted? */ - bool ends_broken; + bool ends_broken __guarded_by(&lock); }; +static struct rw_semaphore *maps__lock(const struct maps *maps) + __returns_ctx_lock(&RC_CHK_ACCESS(maps)->lock) +{ + return (struct rw_semaphore *)&RC_CHK_ACCESS(maps)->lock; +} + static void check_invariants(const struct maps *maps __maybe_unused) + __must_hold_shared(maps__lock(maps)) { #ifndef NDEBUG assert(RC_CHK_ACCESS(maps)->nr_maps <= RC_CHK_ACCESS(maps)->nr_maps_allocated); @@ -119,55 +126,65 @@ static void check_invariants(const struct maps *maps __maybe_unused) } static struct map **maps__maps_by_address(const struct maps *maps) + __must_hold_shared(maps__lock(maps)) { return RC_CHK_ACCESS(maps)->maps_by_address; } static void maps__set_maps_by_address(struct maps *maps, struct map **new) + __must_hold(maps__lock(maps)) { RC_CHK_ACCESS(maps)->maps_by_address = new; } static void maps__set_nr_maps_allocated(struct maps *maps, unsigned int nr_maps_allocated) + __must_hold(maps__lock(maps)) { RC_CHK_ACCESS(maps)->nr_maps_allocated = nr_maps_allocated; } static void maps__set_nr_maps(struct maps *maps, unsigned int nr_maps) + __must_hold(maps__lock(maps)) { RC_CHK_ACCESS(maps)->nr_maps = nr_maps; } /* Not in the header, to aid reference counting. */ static struct map **maps__maps_by_name(const struct maps *maps) + __must_hold_shared(maps__lock(maps)) { return RC_CHK_ACCESS(maps)->maps_by_name; } static void maps__set_maps_by_name(struct maps *maps, struct map **new) + __must_hold(maps__lock(maps)) { RC_CHK_ACCESS(maps)->maps_by_name = new; } static bool maps__maps_by_address_sorted(const struct maps *maps) + __must_hold_shared(maps__lock(maps)) { return RC_CHK_ACCESS(maps)->maps_by_address_sorted; } static void maps__set_maps_by_address_sorted(struct maps *maps, bool value) + __must_hold(maps__lock(maps)) { RC_CHK_ACCESS(maps)->maps_by_address_sorted = value; } static bool maps__maps_by_name_sorted(const struct maps *maps) + __must_hold_shared(maps__lock(maps)) { return RC_CHK_ACCESS(maps)->maps_by_name_sorted; } static void maps__set_maps_by_name_sorted(struct maps *maps, bool value) + __must_hold(maps__lock(maps)) { RC_CHK_ACCESS(maps)->maps_by_name_sorted = value; } @@ -177,11 +194,22 @@ struct machine *maps__machine(const struct maps *maps) return RC_CHK_ACCESS(maps)->machine; } -unsigned int maps__nr_maps(const struct maps *maps) +static unsigned int __maps__nr_maps(const struct maps *maps) + __must_hold_shared(maps__lock(maps)) { return RC_CHK_ACCESS(maps)->nr_maps; } +unsigned int maps__nr_maps(const struct maps *maps) +{ + unsigned int nr; + + down_read(maps__lock(maps)); + nr = __maps__nr_maps(maps); + up_read(maps__lock(maps)); + return nr; +} + refcount_t *maps__refcnt(struct maps *maps) { return &RC_CHK_ACCESS(maps)->refcnt; @@ -220,12 +248,8 @@ void maps__set_libdw_addr_space_dwfl(struct maps *maps, void *dwfl) } #endif -static struct rw_semaphore *maps__lock(struct maps *maps) -{ - return &RC_CHK_ACCESS(maps)->lock; -} - static void maps__init(struct maps *maps, struct machine *machine) + __context_unsafe(/* initialization */) { init_rwsem(maps__lock(maps)); RC_CHK_ACCESS(maps)->maps_by_address = NULL; @@ -247,11 +271,12 @@ static void maps__init(struct maps *maps, struct machine *machine) } static void maps__exit(struct maps *maps) + __context_unsafe(/* teardown */) { struct map **maps_by_address = maps__maps_by_address(maps); struct map **maps_by_name = maps__maps_by_name(maps); - for (unsigned int i = 0; i < maps__nr_maps(maps); i++) { + for (unsigned int i = 0; i < __maps__nr_maps(maps); i++) { map__zput(maps_by_address[i]); if (maps_by_name) map__zput(maps_by_name[i]); @@ -300,6 +325,7 @@ void maps__put(struct maps *maps) } static void __maps__free_maps_by_name(struct maps *maps) + __must_hold(maps__lock(maps)) { if (!maps__maps_by_name(maps)) return; @@ -307,7 +333,7 @@ static void __maps__free_maps_by_name(struct maps *maps) /* * Free everything to try to do it from the rbtree in the next search */ - for (unsigned int i = 0; i < maps__nr_maps(maps); i++) + for (unsigned int i = 0; i < __maps__nr_maps(maps); i++) map__put(maps__maps_by_name(maps)[i]); zfree(&RC_CHK_ACCESS(maps)->maps_by_name); @@ -340,12 +366,13 @@ static int map__start_cmp(const void *a, const void *b) } static void __maps__sort_by_address(struct maps *maps) + __must_hold(maps__lock(maps)) { if (maps__maps_by_address_sorted(maps)) return; qsort(maps__maps_by_address(maps), - maps__nr_maps(maps), + __maps__nr_maps(maps), sizeof(struct map *), map__start_cmp); maps__set_maps_by_address_sorted(maps, true); @@ -388,7 +415,7 @@ static int maps__sort_by_name(struct maps *maps) err = -ENOMEM; else { struct map **maps_by_address = maps__maps_by_address(maps); - unsigned int n = maps__nr_maps(maps); + unsigned int n = __maps__nr_maps(maps); maps__set_maps_by_name(maps, maps_by_name); for (unsigned int i = 0; i < n; i++) @@ -397,7 +424,7 @@ static int maps__sort_by_name(struct maps *maps) } if (!err) { qsort(maps_by_name, - maps__nr_maps(maps), + __maps__nr_maps(maps), sizeof(struct map *), map__strcmp); maps__set_maps_by_name_sorted(maps, true); @@ -409,18 +436,19 @@ static int maps__sort_by_name(struct maps *maps) } static unsigned int maps__by_address_index(const struct maps *maps, const struct map *map) + __must_hold_shared(maps__lock(maps)) { struct map **maps_by_address = maps__maps_by_address(maps); if (maps__maps_by_address_sorted(maps)) { struct map **mapp = - bsearch(&map, maps__maps_by_address(maps), maps__nr_maps(maps), + bsearch(&map, maps__maps_by_address(maps), __maps__nr_maps(maps), sizeof(*mapp), map__start_cmp); if (mapp) return mapp - maps_by_address; } else { - for (unsigned int i = 0; i < maps__nr_maps(maps); i++) { + for (unsigned int i = 0; i < __maps__nr_maps(maps); i++) { if (RC_CHK_ACCESS(maps_by_address[i]) == RC_CHK_ACCESS(map)) return i; } @@ -430,18 +458,19 @@ static unsigned int maps__by_address_index(const struct maps *maps, const struct } static unsigned int maps__by_name_index(const struct maps *maps, const struct map *map) + __must_hold_shared(maps__lock(maps)) { struct map **maps_by_name = maps__maps_by_name(maps); if (maps__maps_by_name_sorted(maps)) { struct map **mapp = - bsearch(&map, maps_by_name, maps__nr_maps(maps), + bsearch(&map, maps_by_name, __maps__nr_maps(maps), sizeof(*mapp), map__strcmp); if (mapp) return mapp - maps_by_name; } else { - for (unsigned int i = 0; i < maps__nr_maps(maps); i++) { + for (unsigned int i = 0; i < __maps__nr_maps(maps); i++) { if (RC_CHK_ACCESS(maps_by_name[i]) == RC_CHK_ACCESS(map)) return i; } @@ -470,10 +499,11 @@ static void map__set_kmap_maps(struct map *map, struct maps *maps) } static int __maps__insert(struct maps *maps, struct map *new) + __must_hold(maps__lock(maps)) { struct map **maps_by_address = maps__maps_by_address(maps); struct map **maps_by_name = maps__maps_by_name(maps); - unsigned int nr_maps = maps__nr_maps(maps); + unsigned int nr_maps = __maps__nr_maps(maps); unsigned int nr_allocate = RC_CHK_ACCESS(maps)->nr_maps_allocated; if (nr_maps + 1 > nr_allocate) { @@ -540,10 +570,11 @@ int maps__insert(struct maps *maps, struct map *map) } static void __maps__remove(struct maps *maps, struct map *map) + __must_hold(maps__lock(maps)) { struct map **maps_by_address = maps__maps_by_address(maps); struct map **maps_by_name = maps__maps_by_name(maps); - unsigned int nr_maps = maps__nr_maps(maps); + unsigned int nr_maps = __maps__nr_maps(maps); unsigned int address_idx; /* Slide later mappings over the one to remove */ @@ -623,7 +654,7 @@ bool maps__empty(struct maps *maps) bool res; down_read(maps__lock(maps)); - res = maps__nr_maps(maps) == 0; + res = __maps__nr_maps(maps) == 0; up_read(maps__lock(maps)); return res; @@ -651,7 +682,7 @@ int maps__for_each_map(struct maps *maps, int (*cb)(struct map *map, void *data) * the array - this may cause maps to be skipped or * repeated. */ - for (unsigned int i = 0; i < maps__nr_maps(maps); i++) { + for (unsigned int i = 0; i < __maps__nr_maps(maps); i++) { struct map **maps_by_address = maps__maps_by_address(maps); struct map *map = maps_by_address[i]; @@ -678,7 +709,7 @@ int maps__load_maps(struct maps *maps) return 0; down_read(maps__lock(maps)); - nr_maps = maps__nr_maps(maps); + nr_maps = __maps__nr_maps(maps); if (nr_maps == 0) { up_read(maps__lock(maps)); return 0; @@ -711,7 +742,7 @@ void maps__remove_maps(struct maps *maps, bool (*cb)(struct map *map, void *data down_write(maps__lock(maps)); maps_by_address = maps__maps_by_address(maps); - for (unsigned int i = 0; i < maps__nr_maps(maps);) { + for (unsigned int i = 0; i < __maps__nr_maps(maps);) { if (cb(maps_by_address[i], data)) { __maps__remove(maps, maps_by_address[i]); removed = true; @@ -765,7 +796,7 @@ struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name, st * This prevents deadlocking if iteration triggers further map insertions. */ down_read(maps__lock(maps)); - nr_maps = maps__nr_maps(maps); + nr_maps = __maps__nr_maps(maps); maps_copy = calloc(nr_maps, sizeof(*maps_copy)); if (maps_copy) { for (unsigned int i = 0; i < nr_maps; i++) { @@ -850,9 +881,10 @@ size_t maps__fprintf(struct maps *maps, FILE *fp) * Same as find_vma() in kernel. */ static unsigned int first_ending_after(struct maps *maps, const struct map *map) + __must_hold_shared(maps__lock(maps)) { struct map **maps_by_address = maps__maps_by_address(maps); - int low = 0, high = (int)maps__nr_maps(maps) - 1, first = high + 1; + int low = 0, high = (int)__maps__nr_maps(maps) - 1, first = high + 1; assert(maps__maps_by_address_sorted(maps)); if (low <= high && map__end(maps_by_address[0]) > map__start(map)) @@ -877,10 +909,11 @@ static unsigned int first_ending_after(struct maps *maps, const struct map *map) static int __maps__insert_sorted(struct maps *maps, unsigned int first_after_index, struct map *new1, struct map *new2) + __must_hold(maps__lock(maps)) { struct map **maps_by_address = maps__maps_by_address(maps); struct map **maps_by_name = maps__maps_by_name(maps); - unsigned int nr_maps = maps__nr_maps(maps); + unsigned int nr_maps = __maps__nr_maps(maps); unsigned int nr_allocate = RC_CHK_ACCESS(maps)->nr_maps_allocated; unsigned int to_add = new2 ? 2 : 1; @@ -937,6 +970,7 @@ static int __maps__insert_sorted(struct maps *maps, unsigned int first_after_ind * adjusted or removed so that new fits without overlapping any entries. */ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new) + __must_hold(maps__lock(maps)) { int err = 0; unsigned int i, ni = INT_MAX; // Some gcc complain, but depends on maps_by_name... @@ -948,7 +982,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new) * Iterate through entries where the end of the existing entry is * greater-than the new map's start. */ - for (i = first_ending_after(maps, new); i < maps__nr_maps(maps); ) { + for (i = first_ending_after(maps, new); i < __maps__nr_maps(maps); ) { struct map **maps_by_address = maps__maps_by_address(maps); struct map **maps_by_name = maps__maps_by_name(maps); struct map *pos = maps_by_address[i]; @@ -1059,7 +1093,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new) return err; } else { struct map *next = NULL; - unsigned int nr_maps = maps__nr_maps(maps); + unsigned int nr_maps = __maps__nr_maps(maps); if (i + 1 < nr_maps) next = maps_by_address[i + 1]; @@ -1143,8 +1177,8 @@ int maps__copy_from(struct maps *dest, struct maps *parent) } #endif parent_maps_by_address = maps__maps_by_address(parent); - n = maps__nr_maps(parent); - if (maps__nr_maps(dest) == 0) { + n = __maps__nr_maps(parent); + if (__maps__nr_maps(dest) == 0) { /* No existing mappings so just copy from parent to avoid reallocs in insert. */ unsigned int nr_maps_allocated = RC_CHK_ACCESS(parent)->nr_maps_allocated; struct map **dest_maps_by_address = @@ -1228,7 +1262,7 @@ struct map *maps__find(struct maps *maps, u64 ip) if (maps__maps_by_address_sorted(maps)) { struct map **mapp = NULL; struct map **maps_by_address = maps__maps_by_address(maps); - unsigned int nr_maps = maps__nr_maps(maps); + unsigned int nr_maps = __maps__nr_maps(maps); if (maps_by_address && nr_maps) mapp = bsearch(&ip, maps_by_address, nr_maps, sizeof(*mapp), @@ -1264,7 +1298,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name) /* First check last found entry. */ i = RC_CHK_ACCESS(maps)->last_search_by_name_idx; - if (i < maps__nr_maps(maps) && maps__maps_by_name(maps)) { + if (i < __maps__nr_maps(maps) && maps__maps_by_name(maps)) { struct dso *dso = map__dso(maps__maps_by_name(maps)[i]); if (dso && strcmp(dso__short_name(dso), name) == 0) { @@ -1276,7 +1310,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name) /* Second search sorted array. */ if (!done && maps__maps_by_name_sorted(maps)) { struct map **mapp = - bsearch(name, maps__maps_by_name(maps), maps__nr_maps(maps), + bsearch(name, maps__maps_by_name(maps), __maps__nr_maps(maps), sizeof(*mapp), map__strcmp_name); if (mapp) { @@ -1299,7 +1333,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name) down_read(maps__lock(maps)); maps_by_address = maps__maps_by_address(maps); - n = maps__nr_maps(maps); + n = __maps__nr_maps(maps); for (i = 0; i < n; i++) { struct map *pos = maps_by_address[i]; struct dso *dso = map__dso(pos); @@ -1329,7 +1363,7 @@ struct map *maps__find_next_entry(struct maps *maps, struct map *map) down_read(maps__lock(maps)); } i = maps__by_address_index(maps, map); - if (++i < maps__nr_maps(maps)) + if (++i < __maps__nr_maps(maps)) result = map__get(maps__maps_by_address(maps)[i]); up_read(maps__lock(maps)); @@ -1346,7 +1380,7 @@ void maps__fixup_end(struct maps *maps) __maps__sort_by_address(maps); maps_by_address = maps__maps_by_address(maps); - n = maps__nr_maps(maps); + n = __maps__nr_maps(maps); for (unsigned int i = 1; i < n; i++) { struct map *prev = maps_by_address[i - 1]; struct map *curr = maps_by_address[i]; @@ -1393,7 +1427,7 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map) first_after_ = first_ending_after(kmaps, new_map); kmaps_maps_by_address = maps__maps_by_address(kmaps); - if (first_after_ >= maps__nr_maps(kmaps) || + if (first_after_ >= __maps__nr_maps(kmaps) || map__start(kmaps_maps_by_address[first_after_]) >= map__end(new_map)) { /* No overlap so regular insert suffices. */ up_read(maps__lock(kmaps)); @@ -1408,7 +1442,7 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map) first_after_ = first_ending_after(kmaps, new_map); kmaps_maps_by_address = maps__maps_by_address(kmaps); - kmaps__nr_maps = maps__nr_maps(kmaps); + kmaps__nr_maps = __maps__nr_maps(kmaps); if (first_after_ >= kmaps__nr_maps || map__start(kmaps_maps_by_address[first_after_]) >= map__end(new_map)) { @@ -1461,7 +1495,7 @@ void maps__load_first(struct maps *maps) { down_read(maps__lock(maps)); - if (maps__nr_maps(maps) > 0) + if (__maps__nr_maps(maps) > 0) map__load(maps__maps_by_address(maps)[0]); up_read(maps__lock(maps)); -- 2.56.0.385.gd3acb90ef8-goog