Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[safe/jmp/linux-2.6] / tools / perf / util / thread.c

diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index a128512..21b9216 100644 (file)
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -2,13 +2,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include "session.h"
 #include "thread.h"
 #include "util.h"
 #include "debug.h"
 
-static struct rb_root threads;
-static struct thread *last_match;
-
 void map_groups__init(struct map_groups *self)
 {
        int i;
@@ -33,12 +31,41 @@ static struct thread *thread__new(pid_t pid)
        return self;
 }
 
+static void map_groups__flush(struct map_groups *self)
+{
+       int type;
+
+       for (type = 0; type < MAP__NR_TYPES; type++) {
+               struct rb_root *root = &self->maps[type];
+               struct rb_node *next = rb_first(root);
+
+               while (next) {
+                       struct map *pos = rb_entry(next, struct map, rb_node);
+                       next = rb_next(&pos->rb_node);
+                       rb_erase(&pos->rb_node, root);
+                       /*
+                        * We may have references to this map, for
+                        * instance in some hist_entry instances, so
+                        * just move them to a separate list.
+                        */
+                       list_add_tail(&pos->node, &self->removed_maps[pos->type]);
+               }
+       }
+}
+
 int thread__set_comm(struct thread *self, const char *comm)
 {
+       int err;
+
        if (self->comm)
                free(self->comm);
        self->comm = strdup(comm);
-       return self->comm ? 0 : -ENOMEM;
+       err = self->comm == NULL ? -ENOMEM : 0;
+       if (!err) {
+               self->comm_set = true;
+               map_groups__flush(&self->mg);
+       }
+       return err;
 }
 
 int thread__comm_len(struct thread *self)
@@ -52,10 +79,6 @@ int thread__comm_len(struct thread *self)
        return self->comm_len;
 }
 
-static const char *map_type__name[MAP__NR_TYPES] = {
-       [MAP__FUNCTION] = "Functions",
-};
-
 static size_t __map_groups__fprintf_maps(struct map_groups *self,
                                         enum map_type type, FILE *fp)
 {
@@ -121,9 +144,9 @@ static size_t thread__fprintf(struct thread *self, FILE *fp)
               map_groups__fprintf(&self->mg, fp);
 }
 
-struct thread *threads__findnew(pid_t pid)
+struct thread *perf_session__findnew(struct perf_session *self, pid_t pid)
 {
-       struct rb_node **p = &threads.rb_node;
+       struct rb_node **p = &self->threads.rb_node;
        struct rb_node *parent = NULL;
        struct thread *th;
 
@@ -132,15 +155,15 @@ struct thread *threads__findnew(pid_t pid)
         * so most of the time we dont have to look up
         * the full rbtree:
         */
-       if (last_match && last_match->pid == pid)
-               return last_match;
+       if (self->last_match && self->last_match->pid == pid)
+               return self->last_match;
 
        while (*p != NULL) {
                parent = *p;
                th = rb_entry(parent, struct thread, rb_node);
 
                if (th->pid == pid) {
-                       last_match = th;
+                       self->last_match = th;
                        return th;
                }
 
@@ -153,25 +176,13 @@ struct thread *threads__findnew(pid_t pid)
        th = thread__new(pid);
        if (th != NULL) {
                rb_link_node(&th->rb_node, parent, p);
-               rb_insert_color(&th->rb_node, &threads);
-               last_match = th;
+               rb_insert_color(&th->rb_node, &self->threads);
+               self->last_match = th;
        }
 
        return th;
 }
 
-struct thread *register_idle_thread(void)
-{
-       struct thread *thread = threads__findnew(0);
-
-       if (!thread || thread__set_comm(thread, "swapper")) {
-               fprintf(stderr, "problem inserting idle task.\n");
-               exit(-1);
-       }
-
-       return thread;
-}
-
 static void map_groups__remove_overlappings(struct map_groups *self,
                                            struct map *map)
 {
@@ -268,11 +279,14 @@ int thread__fork(struct thread *self, struct thread *parent)
 {
        int i;
 
-       if (self->comm)
-               free(self->comm);
-       self->comm = strdup(parent->comm);
-       if (!self->comm)
-               return -ENOMEM;
+       if (parent->comm_set) {
+               if (self->comm)
+                       free(self->comm);
+               self->comm = strdup(parent->comm);
+               if (!self->comm)
+                       return -ENOMEM;
+               self->comm_set = true;
+       }
 
        for (i = 0; i < MAP__NR_TYPES; ++i)
                if (map_groups__clone(&self->mg, &parent->mg, i) < 0)
@@ -280,12 +294,12 @@ int thread__fork(struct thread *self, struct thread *parent)
        return 0;
 }
 
-size_t threads__fprintf(FILE *fp)
+size_t perf_session__fprintf(struct perf_session *self, FILE *fp)
 {
        size_t ret = 0;
        struct rb_node *nd;
 
-       for (nd = rb_first(&threads); nd; nd = rb_next(nd)) {
+       for (nd = rb_first(&self->threads); nd; nd = rb_next(nd)) {
                struct thread *pos = rb_entry(nd, struct thread, rb_node);
 
                ret += thread__fprintf(pos, fp);