perf maps: Merge 'struct maps' with 'struct map_groups'
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 79b6bb73f888933cbcd20b0ef3976cde67951b72 Gitweb: https://git.kernel.org/tip/79b6bb73f888933cbcd20b0ef3976cde67951b72 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 25 Nov 2019 21:58:33 -03:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Tue, 26 Nov 2019 11:07:46 -03:00
perf maps: Merge 'struct maps' with 'struct map_groups'
And pick the shortest name: 'struct maps'.
The split existed because we used to have two groups of maps, one for functions and one for variables, but that only complicated things, sometimes we needed to figure out what was at some address and then had to first try it on the functions group and if that failed, fall back to the variables one.
That split is long gone, so for quite a while we had only one struct maps per struct map_groups, simplify things by combining those structs.
First patch is the minimum needed to merge both, follow up patches will rename 'thread->mg' to 'thread->maps', etc.
--- tools/perf/arch/arm/tests/dwarf-unwind.c | 2 +- tools/perf/arch/arm64/tests/dwarf-unwind.c | 2 +- tools/perf/arch/powerpc/tests/dwarf-unwind.c | 2 +- tools/perf/arch/s390/annotate/instructions.c | 2 +- tools/perf/arch/x86/tests/dwarf-unwind.c | 2 +- tools/perf/arch/x86/util/event.c | 5 +- tools/perf/builtin-report.c | 7 +- tools/perf/tests/map_groups.c | 16 +-- tools/perf/tests/thread-mg-share.c | 6 +- tools/perf/tests/vmlinux-kallsyms.c | 9 +-- tools/perf/ui/stdio/hist.c | 2 +- tools/perf/util/annotate.c | 6 +- tools/perf/util/bpf-event.c | 4 +- tools/perf/util/cs-etm.c | 2 +- tools/perf/util/event.c | 4 +- tools/perf/util/intel-pt.c | 2 +- tools/perf/util/machine.c | 66 +++++------ tools/perf/util/machine.h | 8 +- tools/perf/util/map.c | 105 ++++++------------ tools/perf/util/map.h | 4 +- tools/perf/util/map_groups.h | 60 +++------- tools/perf/util/map_symbol.h | 4 +- tools/perf/util/probe-event.c | 2 +- tools/perf/util/symbol-elf.c | 14 +- tools/perf/util/symbol.c | 67 +++++------ tools/perf/util/symbol.h | 6 +- tools/perf/util/synthetic-events.c | 2 +- tools/perf/util/thread.c | 24 +--- tools/perf/util/thread.h | 4 +- tools/perf/util/unwind-libunwind-local.c | 6 +- tools/perf/util/unwind-libunwind.c | 10 +-- tools/perf/util/unwind.h | 27 ++--- tools/perf/util/vdso.c | 2 +- 33 files changed, 209 insertions(+), 275 deletions(-)
tools/perf/arch/arm/tests/dwarf-unwind.c +1 -1
@@ -26,7 +26,7 @@ static int sample_ustack(struct perf_sample *sample, sp = (unsigned long ) regs[PERF_REG_ARM_SP ]; - map =map_groups__find (thread->mg, (u64 )sp); + map =maps__find (thread->mg, (u64 )sp);if (!map) {pr_debug ("failed to get stack map\n" );free (buf);
tools/perf/arch/arm64/tests/dwarf-unwind.c +1 -1
@@ -26,7 +26,7 @@ static int sample_ustack(struct perf_sample *sample, sp = (unsigned long ) regs[PERF_REG_ARM64_SP ]; - map =map_groups__find (thread->mg, (u64 )sp); + map =maps__find (thread->mg, (u64 )sp);if (!map) {pr_debug ("failed to get stack map\n" );free (buf);
tools/perf/arch/powerpc/tests/dwarf-unwind.c +1 -1
@@ -27,7 +27,7 @@ static int sample_ustack(struct perf_sample *sample, sp = (unsigned long ) regs[PERF_REG_POWERPC_R1 ]; - map =map_groups__find (thread->mg, (u64 )sp); + map =maps__find (thread->mg, (u64 )sp);if (!map) {pr_debug ("failed to get stack map\n" );free (buf);
tools/perf/arch/s390/annotate/instructions.c +1 -1
@@ -38,7 +38,7 @@ static int s390_call__parse(struct arch *arch, struct ins_operands *ops,return -1 ; target.addr =map__objdump_2mem (map, ops->target.addr); -if (map_groups__find_ams (ms->mg, &target) ==0 && +if (maps__find_ams (ms->mg, &target) ==0 &&map__rip_2objdump (target.ms.map, map->map_ip (target.ms.map, target.addr)) == ops->target.addr) ops->target.sym = target.ms.sym;
tools/perf/arch/x86/tests/dwarf-unwind.c +1 -1
@@ -27,7 +27,7 @@ static int sample_ustack(struct perf_sample *sample, sp = (unsigned long ) regs[PERF_REG_X86_SP ]; - map =map_groups__find (thread->mg, (u64 )sp); + map =maps__find (thread->mg, (u64 )sp);if (!map) {pr_debug ("failed to get stack map\n" );free (buf);
tools/perf/arch/x86/util/event.c +2 -3
@@ -18,8 +18,7 @@ int perf_event__synthesize_extra_kmaps(struct perf_tool *tool, {int rc =0 ;struct map *pos; -struct map_groups *kmaps = &machine->kmaps; -struct maps *maps = &kmaps->maps; +struct maps *kmaps = &machine->kmaps;union perf_event *event =zalloc (sizeof (event->mmap) + machine->id_hdr_size);
@@ -29,7 +28,7 @@ int perf_event__synthesize_extra_kmaps(struct perf_tool *tool,return -1 ; } -maps__for_each_entry (maps, pos) { +maps__for_each_entry (kmaps, pos) {struct kmap *kmap;size_t size;
tools/perf/builtin-report.c +1 -6
@@ -780,11 +780,6 @@ static size_t maps__fprintf_task(struct maps *maps, int indent, FILE *fp)return printed; } -static int map_groups__fprintf_task (struct map_groups *mg,int indent,FILE *fp) -{ -return maps__fprintf_task (&mg->maps, indent, fp); -} -static void task__print_level (struct task *task,FILE *fp,int level) {struct thread *thread = task->thread;
@@ -795,7 +790,7 @@ static void task__print_level(struct task *task, FILE *fp, int level)fprintf (fp,"%s\n" ,thread__comm_str (thread)); -map_groups__fprintf_task (thread->mg, comm_indent, fp); +maps__fprintf_task (thread->mg, comm_indent, fp);if (!list_empty (&task->children)) {list_for_each_entry (child, &task->children, list)
tools/perf/tests/map_groups.c +8 -8
@@ -13,12 +13,12 @@ struct map_def {u64 end; }; -static int check_maps (struct map_def *merged,unsigned int size,struct map_groups *mg) +static int check_maps (struct map_def *merged,unsigned int size,struct maps *maps) {struct map *map;unsigned int i =0 ; -map_groups__for_each_entry (mg, map) { +maps__for_each_entry (maps, map) {if (i >0 )TEST_ASSERT_VAL ("less maps expected" , (map && i < size) || (!map && i == size));
@@ -35,7 +35,7 @@ static int check_maps(struct map_def *merged, unsigned int size, struct map_grouint test__map_groups__merge_in (struct test *t__maybe_unused ,int subtest__maybe_unused ) { -struct map_groups mg; +struct maps mg;unsigned int i;struct map_def bpf_progs[] = { {"bpf_prog_1" ,200 ,300 },
@@ -64,7 +64,7 @@ int test__map_groups__merge_in(struct test *t __maybe_unused, int subtest __maybstruct map *map_kcore1, *map_kcore2, *map_kcore3;int ret; -map_groups__init (&mg,NULL ); +maps__init (&mg,NULL );for (i =0 ; i <ARRAY_SIZE (bpf_progs); i++) {struct map *map;
@@ -74,7 +74,7 @@ int test__map_groups__merge_in(struct test *t __maybe_unused, int subtest __mayb map->start = bpf_progs[i].start; map->end = bpf_progs[i].end; -map_groups__insert (&mg, map); +maps__insert (&mg, map);map__put (map); }
@@ -99,19 +99,19 @@ int test__map_groups__merge_in(struct test *t __maybe_unused, int subtest __mayb map_kcore3->start =880 ; map_kcore3->end =1100 ; - ret =map_groups__merge_in (&mg, map_kcore1); + ret =maps__merge_in (&mg, map_kcore1);TEST_ASSERT_VAL ("failed to merge map" , !ret); ret =check_maps (merged12,ARRAY_SIZE (merged12), &mg);TEST_ASSERT_VAL ("merge check failed" , !ret); - ret =map_groups__merge_in (&mg, map_kcore2); + ret =maps__merge_in (&mg, map_kcore2);TEST_ASSERT_VAL ("failed to merge map" , !ret); ret =check_maps (merged12,ARRAY_SIZE (merged12), &mg);TEST_ASSERT_VAL ("merge check failed" , !ret); - ret =map_groups__merge_in (&mg, map_kcore3); + ret =maps__merge_in (&mg, map_kcore3);TEST_ASSERT_VAL ("failed to merge map" , !ret); ret =check_maps (merged3,ARRAY_SIZE (merged3), &mg);
tools/perf/tests/thread-mg-share.c +3 -3
@@ -12,16 +12,16 @@ int test__thread_mg_share(struct test *test __maybe_unused, int subtest __maybe_/* thread group */ struct thread *leader;struct thread *t1, *t2, *t3; -struct map_groups *mg; +struct maps *mg;/* other process */ struct thread *other, *other_leader; -struct map_groups *other_mg; +struct maps *other_mg;/* * This test create 2 processes abstractions (struct thread) * with several threads and checks they properly share and -* maintain map groups info (struct map_groups). +* maintain maps info (struct maps). * * thread group (pid: 0, tids: 0, 1, 2, 3) * other group (pid: 4, tids: 4, 5)
tools/perf/tests/vmlinux-kallsyms.c +4 -5
@@ -190,10 +190,9 @@ next_pair:* so use the short name, less descriptive but the same ("[kernel]" in * both cases. */ - pair =map_groups__find_by_name (&kallsyms.kmaps, - (map->dso->kernel ? - map->dso->short_name : - map->dso->name)); + pair =maps__find_by_name (&kallsyms.kmaps, (map->dso->kernel ? + map->dso->short_name : + map->dso->name));if (pair) { pair->priv =1 ; }else {
@@ -213,7 +212,7 @@ next_pair: mem_start = vmlinux_map->unmap_ip (vmlinux_map, map->start); mem_end = vmlinux_map->unmap_ip (vmlinux_map, map->end); - pair =map_groups__find (&kallsyms.kmaps, mem_start); + pair =maps__find (&kallsyms.kmaps, mem_start);if (pair ==NULL || pair->priv)continue ;
tools/perf/ui/stdio/hist.c +1 -1
@@ -885,7 +885,7 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows, }if (h->ms.map ==NULL && verbose >1 ) { -map_groups__fprintf (h->thread->mg, fp); +maps__fprintf (h->thread->mg, fp);fprintf (fp,"%.10s end\n" , graph_dotted_line); } }
tools/perf/util/annotate.c +3 -3
@@ -271,7 +271,7 @@ static int call__parse(struct arch *arch, struct ins_operands *ops, struct map_s find_target: target.addr =map__objdump_2mem (map, ops->target.addr); -if (map_groups__find_ams (ms->mg, &target) ==0 && +if (maps__find_ams (ms->mg, &target) ==0 &&map__rip_2objdump (target.ms.map, map->map_ip (target.ms.map, target.addr)) == ops->target.addr) ops->target.sym = target.ms.sym;
@@ -391,7 +391,7 @@ static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_s* Actual navigation will come next, with further understanding of how * the symbol searching and disassembly should be done. */ -if (map_groups__find_ams (ms->mg, &target) ==0 && +if (maps__find_ams (ms->mg, &target) ==0 &&map__rip_2objdump (target.ms.map, map->map_ip (target.ms.map, target.addr)) == ops->target.addr) ops->target.sym = target.ms.sym;
@@ -1545,7 +1545,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, .ms = { .map = map, }, }; -if (!map_groups__find_ams (args->ms.mg, &target) && +if (!maps__find_ams (args->ms.mg, &target) && target.ms.sym->start == target.al_addr) dl->ops.target.sym = target.ms.sym; }
tools/perf/util/bpf-event.c +1 -3
@@ -52,9 +52,7 @@ static int machine__process_bpf_event_load(struct machine *machine,for (i =0 ; i < info_linear->info.nr_jited_ksyms; i++) {u64 *addrs = (u64 *)(uintptr_t )(info_linear->info.jited_ksyms);u64 addr = addrs[i]; -struct map *map; - - map =map_groups__find (&machine->kmaps, addr); +struct map *map =maps__find (&machine->kmaps, addr);if (map) { map->dso->binary_type =DSO_BINARY_TYPE__BPF_PROG_INFO ;
tools/perf/util/cs-etm.c +1 -1
@@ -2569,7 +2569,7 @@ int cs_etm__process_auxtrace_info(union perf_event *event,if (err) goto err_delete_thread; -if (thread__init_map_groups (etm->unknown_thread, etm->machine)) { +if (thread__init_maps (etm->unknown_thread, etm->machine)) { err = -ENOMEM ; goto err_delete_thread; }
tools/perf/util/event.c +2 -2
@@ -457,7 +457,7 @@ int perf_event__process(struct perf_tool *tool __maybe_unused,struct map *thread__find_map (struct thread *thread,u8 cpumode,u64 addr,struct addr_location *al) { -struct map_groups *mg = thread->mg; +struct maps *mg = thread->mg;struct machine *machine = mg->machine;bool load_map = false;
@@ -500,7 +500,7 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,return NULL ; } - al->map =map_groups__find (mg, al->addr); + al->map =maps__find (mg, al->addr);if (al->map !=NULL ) {/* * Kernel maps might be changed when loading symbols so loading
tools/perf/util/intel-pt.c +1 -1
@@ -3296,7 +3296,7 @@ int intel_pt_process_auxtrace_info(union perf_event *event, err =thread__set_comm (pt->unknown_thread,"unknown" ,0 );if (err) goto err_delete_thread; -if (thread__init_map_groups (pt->unknown_thread, pt->machine)) { +if (thread__init_maps (pt->unknown_thread, pt->machine)) { err = -ENOMEM ; goto err_delete_thread; }
tools/perf/util/machine.c +30 -36
214 lines not on this page · raw message
tools/perf/util/machine.h +4 -4
@@ -51,7 +51,7 @@ struct machine {struct vdso_info *vdso_info;struct perf_env *env;struct dsos dsos; -struct map_groups kmaps; +struct maps kmaps;struct map *vmlinux_map;u64 kernel_start;pid_t *current_tid;
@@ -83,7 +83,7 @@ struct map *machine__kernel_map(struct machine *machine)static inline struct maps *machine__kernel_maps (struct machine *machine) { -return &machine->kmaps.maps; +return &machine->kmaps; }int machine__get_kernel_start (struct machine *machine);
@@ -212,7 +212,7 @@ static inlinestruct symbol *machine__find_kernel_symbol (struct machine *machine,u64 addr,struct map **mapp) { -return map_groups__find_symbol (&machine->kmaps, addr, mapp); +return maps__find_symbol (&machine->kmaps, addr, mapp); } static inline
@@ -220,7 +220,7 @@ struct symbol *machine__find_kernel_symbol_by_name(struct machine *machine,const char *name, struct map **mapp) { - return map_groups__find_symbol_by_name(&machine->kmaps, name, mapp); + return maps__find_symbol_by_name(&machine->kmaps, name, mapp); }int arch__fix_module_text_start (u64 *start,u64 *size,const char *name);
tools/perf/util/map.c +37 -68
251 lines not on this page · raw message
tools/perf/util/map.h +2 -2
@@ -12,7 +12,7 @@#include <linux/types.h> struct dso ; -struct map_groups ; +struct maps ;struct machine ;struct map {
@@ -42,7 +42,7 @@ struct kmap;struct kmap *__map__kmap (struct map *map);struct kmap *map__kmap (struct map *map); -struct map_groups *map__kmaps (struct map *map); +struct maps *map__kmaps (struct map *map);static inline u64 map__map_ip (struct map *map,u64 ip) {
tools/perf/util/map_groups.h +23 -37
99 lines not on this page · raw message
tools/perf/util/map_symbol.h +2 -2
@@ -4,12 +4,12 @@#include <linux/types.h> -struct map_groups ; +struct maps ;struct map ;struct symbol ;struct map_symbol { -struct map_groups *mg; +struct maps *mg;struct map *map;struct symbol *sym; };
tools/perf/util/probe-event.c +1 -1
@@ -321,7 +321,7 @@ static int kernel_get_module_dso(const char *module, struct dso **pdso)char module_name[128 ];snprintf (module_name,sizeof (module_name),"[%s]" , module); - map =map_groups__find_by_name (&host_machine->kmaps, module_name); + map =maps__find_by_name (&host_machine->kmaps, module_name);if (map) { dso = map->dso; goto found;
tools/perf/util/symbol-elf.c +7 -7
@@ -844,7 +844,7 @@ void __weak arch__sym_update(struct symbol *s __maybe_unused,static int dso__process_kernel_symbol (struct dso *dso,struct map *map,GElf_Sym *sym,GElf_Shdr *shdr, -struct map_groups *kmaps,struct kmap *kmap, +struct maps *kmaps,struct kmap *kmap,struct dso **curr_dsop,struct map **curr_mapp,const char *section_name,bool adjust_kernel_syms,bool kmodule,bool *remap_kernel)
@@ -876,8 +876,8 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,/* Ensure maps are correctly ordered */ if (kmaps) {map__get (map); -map_groups__remove (kmaps, map); -map_groups__insert (kmaps, map); +maps__remove (kmaps, map); +maps__insert (kmaps, map);map__put (map); } }
@@ -902,7 +902,7 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,snprintf (dso_name,sizeof (dso_name),"%s%s" , dso->short_name, section_name); - curr_map =map_groups__find_by_name (kmaps, dso_name); + curr_map =maps__find_by_name (kmaps, dso_name);if (curr_map ==NULL ) {u64 start = sym->st_value;
@@ -928,7 +928,7 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map, curr_map->map_ip = curr_map->unmap_ip = identity__map_ip; } curr_dso->symtab_type = dso->symtab_type; -map_groups__insert (kmaps, curr_map); +maps__insert (kmaps, curr_map);/* * Add it before we drop the referece to curr_map, i.e. while * we still are sure to have a reference to this DSO via
@@ -950,7 +950,7 @@ int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss, struct symsrc *runtime_ss, int kmodule) {struct kmap *kmap = dso->kernel ?map__kmap (map) :NULL ; -struct map_groups *kmaps = kmap ?map__kmaps (map) :NULL ; +struct maps *kmaps = kmap ?map__kmaps (map) :NULL ;struct map *curr_map = map;struct dso *curr_dso = dso;Elf_Data *symstrs, *secstrs;
@@ -1162,7 +1162,7 @@ int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss,* We need to fixup this here too because we create new * maps here, for things like vsyscall sections. */ -map_groups__fixup_end (kmaps); +maps__fixup_end (kmaps); } } err = nr;
tools/perf/util/symbol.c +33 -34
214 lines not on this page · raw message
tools/perf/util/symbol.h +3 -3
@@ -21,7 +21,7 @@struct dso ;struct map ; -struct map_groups ; +struct maps ;struct option ;/*
@@ -108,7 +108,7 @@ struct ref_reloc_sym {struct addr_location {struct thread *thread; -struct map_groups *mg; +struct maps *mg;struct map *map;struct symbol *sym;const char *srcline;
@@ -186,7 +186,7 @@ void __symbols__insert(struct rb_root_cached *symbols, struct symbol *sym,void symbols__insert (struct rb_root_cached *symbols,struct symbol *sym);void symbols__fixup_duplicate (struct rb_root_cached *symbols);void symbols__fixup_end (struct rb_root_cached *symbols); -void map_groups__fixup_end (struct map_groups *mg); +void maps__fixup_end (struct maps *mg);typedef int (*mapfn_t )(u64 start,u64 len,u64 pgoff,void *data); int file__read_maps(int fd, bool exe, mapfn_t mapfn, void *data,
tools/perf/util/synthetic-events.c +1 -1
@@ -493,7 +493,7 @@ static int __event__synthesize_thread(union perf_event *comm_event,/* * send mmap only for thread group leader -* see thread__init_map_groups +* see thread__init_maps() */ if (pid == tgid && perf_event__synthesize_mmap_events(tool, mmap_event, pid, tgid,
tools/perf/util/thread.c +11 -13
@@ -19,16 +19,16 @@#include <api/fs/fs.h> -int thread__init_map_groups (struct thread *thread,struct machine *machine) +int thread__init_maps (struct thread *thread,struct machine *machine) {pid_t pid = thread->pid_;if (pid == thread->tid || pid ==-1 ) { - thread->mg =map_groups__new (machine); + thread->mg =maps__new (machine); }else {struct thread *leader =__machine__findnew_thread (machine, pid, pid);if (leader) { - thread->mg =map_groups__get (leader->mg); + thread->mg =maps__get (leader->mg);thread__put (leader); } }
@@ -87,7 +87,7 @@ void thread__delete(struct thread *thread)thread_stack__free (thread);if (thread->mg) { -map_groups__put (thread->mg); +maps__put (thread->mg); thread->mg =NULL ; }down_write (&thread->namespaces_lock);
@@ -324,7 +324,7 @@ int thread__comm_len(struct thread *thread)size_t thread__fprintf (struct thread *thread,FILE *fp) {return fprintf (fp,"Thread %d %s\n" , thread->tid,thread__comm_str (thread)) + -map_groups__fprintf (thread->mg, fp); +maps__fprintf (thread->mg, fp); }int thread__insert_map (struct thread *thread,struct map *map)
@@ -335,8 +335,8 @@ int thread__insert_map(struct thread *thread, struct map *map)if (ret)return ret; -map_groups__fixup_overlappings (thread->mg, map, stderr); -map_groups__insert (thread->mg, map); +maps__fixup_overlappings (thread->mg, map, stderr); +maps__insert (thread->mg, map);return 0 ; }
@@ -345,7 +345,7 @@ static int __thread__prepare_access(struct thread *thread) {bool initialized = false;int err =0 ; -struct maps *maps = &thread->mg->maps; +struct maps *maps = thread->mg;struct map *map;down_read (&maps->lock);
@@ -371,9 +371,7 @@ static int thread__prepare_access(struct thread *thread)return err; } -static int thread__clone_map_groups (struct thread *thread, -struct thread *parent, -bool do_maps_clone) +static int thread__clone_maps (struct thread *thread,struct thread *parent,bool do_maps_clone) {/* This is new thread, we share map groups for process. */ if (thread->pid_ == parent->pid_)
@@ -385,7 +383,7 @@ static int thread__clone_map_groups(struct thread *thread,return 0 ; }/* But this one is new process, copy maps. */ -return do_maps_clone ?map_groups__clone (thread, parent->mg) :0 ; +return do_maps_clone ?maps__clone (thread, parent->mg) :0 ; }int thread__fork (struct thread *thread,struct thread *parent,u64 timestamp,bool do_maps_clone)
@@ -401,7 +399,7 @@ int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp, bo } thread->ppid = parent->tid; -return thread__clone_map_groups (thread, parent, do_maps_clone); +return thread__clone_maps (thread, parent, do_maps_clone); } void thread__find_cpumode_addr_location(struct thread *thread, u64 addr,
tools/perf/util/thread.h +2 -2
@@ -25,7 +25,7 @@ struct thread {struct rb_node rb_node;struct list_head node; }; -struct map_groups *mg; +struct maps *mg;pid_t pid_;/* Not all tools update this */ pid_t tid;pid_t ppid;
@@ -53,7 +53,7 @@ struct namespaces;struct comm ;struct thread *thread__new (pid_t pid,pid_t tid); -int thread__init_map_groups (struct thread *thread,struct machine *machine); +int thread__init_maps (struct thread *thread,struct machine *machine);void thread__delete (struct thread *thread);struct thread *thread__get (struct thread *thread);
tools/perf/util/unwind-libunwind-local.c +3 -3
@@ -616,7 +616,7 @@ static unw_accessors_t accessors = { .get_proc_name = get_proc_name, }; -static int _unwind__prepare_access (struct map_groups *mg) +static int _unwind__prepare_access (struct maps *mg) { mg->addr_space =unw_create_addr_space (&accessors,0 );if (!mg->addr_space) {
@@ -628,12 +628,12 @@ static int _unwind__prepare_access(struct map_groups *mg)return 0 ; } -static void _unwind__flush_access (struct map_groups *mg) +static void _unwind__flush_access (struct maps *mg) {unw_flush_cache (mg->addr_space,0 ,0 ); } -static void _unwind__finish_access (struct map_groups *mg) +static void _unwind__finish_access (struct maps *mg) {unw_destroy_addr_space (mg->addr_space); }
tools/perf/util/unwind-libunwind.c +4 -6
@@ -12,14 +12,12 @@ struct unwind_libunwind_ops __weak *local_unwind_libunwind_ops;struct unwind_libunwind_ops __weak *x86_32_unwind_libunwind_ops;struct unwind_libunwind_ops __weak *arm64_unwind_libunwind_ops; -static void unwind__register_ops (struct map_groups *mg, -struct unwind_libunwind_ops *ops) +static void unwind__register_ops (struct maps *mg,struct unwind_libunwind_ops *ops) { mg->unwind_libunwind_ops = ops; } -int unwind__prepare_access (struct map_groups *mg,struct map *map, -bool *initialized) +int unwind__prepare_access (struct maps *mg,struct map *map,bool *initialized) {const char *arch;enum dso_type dso_type;
@@ -68,13 +66,13 @@ out_register:return err; } -void unwind__flush_access (struct map_groups *mg) +void unwind__flush_access (struct maps *mg) {if (mg->unwind_libunwind_ops) mg->unwind_libunwind_ops->flush_access (mg); } -void unwind__finish_access (struct map_groups *mg) +void unwind__finish_access (struct maps *mg) {if (mg->unwind_libunwind_ops) mg->unwind_libunwind_ops->finish_access (mg);
tools/perf/util/unwind.h +13 -14
@@ -6,7 +6,7 @@#include <linux/types.h> #include "util/map_symbol.h" -struct map_groups ; +struct maps ;struct perf_sample ;struct thread ;
@@ -18,9 +18,9 @@ struct unwind_entry {typedef int (*unwind_entry_cb_t )(struct unwind_entry *entry,void *arg);struct unwind_libunwind_ops { -int (*prepare_access)(struct map_groups *mg); -void (*flush_access)(struct map_groups *mg); -void (*finish_access)(struct map_groups *mg); +int (*prepare_access)(struct maps *maps); +void (*flush_access)(struct maps *maps); +void (*finish_access)(struct maps *maps);int (*get_entries)(unwind_entry_cb_t cb,void *arg,struct thread *thread,struct perf_sample *data,int max_stack);
@@ -45,20 +45,19 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,#endif int LIBUNWIND__ARCH_REG_ID (int regnum); -int unwind__prepare_access (struct map_groups *mg,struct map *map, -bool *initialized); -void unwind__flush_access (struct map_groups *mg); -void unwind__finish_access (struct map_groups *mg); +int unwind__prepare_access (struct maps *maps,struct map *map,bool *initialized); +void unwind__flush_access (struct maps *maps); +void unwind__finish_access (struct maps *maps);#else -static inline int unwind__prepare_access (struct map_groups *mg__maybe_unused , +static inline int unwind__prepare_access (struct maps *maps__maybe_unused ,struct map *map__maybe_unused ,bool *initialized__maybe_unused ) {return 0 ; } -static inline void unwind__flush_access (struct map_groups *mg__maybe_unused ) {} -static inline void unwind__finish_access (struct map_groups *mg__maybe_unused ) {} +static inline void unwind__flush_access (struct maps *maps__maybe_unused ) {} +static inline void unwind__finish_access (struct maps *maps__maybe_unused ) {}#endif #else static inline int
@@ -71,14 +70,14 @@ unwind__get_entries(unwind_entry_cb_t cb __maybe_unused,return 0 ; } -static inline int unwind__prepare_access (struct map_groups *mg__maybe_unused , +static inline int unwind__prepare_access (struct maps *maps__maybe_unused ,struct map *map__maybe_unused ,bool *initialized__maybe_unused ) {return 0 ; } -static inline void unwind__flush_access (struct map_groups *mg__maybe_unused ) {} -static inline void unwind__finish_access (struct map_groups *mg__maybe_unused ) {} +static inline void unwind__flush_access (struct maps *maps__maybe_unused ) {} +static inline void unwind__finish_access (struct maps *maps__maybe_unused ) {}#endif /* HAVE_DWARF_UNWIND_SUPPORT */ #endif /* __UNWIND_H */
tools/perf/util/vdso.c +1 -1
@@ -144,7 +144,7 @@ static enum dso_type machine__thread_dso_type(struct machine *machine,enum dso_type dso_type =DSO__TYPE_UNKNOWN ;struct map *map; -map_groups__for_each_entry (thread->mg, map) { +maps__for_each_entry (thread->mg, map) {struct dso *dso = map->dso;if (!dso || dso->long_name[0 ] !='/' )continue ;