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

perf addr_location: Rename al->mg to al->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-foo95pyyp3bhocbt7yd8qrvq@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+24 -24
+4 -4
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->mg = node->ms.mg; 1109 + al->maps = node->ms.mg; 1110 1110 al->map = node->ms.map; 1111 1111 al->sym = node->ms.sym; 1112 1112 al->srcline = node->srcline; ··· 1119 1119 goto out; 1120 1120 } 1121 1121 1122 - if (al->mg == &al->mg->machine->kmaps) { 1123 - if (machine__is_host(al->mg->machine)) { 1122 + if (al->maps == &al->maps->machine->kmaps) { 1123 + if (machine__is_host(al->maps->machine)) { 1124 1124 al->cpumode = PERF_RECORD_MISC_KERNEL; 1125 1125 al->level = 'k'; 1126 1126 } else { ··· 1128 1128 al->level = 'g'; 1129 1129 } 1130 1130 } else { 1131 - if (machine__is_host(al->mg->machine)) { 1131 + if (machine__is_host(al->maps->machine)) { 1132 1132 al->cpumode = PERF_RECORD_MISC_USER; 1133 1133 al->level = '.'; 1134 1134 } else if (perf_guest) {
+6 -6
tools/perf/util/db-export.c
··· 181 181 if (al->map) { 182 182 struct dso *dso = al->map->dso; 183 183 184 - err = db_export__dso(dbe, dso, al->mg->machine); 184 + err = db_export__dso(dbe, dso, al->maps->machine); 185 185 if (err) 186 186 return err; 187 187 *dso_db_id = dso->db_id; ··· 251 251 */ 252 252 al.sym = node->ms.sym; 253 253 al.map = node->ms.map; 254 - al.mg = thread->maps; 254 + al.maps = thread->maps; 255 255 al.addr = node->ip; 256 256 257 257 if (al.map && !al.sym) ··· 360 360 if (err) 361 361 return err; 362 362 363 - err = db_export__machine(dbe, al->mg->machine); 363 + err = db_export__machine(dbe, al->maps->machine); 364 364 if (err) 365 365 return err; 366 366 367 - main_thread = thread__main_thread(al->mg->machine, thread); 367 + main_thread = thread__main_thread(al->maps->machine, thread); 368 368 369 - err = db_export__threads(dbe, thread, main_thread, al->mg->machine, &comm); 369 + err = db_export__threads(dbe, thread, main_thread, al->maps->machine, &comm); 370 370 if (err) 371 371 goto out_put; 372 372 ··· 380 380 goto out_put; 381 381 382 382 if (dbe->cpr) { 383 - struct call_path *cp = call_path_from_sample(dbe, al->mg->machine, 383 + struct call_path *cp = call_path_from_sample(dbe, al->maps->machine, 384 384 thread, sample, 385 385 evsel); 386 386 if (cp) {
+3 -3
tools/perf/util/event.c
··· 461 461 struct machine *machine = mg->machine; 462 462 bool load_map = false; 463 463 464 - al->mg = mg; 464 + al->maps = mg; 465 465 al->thread = thread; 466 466 al->addr = addr; 467 467 al->cpumode = cpumode; ··· 474 474 475 475 if (cpumode == PERF_RECORD_MISC_KERNEL && perf_host) { 476 476 al->level = 'k'; 477 - al->mg = mg = &machine->kmaps; 477 + al->maps = mg = &machine->kmaps; 478 478 load_map = true; 479 479 } else if (cpumode == PERF_RECORD_MISC_USER && perf_host) { 480 480 al->level = '.'; 481 481 } else if (cpumode == PERF_RECORD_MISC_GUEST_KERNEL && perf_guest) { 482 482 al->level = 'g'; 483 - al->mg = mg = &machine->kmaps; 483 + al->maps = mg = &machine->kmaps; 484 484 load_map = true; 485 485 } else if (cpumode == PERF_RECORD_MISC_GUEST_USER && perf_guest) { 486 486 al->level = 'u';
+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->mg, 695 + .mg = 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->mg, 763 + .mg = 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->mg = bi[i].to.ms.mg; 898 + al->maps = bi[i].to.ms.mg; 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->mg, 1075 + .mg = 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.mg; 1937 + ams->ms.mg = 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.mg; 1955 + ams->ms.mg = 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.mg; 2072 + ms.mg = 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/scripting-engines/trace-event-python.c
··· 1127 1127 1128 1128 tuple_set_u64(t, 0, es->db_id); 1129 1129 tuple_set_u64(t, 1, es->evsel->db_id); 1130 - tuple_set_u64(t, 2, es->al->mg->machine->db_id); 1130 + tuple_set_u64(t, 2, es->al->maps->machine->db_id); 1131 1131 tuple_set_u64(t, 3, es->al->thread->db_id); 1132 1132 tuple_set_u64(t, 4, es->comm_db_id); 1133 1133 tuple_set_u64(t, 5, es->dso_db_id);
+1 -1
tools/perf/util/symbol.h
··· 108 108 109 109 struct addr_location { 110 110 struct thread *thread; 111 - struct maps *mg; 111 + struct maps *maps; 112 112 struct map *map; 113 113 struct symbol *sym; 114 114 const char *srcline;
+1 -1
tools/perf/util/unwind-libdw.c
··· 81 81 return -1; 82 82 83 83 e->ip = ip; 84 - e->ms.mg = al.mg; 84 + e->ms.mg = 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.mg; 581 + e.ms.mg = al.maps; 582 582 583 583 pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n", 584 584 al.sym ? al.sym->name : "''",