1 files changed, 59 insertions, 34 deletions

diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index 686d6e914d9..3c0c2724f82 100644
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -2,55 +2,80 @@
 #define __PERF_THREAD_H
 
 #include <linux/rbtree.h>
+#include <linux/list.h>
 #include <unistd.h>
+#include <sys/types.h>
 #include "symbol.h"
+#include <strlist.h>
 
 struct thread {
-	struct rb_node		rb_node;
-	struct rb_root		maps[MAP__NR_TYPES];
-	struct list_head	removed_maps[MAP__NR_TYPES];
-	pid_t			pid;
-	bool			use_modules;
+	union {
+		struct rb_node	 rb_node;
+		struct list_head node;
+	};
+	struct map_groups	*mg;
+	pid_t			pid_; /* Not all tools update this */
+	pid_t			tid;
+	pid_t			ppid;
 	char			shortname[3];
-	char			*comm;
+	bool			comm_set;
+	bool			dead; /* if set thread has exited */
+	struct list_head	comm_list;
 	int			comm_len;
+
+	void			*priv;
 };
 
-void thread__init(struct thread *self, pid_t pid);
-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);
-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);
-
-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,
-					   enum map_type type, u64 addr)
+struct machine;
+struct comm;
+
+struct thread *thread__new(pid_t pid, pid_t tid);
+int thread__init_map_groups(struct thread *thread, struct machine *machine);
+void thread__delete(struct thread *thread);
+static inline void thread__exited(struct thread *thread)
 {
-	return self ? maps__find(&self->maps[type], addr) : NULL;
+	thread->dead = true;
 }
 
-static inline void __thread__insert_map(struct thread *self, struct map *map)
+int thread__set_comm(struct thread *thread, const char *comm, u64 timestamp);
+int thread__comm_len(struct thread *thread);
+struct comm *thread__comm(const struct thread *thread);
+const char *thread__comm_str(const struct thread *thread);
+void thread__insert_map(struct thread *thread, struct map *map);
+int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp);
+size_t thread__fprintf(struct thread *thread, FILE *fp);
+
+void thread__find_addr_map(struct thread *thread, struct machine *machine,
+			   u8 cpumode, enum map_type type, u64 addr,
+			   struct addr_location *al);
+
+void thread__find_addr_location(struct thread *thread, struct machine *machine,
+				u8 cpumode, enum map_type type, u64 addr,
+				struct addr_location *al);
+
+void thread__find_cpumode_addr_location(struct thread *thread,
+					struct machine *machine,
+					enum map_type type, u64 addr,
+					struct addr_location *al);
+
+static inline void *thread__priv(struct thread *thread)
 {
-	 maps__insert(&self->maps[map->type], map);
+	return thread->priv;
 }
 
-void thread__find_addr_location(struct thread *self, 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);
+static inline void thread__set_priv(struct thread *thread, void *p)
+{
+	thread->priv = p;
+}
 
-static inline struct symbol *
-thread__find_function(struct thread *self, u64 addr, symbol_filter_t filter)
+static inline bool thread__is_filtered(struct thread *thread)
 {
-	return thread__find_symbol(self, MAP__FUNCTION, addr, filter);
+	if (symbol_conf.comm_list &&
+	    !strlist__has_entry(symbol_conf.comm_list, thread__comm_str(thread))) {
+		return true;
+	}
+
+	return false;
 }
+
 #endif	/* __PERF_THREAD_H */