diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /tools/perf/util/thread.c | |
parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'tools/perf/util/thread.c')
-rw-r--r-- | tools/perf/util/thread.c | 136 |
1 files changed, 43 insertions, 93 deletions
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index 49eaf1d..e3d4a55 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c @@ -6,136 +6,86 @@ #include "thread.h" #include "util.h" #include "debug.h" -#include "comm.h" struct thread *thread__new(pid_t pid, pid_t tid) { - char *comm_str; - struct comm *comm; - struct thread *thread = zalloc(sizeof(*thread)); - - if (thread != NULL) { - map_groups__init(&thread->mg); - thread->pid_ = pid; - thread->tid = tid; - thread->ppid = -1; - INIT_LIST_HEAD(&thread->comm_list); - - comm_str = malloc(32); - if (!comm_str) - goto err_thread; - - snprintf(comm_str, 32, ":%d", tid); - comm = comm__new(comm_str, 0); - free(comm_str); - if (!comm) - goto err_thread; - - list_add(&comm->list, &thread->comm_list); - } - - return thread; - -err_thread: - free(thread); - return NULL; -} - -void thread__delete(struct thread *thread) -{ - struct comm *comm, *tmp; - - map_groups__exit(&thread->mg); - list_for_each_entry_safe(comm, tmp, &thread->comm_list, list) { - list_del(&comm->list); - comm__free(comm); + struct thread *self = zalloc(sizeof(*self)); + + if (self != NULL) { + map_groups__init(&self->mg); + self->pid_ = pid; + self->tid = tid; + self->ppid = -1; + self->comm = malloc(32); + if (self->comm) + snprintf(self->comm, 32, ":%d", self->tid); } - free(thread); + return self; } -struct comm *thread__comm(const struct thread *thread) +void thread__delete(struct thread *self) { - if (list_empty(&thread->comm_list)) - return NULL; - - return list_first_entry(&thread->comm_list, struct comm, list); + map_groups__exit(&self->mg); + free(self->comm); + free(self); } -/* CHECKME: time should always be 0 if event aren't ordered */ -int thread__set_comm(struct thread *thread, const char *str, u64 timestamp) +int thread__set_comm(struct thread *self, const char *comm) { - struct comm *new, *curr = thread__comm(thread); - - /* Override latest entry if it had no specific time coverage */ - if (!curr->start) { - comm__override(curr, str, timestamp); - } else { - new = comm__new(str, timestamp); - if (!new) - return -ENOMEM; - list_add(&new->list, &thread->comm_list); + int err; + + if (self->comm) + free(self->comm); + self->comm = strdup(comm); + err = self->comm == NULL ? -ENOMEM : 0; + if (!err) { + self->comm_set = true; } - - thread->comm_set = true; - - return 0; -} - -const char *thread__comm_str(const struct thread *thread) -{ - const struct comm *comm = thread__comm(thread); - - if (!comm) - return NULL; - - return comm__str(comm); + return err; } -/* CHECKME: it should probably better return the max comm len from its comm list */ -int thread__comm_len(struct thread *thread) +int thread__comm_len(struct thread *self) { - if (!thread->comm_len) { - const char *comm = thread__comm_str(thread); - if (!comm) + if (!self->comm_len) { + if (!self->comm) return 0; - thread->comm_len = strlen(comm); + self->comm_len = strlen(self->comm); } - return thread->comm_len; + return self->comm_len; } size_t thread__fprintf(struct thread *thread, FILE *fp) { - return fprintf(fp, "Thread %d %s\n", thread->tid, thread__comm_str(thread)) + + return fprintf(fp, "Thread %d %s\n", thread->tid, thread->comm) + map_groups__fprintf(&thread->mg, verbose, fp); } -void thread__insert_map(struct thread *thread, struct map *map) +void thread__insert_map(struct thread *self, struct map *map) { - map_groups__fixup_overlappings(&thread->mg, map, verbose, stderr); - map_groups__insert(&thread->mg, map); + map_groups__fixup_overlappings(&self->mg, map, verbose, stderr); + map_groups__insert(&self->mg, map); } -int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp) +int thread__fork(struct thread *self, struct thread *parent) { - int i, err; + int i; if (parent->comm_set) { - const char *comm = thread__comm_str(parent); - if (!comm) + if (self->comm) + free(self->comm); + self->comm = strdup(parent->comm); + if (!self->comm) return -ENOMEM; - err = thread__set_comm(thread, comm, timestamp); - if (!err) - return err; - thread->comm_set = true; + self->comm_set = true; } for (i = 0; i < MAP__NR_TYPES; ++i) - if (map_groups__clone(&thread->mg, &parent->mg, i) < 0) + if (map_groups__clone(&self->mg, &parent->mg, i) < 0) return -ENOMEM; - thread->ppid = parent->tid; + self->ppid = parent->tid; return 0; } |