diff options
Diffstat (limited to 'tools/perf/util/machine.h')
-rw-r--r-- | tools/perf/util/machine.h | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h index 20739f746bc4..354de6e56109 100644 --- a/tools/perf/util/machine.h +++ b/tools/perf/util/machine.h | |||
@@ -41,7 +41,6 @@ struct machine { | |||
41 | struct map_groups kmaps; | 41 | struct map_groups kmaps; |
42 | struct map *vmlinux_maps[MAP__NR_TYPES]; | 42 | struct map *vmlinux_maps[MAP__NR_TYPES]; |
43 | u64 kernel_start; | 43 | u64 kernel_start; |
44 | symbol_filter_t symbol_filter; | ||
45 | pid_t *current_tid; | 44 | pid_t *current_tid; |
46 | union { /* Tool specific area */ | 45 | union { /* Tool specific area */ |
47 | void *priv; | 46 | void *priv; |
@@ -110,7 +109,6 @@ typedef void (*machine__process_t)(struct machine *machine, void *data); | |||
110 | struct machines { | 109 | struct machines { |
111 | struct machine host; | 110 | struct machine host; |
112 | struct rb_root guests; | 111 | struct rb_root guests; |
113 | symbol_filter_t symbol_filter; | ||
114 | }; | 112 | }; |
115 | 113 | ||
116 | void machines__init(struct machines *machines); | 114 | void machines__init(struct machines *machines); |
@@ -128,8 +126,6 @@ struct machine *machines__findnew(struct machines *machines, pid_t pid); | |||
128 | void machines__set_id_hdr_size(struct machines *machines, u16 id_hdr_size); | 126 | void machines__set_id_hdr_size(struct machines *machines, u16 id_hdr_size); |
129 | char *machine__mmap_name(struct machine *machine, char *bf, size_t size); | 127 | char *machine__mmap_name(struct machine *machine, char *bf, size_t size); |
130 | 128 | ||
131 | void machines__set_symbol_filter(struct machines *machines, | ||
132 | symbol_filter_t symbol_filter); | ||
133 | void machines__set_comm_exec(struct machines *machines, bool comm_exec); | 129 | void machines__set_comm_exec(struct machines *machines, bool comm_exec); |
134 | 130 | ||
135 | struct machine *machine__new_host(void); | 131 | struct machine *machine__new_host(void); |
@@ -178,40 +174,33 @@ size_t machine__fprintf(struct machine *machine, FILE *fp); | |||
178 | static inline | 174 | static inline |
179 | struct symbol *machine__find_kernel_symbol(struct machine *machine, | 175 | struct symbol *machine__find_kernel_symbol(struct machine *machine, |
180 | enum map_type type, u64 addr, | 176 | enum map_type type, u64 addr, |
181 | struct map **mapp, | 177 | struct map **mapp) |
182 | symbol_filter_t filter) | ||
183 | { | 178 | { |
184 | return map_groups__find_symbol(&machine->kmaps, type, addr, | 179 | return map_groups__find_symbol(&machine->kmaps, type, addr, mapp); |
185 | mapp, filter); | ||
186 | } | 180 | } |
187 | 181 | ||
188 | static inline | 182 | static inline |
189 | struct symbol *machine__find_kernel_symbol_by_name(struct machine *machine, | 183 | struct symbol *machine__find_kernel_symbol_by_name(struct machine *machine, |
190 | enum map_type type, const char *name, | 184 | enum map_type type, const char *name, |
191 | struct map **mapp, | 185 | struct map **mapp) |
192 | symbol_filter_t filter) | ||
193 | { | 186 | { |
194 | return map_groups__find_symbol_by_name(&machine->kmaps, type, name, | 187 | return map_groups__find_symbol_by_name(&machine->kmaps, type, name, mapp); |
195 | mapp, filter); | ||
196 | } | 188 | } |
197 | 189 | ||
198 | static inline | 190 | static inline |
199 | struct symbol *machine__find_kernel_function(struct machine *machine, u64 addr, | 191 | struct symbol *machine__find_kernel_function(struct machine *machine, u64 addr, |
200 | struct map **mapp, | 192 | struct map **mapp) |
201 | symbol_filter_t filter) | ||
202 | { | 193 | { |
203 | return machine__find_kernel_symbol(machine, MAP__FUNCTION, addr, | 194 | return machine__find_kernel_symbol(machine, MAP__FUNCTION, addr, |
204 | mapp, filter); | 195 | mapp); |
205 | } | 196 | } |
206 | 197 | ||
207 | static inline | 198 | static inline |
208 | struct symbol *machine__find_kernel_function_by_name(struct machine *machine, | 199 | struct symbol *machine__find_kernel_function_by_name(struct machine *machine, |
209 | const char *name, | 200 | const char *name, |
210 | struct map **mapp, | 201 | struct map **mapp) |
211 | symbol_filter_t filter) | ||
212 | { | 202 | { |
213 | return map_groups__find_function_by_name(&machine->kmaps, name, mapp, | 203 | return map_groups__find_function_by_name(&machine->kmaps, name, mapp); |
214 | filter); | ||
215 | } | 204 | } |
216 | 205 | ||
217 | struct map *machine__findnew_module_map(struct machine *machine, u64 start, | 206 | struct map *machine__findnew_module_map(struct machine *machine, u64 start, |
@@ -219,11 +208,10 @@ struct map *machine__findnew_module_map(struct machine *machine, u64 start, | |||
219 | int arch__fix_module_text_start(u64 *start, const char *name); | 208 | int arch__fix_module_text_start(u64 *start, const char *name); |
220 | 209 | ||
221 | int __machine__load_kallsyms(struct machine *machine, const char *filename, | 210 | int __machine__load_kallsyms(struct machine *machine, const char *filename, |
222 | enum map_type type, bool no_kcore, symbol_filter_t filter); | 211 | enum map_type type, bool no_kcore); |
223 | int machine__load_kallsyms(struct machine *machine, const char *filename, | 212 | int machine__load_kallsyms(struct machine *machine, const char *filename, |
224 | enum map_type type, symbol_filter_t filter); | 213 | enum map_type type); |
225 | int machine__load_vmlinux_path(struct machine *machine, enum map_type type, | 214 | int machine__load_vmlinux_path(struct machine *machine, enum map_type type); |
226 | symbol_filter_t filter); | ||
227 | 215 | ||
228 | size_t machine__fprintf_dsos_buildid(struct machine *machine, FILE *fp, | 216 | size_t machine__fprintf_dsos_buildid(struct machine *machine, FILE *fp, |
229 | bool (skip)(struct dso *dso, int parm), int parm); | 217 | bool (skip)(struct dso *dso, int parm), int parm); |