2009-08-14 18:21:53 +08:00
|
|
|
#include "../perf.h"
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
2009-12-14 05:50:28 +08:00
|
|
|
#include "session.h"
|
2009-08-14 18:21:53 +08:00
|
|
|
#include "thread.h"
|
|
|
|
#include "util.h"
|
2009-08-18 23:04:03 +08:00
|
|
|
#include "debug.h"
|
2013-09-11 22:56:44 +08:00
|
|
|
#include "comm.h"
|
2009-08-14 18:21:53 +08:00
|
|
|
|
2013-08-26 21:00:19 +08:00
|
|
|
struct thread *thread__new(pid_t pid, pid_t tid)
|
2009-08-14 18:21:53 +08:00
|
|
|
{
|
2013-09-11 22:56:44 +08:00
|
|
|
char *comm_str;
|
|
|
|
struct comm *comm;
|
2013-10-23 06:01:31 +08:00
|
|
|
struct thread *thread = zalloc(sizeof(*thread));
|
2009-08-14 18:21:53 +08:00
|
|
|
|
2013-10-23 06:01:31 +08:00
|
|
|
if (thread != NULL) {
|
|
|
|
map_groups__init(&thread->mg);
|
|
|
|
thread->pid_ = pid;
|
|
|
|
thread->tid = tid;
|
|
|
|
thread->ppid = -1;
|
2013-09-11 22:56:44 +08:00
|
|
|
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);
|
2009-08-14 18:21:53 +08:00
|
|
|
}
|
|
|
|
|
2013-10-23 06:01:31 +08:00
|
|
|
return thread;
|
2013-09-11 22:56:44 +08:00
|
|
|
|
|
|
|
err_thread:
|
|
|
|
free(thread);
|
|
|
|
return NULL;
|
2009-08-14 18:21:53 +08:00
|
|
|
}
|
|
|
|
|
2013-10-23 06:01:31 +08:00
|
|
|
void thread__delete(struct thread *thread)
|
2010-07-31 05:28:42 +08:00
|
|
|
{
|
2013-09-11 22:56:44 +08:00
|
|
|
struct comm *comm, *tmp;
|
|
|
|
|
2013-10-23 06:01:31 +08:00
|
|
|
map_groups__exit(&thread->mg);
|
2013-09-11 22:56:44 +08:00
|
|
|
list_for_each_entry_safe(comm, tmp, &thread->comm_list, list) {
|
|
|
|
list_del(&comm->list);
|
|
|
|
comm__free(comm);
|
|
|
|
}
|
|
|
|
|
2013-10-23 06:01:31 +08:00
|
|
|
free(thread);
|
2010-07-31 05:28:42 +08:00
|
|
|
}
|
|
|
|
|
2013-09-11 22:56:44 +08:00
|
|
|
static struct comm *thread__comm(const struct thread *thread)
|
2009-08-14 18:21:53 +08:00
|
|
|
{
|
2013-09-11 22:56:44 +08:00
|
|
|
if (list_empty(&thread->comm_list))
|
|
|
|
return NULL;
|
2010-02-26 23:08:34 +08:00
|
|
|
|
2013-09-11 22:56:44 +08:00
|
|
|
return list_first_entry(&thread->comm_list, struct comm, list);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* CHECKME: time should always be 0 if event aren't ordered */
|
|
|
|
int thread__set_comm(struct thread *thread, const char *str, u64 timestamp)
|
|
|
|
{
|
|
|
|
struct comm *new, *curr = thread__comm(thread);
|
|
|
|
|
|
|
|
/* Override latest entry if it had no specific time coverage */
|
|
|
|
if (!curr->start) {
|
|
|
|
list_del(&curr->list);
|
|
|
|
comm__free(curr);
|
2010-02-26 23:08:34 +08:00
|
|
|
}
|
2013-09-11 22:56:44 +08:00
|
|
|
|
|
|
|
new = comm__new(str, timestamp);
|
|
|
|
if (!new)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
list_add(&new->list, &thread->comm_list);
|
|
|
|
thread->comm_set = true;
|
|
|
|
|
|
|
|
return 0;
|
2009-08-14 18:21:53 +08:00
|
|
|
}
|
|
|
|
|
2013-09-11 20:46:56 +08:00
|
|
|
const char *thread__comm_str(const struct thread *thread)
|
|
|
|
{
|
2013-09-11 22:56:44 +08:00
|
|
|
const struct comm *comm = thread__comm(thread);
|
|
|
|
|
|
|
|
if (!comm)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return comm__str(comm);
|
2013-09-11 20:46:56 +08:00
|
|
|
}
|
|
|
|
|
2013-09-11 22:56:44 +08:00
|
|
|
/* CHECKME: it should probably better return the max comm len from its comm list */
|
2013-10-23 06:01:31 +08:00
|
|
|
int thread__comm_len(struct thread *thread)
|
perf tools: Bind callchains to the first sort dimension column
Currently, the callchains are displayed using a constant left
margin. So depending on the current sort dimension
configuration, callchains may appear to be well attached to the
first sort dimension column field which is mostly the case,
except when the first dimension of sorting is done by comm,
because these are right aligned.
This patch binds the callchain to the first letter in the first
column, whatever type of column it is (dso, comm, symbol).
Before:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
After:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
Also, for clarity, we don't put anymore the callchain as is but:
- If we have a top level ancestor in the callchain, start it
with a first ascii hook.
Before:
0.80% perf [kernel] [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
After:
0.80% perf [kernel] [k] __lock_acquire
|
--- __lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
- Otherwise, if we have several top level ancestors, then
display these like we did before:
1.69% Xorg
|
|--21.21%-- vread_hpet
| 0x7fffd85b46fc
| 0x7fffd85b494d
| 0x7f4fafb4e54d
|
|--15.15%-- exaOffscreenAlloc
|
|--9.09%-- I830WaitLpRing
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
LKML-Reference: <1256246604-17156-2-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-23 05:23:23 +08:00
|
|
|
{
|
2013-10-23 06:01:31 +08:00
|
|
|
if (!thread->comm_len) {
|
2013-09-11 22:56:44 +08:00
|
|
|
const char *comm = thread__comm_str(thread);
|
|
|
|
if (!comm)
|
perf tools: Bind callchains to the first sort dimension column
Currently, the callchains are displayed using a constant left
margin. So depending on the current sort dimension
configuration, callchains may appear to be well attached to the
first sort dimension column field which is mostly the case,
except when the first dimension of sorting is done by comm,
because these are right aligned.
This patch binds the callchain to the first letter in the first
column, whatever type of column it is (dso, comm, symbol).
Before:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
After:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
Also, for clarity, we don't put anymore the callchain as is but:
- If we have a top level ancestor in the callchain, start it
with a first ascii hook.
Before:
0.80% perf [kernel] [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
After:
0.80% perf [kernel] [k] __lock_acquire
|
--- __lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
- Otherwise, if we have several top level ancestors, then
display these like we did before:
1.69% Xorg
|
|--21.21%-- vread_hpet
| 0x7fffd85b46fc
| 0x7fffd85b494d
| 0x7f4fafb4e54d
|
|--15.15%-- exaOffscreenAlloc
|
|--9.09%-- I830WaitLpRing
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
LKML-Reference: <1256246604-17156-2-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-23 05:23:23 +08:00
|
|
|
return 0;
|
2013-09-11 22:56:44 +08:00
|
|
|
thread->comm_len = strlen(comm);
|
perf tools: Bind callchains to the first sort dimension column
Currently, the callchains are displayed using a constant left
margin. So depending on the current sort dimension
configuration, callchains may appear to be well attached to the
first sort dimension column field which is mostly the case,
except when the first dimension of sorting is done by comm,
because these are right aligned.
This patch binds the callchain to the first letter in the first
column, whatever type of column it is (dso, comm, symbol).
Before:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
After:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
Also, for clarity, we don't put anymore the callchain as is but:
- If we have a top level ancestor in the callchain, start it
with a first ascii hook.
Before:
0.80% perf [kernel] [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
After:
0.80% perf [kernel] [k] __lock_acquire
|
--- __lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
- Otherwise, if we have several top level ancestors, then
display these like we did before:
1.69% Xorg
|
|--21.21%-- vread_hpet
| 0x7fffd85b46fc
| 0x7fffd85b494d
| 0x7f4fafb4e54d
|
|--15.15%-- exaOffscreenAlloc
|
|--9.09%-- I830WaitLpRing
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
LKML-Reference: <1256246604-17156-2-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-23 05:23:23 +08:00
|
|
|
}
|
|
|
|
|
2013-10-23 06:01:31 +08:00
|
|
|
return thread->comm_len;
|
perf tools: Bind callchains to the first sort dimension column
Currently, the callchains are displayed using a constant left
margin. So depending on the current sort dimension
configuration, callchains may appear to be well attached to the
first sort dimension column field which is mostly the case,
except when the first dimension of sorting is done by comm,
because these are right aligned.
This patch binds the callchain to the first letter in the first
column, whatever type of column it is (dso, comm, symbol).
Before:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
After:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
Also, for clarity, we don't put anymore the callchain as is but:
- If we have a top level ancestor in the callchain, start it
with a first ascii hook.
Before:
0.80% perf [kernel] [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
After:
0.80% perf [kernel] [k] __lock_acquire
|
--- __lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
- Otherwise, if we have several top level ancestors, then
display these like we did before:
1.69% Xorg
|
|--21.21%-- vread_hpet
| 0x7fffd85b46fc
| 0x7fffd85b494d
| 0x7f4fafb4e54d
|
|--15.15%-- exaOffscreenAlloc
|
|--9.09%-- I830WaitLpRing
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
LKML-Reference: <1256246604-17156-2-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-10-23 05:23:23 +08:00
|
|
|
}
|
|
|
|
|
2012-12-08 04:39:39 +08:00
|
|
|
size_t thread__fprintf(struct thread *thread, FILE *fp)
|
2009-12-12 00:50:36 +08:00
|
|
|
{
|
2013-09-11 20:46:56 +08:00
|
|
|
return fprintf(fp, "Thread %d %s\n", thread->tid, thread__comm_str(thread)) +
|
2012-12-08 04:39:39 +08:00
|
|
|
map_groups__fprintf(&thread->mg, verbose, fp);
|
2009-08-14 18:21:53 +08:00
|
|
|
}
|
|
|
|
|
2013-10-23 06:01:31 +08:00
|
|
|
void thread__insert_map(struct thread *thread, struct map *map)
|
2009-09-29 01:48:46 +08:00
|
|
|
{
|
2013-10-23 06:01:31 +08:00
|
|
|
map_groups__fixup_overlappings(&thread->mg, map, verbose, stderr);
|
|
|
|
map_groups__insert(&thread->mg, map);
|
2009-08-14 18:21:53 +08:00
|
|
|
}
|
|
|
|
|
2013-09-11 22:56:44 +08:00
|
|
|
int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp)
|
2009-11-28 02:29:20 +08:00
|
|
|
{
|
2013-09-11 22:56:44 +08:00
|
|
|
int i, err;
|
2009-08-14 18:21:53 +08:00
|
|
|
|
2010-02-20 09:02:07 +08:00
|
|
|
if (parent->comm_set) {
|
2013-09-11 22:56:44 +08:00
|
|
|
const char *comm = thread__comm_str(parent);
|
|
|
|
if (!comm)
|
2010-02-20 09:02:07 +08:00
|
|
|
return -ENOMEM;
|
2013-09-11 22:56:44 +08:00
|
|
|
err = thread__set_comm(thread, comm, timestamp);
|
|
|
|
if (!err)
|
|
|
|
return err;
|
2013-10-23 06:01:31 +08:00
|
|
|
thread->comm_set = true;
|
2010-02-20 09:02:07 +08:00
|
|
|
}
|
2009-08-14 18:21:53 +08:00
|
|
|
|
2009-11-28 02:29:20 +08:00
|
|
|
for (i = 0; i < MAP__NR_TYPES; ++i)
|
2013-10-23 06:01:31 +08:00
|
|
|
if (map_groups__clone(&thread->mg, &parent->mg, i) < 0)
|
2009-08-14 18:21:53 +08:00
|
|
|
return -ENOMEM;
|
2013-05-26 12:47:10 +08:00
|
|
|
|
2013-10-23 06:01:31 +08:00
|
|
|
thread->ppid = parent->tid;
|
2013-05-26 12:47:10 +08:00
|
|
|
|
2009-08-14 18:21:53 +08:00
|
|
|
return 0;
|
|
|
|
}
|