Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[mv-sheeva.git] / tools / perf / util / thread.h

diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index 686d6e914d9e3711bfb1ea8e53e6b275715f2837..c206f72c88811fb959d26d984b2e7a3506621d9a 100644 (file)
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -5,52 +5,66 @@
 #include <unistd.h>
 #include "symbol.h"
 
-struct thread {
-       struct rb_node          rb_node;
+struct map_groups {
        struct rb_root          maps[MAP__NR_TYPES];
        struct list_head        removed_maps[MAP__NR_TYPES];
+};
+
+struct thread {
+       struct rb_node          rb_node;
+       struct map_groups       mg;
        pid_t                   pid;
-       bool                    use_modules;
        char                    shortname[3];
        char                    *comm;
        int                     comm_len;
 };
 
-void thread__init(struct thread *self, pid_t pid);
+void map_groups__init(struct map_groups *self);
 int thread__set_comm(struct thread *self, const char *comm);
 int thread__comm_len(struct thread *self);
-struct thread *threads__findnew(pid_t pid);
-struct thread *register_idle_thread(void);
+struct thread *perf_session__findnew(struct perf_session *self, pid_t pid);
 void thread__insert_map(struct thread *self, struct map *map);
 int thread__fork(struct thread *self, struct thread *parent);
-size_t thread__fprintf_maps(struct thread *self, FILE *fp);
-size_t threads__fprintf(FILE *fp);
+size_t map_groups__fprintf_maps(struct map_groups *self, FILE *fp);
+size_t perf_session__fprintf(struct perf_session *self, FILE *fp);
 
 void maps__insert(struct rb_root *maps, struct map *map);
 struct map *maps__find(struct rb_root *maps, u64 addr);
 
-static inline struct map *thread__find_map(struct thread *self,
+static inline void map_groups__insert(struct map_groups *self, struct map *map)
+{
+        maps__insert(&self->maps[map->type], map);
+}
+
+static inline struct map *map_groups__find(struct map_groups *self,
                                           enum map_type type, u64 addr)
 {
-       return self ? maps__find(&self->maps[type], addr) : NULL;
+       return maps__find(&self->maps[type], addr);
 }
 
-static inline void __thread__insert_map(struct thread *self, struct map *map)
+static inline struct map *thread__find_map(struct thread *self,
+                                          enum map_type type, u64 addr)
 {
-        maps__insert(&self->maps[map->type], map);
+       return self ? map_groups__find(&self->mg, type, addr) : NULL;
 }
 
-void thread__find_addr_location(struct thread *self, u8 cpumode,
+void thread__find_addr_location(struct thread *self,
+                               struct perf_session *session, u8 cpumode,
                                enum map_type type, u64 addr,
                                struct addr_location *al,
                                symbol_filter_t filter);
-struct symbol *thread__find_symbol(struct thread *self,
-                                  enum map_type type, u64 addr,
-                                  symbol_filter_t filter);
+struct symbol *map_groups__find_symbol(struct map_groups *self,
+                                      struct perf_session *session,
+                                      enum map_type type, u64 addr,
+                                      symbol_filter_t filter);
 
 static inline struct symbol *
-thread__find_function(struct thread *self, u64 addr, symbol_filter_t filter)
+map_groups__find_function(struct map_groups *self, struct perf_session *session,
+                         u64 addr, symbol_filter_t filter)
 {
-       return thread__find_symbol(self, MAP__FUNCTION, addr, filter);
+       return map_groups__find_symbol(self, session, MAP__FUNCTION, addr, filter);
 }
+
+struct map *map_groups__find_by_name(struct map_groups *self,
+                                    enum map_type type, const char *name);
 #endif /* __PERF_THREAD_H */