Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf map_symbol: Rename ms->mg to ms->maps

One more step on the merge of 'struct maps' with 'struct map_groups'.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-61rra2wg392rhvdgw421wzpt@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+16 -16
+1 -1
tools/perf/arch/s390/annotate/instructions.c
··· 38 38 return -1; 39 39 target.addr = map__objdump_2mem(map, ops->target.addr); 40 40 41 - if (maps__find_ams(ms->mg, &target) == 0 && 41 + if (maps__find_ams(ms->maps, &target) == 0 && 42 42 map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr) 43 43 ops->target.sym = target.ms.sym; 44 44
+1 -1
tools/perf/ui/browsers/annotate.c
··· 430 430 return true; 431 431 } 432 432 433 - target_ms.mg = ms->mg; 433 + target_ms.maps = ms->maps; 434 434 target_ms.map = ms->map; 435 435 target_ms.sym = dl->ops.target.sym; 436 436 pthread_mutex_unlock(&notes->lock);
+3 -3
tools/perf/util/annotate.c
··· 271 271 find_target: 272 272 target.addr = map__objdump_2mem(map, ops->target.addr); 273 273 274 - if (maps__find_ams(ms->mg, &target) == 0 && 274 + if (maps__find_ams(ms->maps, &target) == 0 && 275 275 map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr) 276 276 ops->target.sym = target.ms.sym; 277 277 ··· 391 391 * Actual navigation will come next, with further understanding of how 392 392 * the symbol searching and disassembly should be done. 393 393 */ 394 - if (maps__find_ams(ms->mg, &target) == 0 && 394 + if (maps__find_ams(ms->maps, &target) == 0 && 395 395 map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr) 396 396 ops->target.sym = target.ms.sym; 397 397 ··· 1545 1545 .ms = { .map = map, }, 1546 1546 }; 1547 1547 1548 - if (!maps__find_ams(args->ms.mg, &target) && 1548 + if (!maps__find_ams(args->ms.maps, &target) && 1549 1549 target.ms.sym->start == target.al_addr) 1550 1550 dl->ops.target.sym = target.ms.sym; 1551 1551 }
+1 -1
tools/perf/util/callchain.c
··· 1106 1106 int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *node, 1107 1107 bool hide_unresolved) 1108 1108 { 1109 - al->maps = node->ms.mg; 1109 + al->maps = node->ms.maps; 1110 1110 al->map = node->ms.map; 1111 1111 al->sym = node->ms.sym; 1112 1112 al->srcline = node->srcline;
+4 -4
tools/perf/util/hist.c
··· 692 692 .ino = ns ? ns->link_info[CGROUP_NS_INDEX].ino : 0, 693 693 }, 694 694 .ms = { 695 - .mg = al->maps, 695 + .maps = al->maps, 696 696 .map = al->map, 697 697 .sym = al->sym, 698 698 }, ··· 760 760 .block_info = block_info, 761 761 .hists = hists, 762 762 .ms = { 763 - .mg = al->maps, 763 + .maps = al->maps, 764 764 .map = al->map, 765 765 .sym = al->sym, 766 766 }, ··· 895 895 if (iter->curr >= iter->total) 896 896 return 0; 897 897 898 - al->maps = bi[i].to.ms.mg; 898 + al->maps = bi[i].to.ms.maps; 899 899 al->map = bi[i].to.ms.map; 900 900 al->sym = bi[i].to.ms.sym; 901 901 al->addr = bi[i].to.addr; ··· 1072 1072 .comm = thread__comm(al->thread), 1073 1073 .ip = al->addr, 1074 1074 .ms = { 1075 - .mg = al->maps, 1075 + .maps = al->maps, 1076 1076 .map = al->map, 1077 1077 .sym = al->sym, 1078 1078 },
+3 -3
tools/perf/util/machine.c
··· 1934 1934 1935 1935 ams->addr = ip; 1936 1936 ams->al_addr = al.addr; 1937 - ams->ms.mg = al.maps; 1937 + ams->ms.maps = al.maps; 1938 1938 ams->ms.sym = al.sym; 1939 1939 ams->ms.map = al.map; 1940 1940 ams->phys_addr = 0; ··· 1952 1952 1953 1953 ams->addr = addr; 1954 1954 ams->al_addr = al.addr; 1955 - ams->ms.mg = al.maps; 1955 + ams->ms.maps = al.maps; 1956 1956 ams->ms.sym = al.sym; 1957 1957 ams->ms.map = al.map; 1958 1958 ams->phys_addr = phys_addr; ··· 2069 2069 iter_cycles = iter->cycles; 2070 2070 } 2071 2071 2072 - ms.mg = al.maps; 2072 + ms.maps = al.maps; 2073 2073 ms.map = al.map; 2074 2074 ms.sym = al.sym; 2075 2075 srcline = callchain_srcline(&ms, al.addr);
+1 -1
tools/perf/util/map_symbol.h
··· 9 9 struct symbol; 10 10 11 11 struct map_symbol { 12 - struct maps *mg; 12 + struct maps *maps; 13 13 struct map *map; 14 14 struct symbol *sym; 15 15 };
+1 -1
tools/perf/util/unwind-libdw.c
··· 81 81 return -1; 82 82 83 83 e->ip = ip; 84 - e->ms.mg = al.maps; 84 + e->ms.maps = al.maps; 85 85 e->ms.map = al.map; 86 86 e->ms.sym = al.sym; 87 87
+1 -1
tools/perf/util/unwind-libunwind-local.c
··· 578 578 e.ms.sym = thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al); 579 579 e.ip = ip; 580 580 e.ms.map = al.map; 581 - e.ms.mg = al.maps; 581 + e.ms.maps = al.maps; 582 582 583 583 pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n", 584 584 al.sym ? al.sym->name : "''",