diff options
-rw-r--r-- | tools/perf/util/build-id.c | 18 | ||||
-rw-r--r-- | tools/perf/util/map.c | 33 | ||||
-rw-r--r-- | tools/perf/util/map.h | 1 | ||||
-rw-r--r-- | tools/perf/util/thread.c | 7 | ||||
-rw-r--r-- | tools/perf/util/thread.h | 2 |
5 files changed, 61 insertions, 0 deletions
diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index 5c26e2d314af..e437edb72417 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include "event.h" | 12 | #include "event.h" |
13 | #include "symbol.h" | 13 | #include "symbol.h" |
14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
15 | #include "debug.h" | ||
15 | 16 | ||
16 | static int build_id__mark_dso_hit(event_t *event, struct perf_session *session) | 17 | static int build_id__mark_dso_hit(event_t *event, struct perf_session *session) |
17 | { | 18 | { |
@@ -34,10 +35,27 @@ static int build_id__mark_dso_hit(event_t *event, struct perf_session *session) | |||
34 | return 0; | 35 | return 0; |
35 | } | 36 | } |
36 | 37 | ||
38 | static int event__exit_del_thread(event_t *self, struct perf_session *session) | ||
39 | { | ||
40 | struct thread *thread = perf_session__findnew(session, self->fork.tid); | ||
41 | |||
42 | dump_printf("(%d:%d):(%d:%d)\n", self->fork.pid, self->fork.tid, | ||
43 | self->fork.ppid, self->fork.ptid); | ||
44 | |||
45 | if (thread) { | ||
46 | rb_erase(&thread->rb_node, &session->threads); | ||
47 | session->last_match = NULL; | ||
48 | thread__delete(thread); | ||
49 | } | ||
50 | |||
51 | return 0; | ||
52 | } | ||
53 | |||
37 | struct perf_event_ops build_id__mark_dso_hit_ops = { | 54 | struct perf_event_ops build_id__mark_dso_hit_ops = { |
38 | .sample = build_id__mark_dso_hit, | 55 | .sample = build_id__mark_dso_hit, |
39 | .mmap = event__process_mmap, | 56 | .mmap = event__process_mmap, |
40 | .fork = event__process_task, | 57 | .fork = event__process_task, |
58 | .exit = event__exit_del_thread, | ||
41 | }; | 59 | }; |
42 | 60 | ||
43 | char *dso__build_id_filename(struct dso *self, char *bf, size_t size) | 61 | char *dso__build_id_filename(struct dso *self, char *bf, size_t size) |
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 37cab9038538..2ddbae319de5 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c | |||
@@ -228,6 +228,39 @@ void map_groups__init(struct map_groups *self) | |||
228 | self->machine = NULL; | 228 | self->machine = NULL; |
229 | } | 229 | } |
230 | 230 | ||
231 | static void maps__delete(struct rb_root *self) | ||
232 | { | ||
233 | struct rb_node *next = rb_first(self); | ||
234 | |||
235 | while (next) { | ||
236 | struct map *pos = rb_entry(next, struct map, rb_node); | ||
237 | |||
238 | next = rb_next(&pos->rb_node); | ||
239 | rb_erase(&pos->rb_node, self); | ||
240 | map__delete(pos); | ||
241 | } | ||
242 | } | ||
243 | |||
244 | static void maps__delete_removed(struct list_head *self) | ||
245 | { | ||
246 | struct map *pos, *n; | ||
247 | |||
248 | list_for_each_entry_safe(pos, n, self, node) { | ||
249 | list_del(&pos->node); | ||
250 | map__delete(pos); | ||
251 | } | ||
252 | } | ||
253 | |||
254 | void map_groups__exit(struct map_groups *self) | ||
255 | { | ||
256 | int i; | ||
257 | |||
258 | for (i = 0; i < MAP__NR_TYPES; ++i) { | ||
259 | maps__delete(&self->maps[i]); | ||
260 | maps__delete_removed(&self->removed_maps[i]); | ||
261 | } | ||
262 | } | ||
263 | |||
231 | void map_groups__flush(struct map_groups *self) | 264 | void map_groups__flush(struct map_groups *self) |
232 | { | 265 | { |
233 | int type; | 266 | int type; |
diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index 3b2f706c0ba2..20eba420ddae 100644 --- a/tools/perf/util/map.h +++ b/tools/perf/util/map.h | |||
@@ -127,6 +127,7 @@ size_t __map_groups__fprintf_maps(struct map_groups *self, | |||
127 | void maps__insert(struct rb_root *maps, struct map *map); | 127 | void maps__insert(struct rb_root *maps, struct map *map); |
128 | struct map *maps__find(struct rb_root *maps, u64 addr); | 128 | struct map *maps__find(struct rb_root *maps, u64 addr); |
129 | void map_groups__init(struct map_groups *self); | 129 | void map_groups__init(struct map_groups *self); |
130 | void map_groups__exit(struct map_groups *self); | ||
130 | int map_groups__clone(struct map_groups *self, | 131 | int map_groups__clone(struct map_groups *self, |
131 | struct map_groups *parent, enum map_type type); | 132 | struct map_groups *parent, enum map_type type); |
132 | size_t map_groups__fprintf(struct map_groups *self, int verbose, FILE *fp); | 133 | size_t map_groups__fprintf(struct map_groups *self, int verbose, FILE *fp); |
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index 9a448b47400c..8c72d888e449 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c | |||
@@ -62,6 +62,13 @@ static struct thread *thread__new(pid_t pid) | |||
62 | return self; | 62 | return self; |
63 | } | 63 | } |
64 | 64 | ||
65 | void thread__delete(struct thread *self) | ||
66 | { | ||
67 | map_groups__exit(&self->mg); | ||
68 | free(self->comm); | ||
69 | free(self); | ||
70 | } | ||
71 | |||
65 | int thread__set_comm(struct thread *self, const char *comm) | 72 | int thread__set_comm(struct thread *self, const char *comm) |
66 | { | 73 | { |
67 | int err; | 74 | int err; |
diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h index ee6bbcf277ca..688500ff826f 100644 --- a/tools/perf/util/thread.h +++ b/tools/perf/util/thread.h | |||
@@ -20,6 +20,8 @@ struct thread { | |||
20 | 20 | ||
21 | struct perf_session; | 21 | struct perf_session; |
22 | 22 | ||
23 | void thread__delete(struct thread *self); | ||
24 | |||
23 | int find_all_tid(int pid, pid_t ** all_tid); | 25 | int find_all_tid(int pid, pid_t ** all_tid); |
24 | int thread__set_comm(struct thread *self, const char *comm); | 26 | int thread__set_comm(struct thread *self, const char *comm); |
25 | int thread__comm_len(struct thread *self); | 27 | int thread__comm_len(struct thread *self); |