perf tools: Get current comm instead of last one
At insert time, a hist entry should reference comm at the time otherwise it'll get the last comm anyway. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Tested-by: Jiri Olsa <jolsa@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Link: http://lkml.kernel.org/n/tip-n6pykiiymtgmcjs834go2t8x@git.kernel.org [ Fixed up const pointer issues ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
fedd63d3cd
Коммит
4dfced359f
|
@ -94,6 +94,21 @@ struct comm *comm__new(const char *str, u64 timestamp)
|
||||||
return comm;
|
return comm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void comm__override(struct comm *comm, const char *str, u64 timestamp)
|
||||||
|
{
|
||||||
|
struct comm_str *old = comm->comm_str;
|
||||||
|
|
||||||
|
comm->comm_str = comm_str__findnew(str, &comm_str_root);
|
||||||
|
if (!comm->comm_str) {
|
||||||
|
comm->comm_str = old;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
comm->start = timestamp;
|
||||||
|
comm_str__get(comm->comm_str);
|
||||||
|
comm_str__put(old);
|
||||||
|
}
|
||||||
|
|
||||||
void comm__free(struct comm *comm)
|
void comm__free(struct comm *comm)
|
||||||
{
|
{
|
||||||
comm_str__put(comm->comm_str);
|
comm_str__put(comm->comm_str);
|
||||||
|
|
|
@ -16,5 +16,6 @@ struct comm {
|
||||||
void comm__free(struct comm *comm);
|
void comm__free(struct comm *comm);
|
||||||
struct comm *comm__new(const char *str, u64 timestamp);
|
struct comm *comm__new(const char *str, u64 timestamp);
|
||||||
const char *comm__str(const struct comm *comm);
|
const char *comm__str(const struct comm *comm);
|
||||||
|
void comm__override(struct comm *comm, const char *str, u64 timestamp);
|
||||||
|
|
||||||
#endif /* __PERF_COMM_H */
|
#endif /* __PERF_COMM_H */
|
||||||
|
|
|
@ -416,6 +416,7 @@ struct hist_entry *__hists__add_mem_entry(struct hists *hists,
|
||||||
{
|
{
|
||||||
struct hist_entry entry = {
|
struct hist_entry entry = {
|
||||||
.thread = al->thread,
|
.thread = al->thread,
|
||||||
|
.comm = thread__comm(al->thread),
|
||||||
.ms = {
|
.ms = {
|
||||||
.map = al->map,
|
.map = al->map,
|
||||||
.sym = al->sym,
|
.sym = al->sym,
|
||||||
|
@ -446,6 +447,7 @@ struct hist_entry *__hists__add_branch_entry(struct hists *hists,
|
||||||
{
|
{
|
||||||
struct hist_entry entry = {
|
struct hist_entry entry = {
|
||||||
.thread = al->thread,
|
.thread = al->thread,
|
||||||
|
.comm = thread__comm(al->thread),
|
||||||
.ms = {
|
.ms = {
|
||||||
.map = bi->to.map,
|
.map = bi->to.map,
|
||||||
.sym = bi->to.sym,
|
.sym = bi->to.sym,
|
||||||
|
@ -475,6 +477,7 @@ struct hist_entry *__hists__add_entry(struct hists *hists,
|
||||||
{
|
{
|
||||||
struct hist_entry entry = {
|
struct hist_entry entry = {
|
||||||
.thread = al->thread,
|
.thread = al->thread,
|
||||||
|
.comm = thread__comm(al->thread),
|
||||||
.ms = {
|
.ms = {
|
||||||
.map = al->map,
|
.map = al->map,
|
||||||
.sym = al->sym,
|
.sym = al->sym,
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include "sort.h"
|
#include "sort.h"
|
||||||
#include "hist.h"
|
#include "hist.h"
|
||||||
|
#include "comm.h"
|
||||||
#include "symbol.h"
|
#include "symbol.h"
|
||||||
|
|
||||||
regex_t parent_regex;
|
regex_t parent_regex;
|
||||||
|
@ -81,25 +82,20 @@ static int64_t
|
||||||
sort__comm_cmp(struct hist_entry *left, struct hist_entry *right)
|
sort__comm_cmp(struct hist_entry *left, struct hist_entry *right)
|
||||||
{
|
{
|
||||||
/* Compare the addr that should be unique among comm */
|
/* Compare the addr that should be unique among comm */
|
||||||
return thread__comm_str(right->thread) - thread__comm_str(left->thread);
|
return comm__str(right->comm) - comm__str(left->comm);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int64_t
|
static int64_t
|
||||||
sort__comm_collapse(struct hist_entry *left, struct hist_entry *right)
|
sort__comm_collapse(struct hist_entry *left, struct hist_entry *right)
|
||||||
{
|
{
|
||||||
const char *comm_l = thread__comm_str(left->thread);
|
/* Compare the addr that should be unique among comm */
|
||||||
const char *comm_r = thread__comm_str(right->thread);
|
return comm__str(right->comm) - comm__str(left->comm);
|
||||||
|
|
||||||
if (!comm_l || !comm_r)
|
|
||||||
return cmp_null(comm_l, comm_r);
|
|
||||||
|
|
||||||
return strcmp(comm_l, comm_r);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int hist_entry__comm_snprintf(struct hist_entry *he, char *bf,
|
static int hist_entry__comm_snprintf(struct hist_entry *he, char *bf,
|
||||||
size_t size, unsigned int width)
|
size_t size, unsigned int width)
|
||||||
{
|
{
|
||||||
return repsep_snprintf(bf, size, "%*s", width, thread__comm_str(he->thread));
|
return repsep_snprintf(bf, size, "%*s", width, comm__str(he->comm));
|
||||||
}
|
}
|
||||||
|
|
||||||
struct sort_entry sort_comm = {
|
struct sort_entry sort_comm = {
|
||||||
|
|
|
@ -84,6 +84,7 @@ struct hist_entry {
|
||||||
struct he_stat stat;
|
struct he_stat stat;
|
||||||
struct map_symbol ms;
|
struct map_symbol ms;
|
||||||
struct thread *thread;
|
struct thread *thread;
|
||||||
|
struct comm *comm;
|
||||||
u64 ip;
|
u64 ip;
|
||||||
u64 transaction;
|
u64 transaction;
|
||||||
s32 cpu;
|
s32 cpu;
|
||||||
|
|
|
@ -54,7 +54,7 @@ void thread__delete(struct thread *thread)
|
||||||
free(thread);
|
free(thread);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct comm *thread__comm(const struct thread *thread)
|
struct comm *thread__comm(const struct thread *thread)
|
||||||
{
|
{
|
||||||
if (list_empty(&thread->comm_list))
|
if (list_empty(&thread->comm_list))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -69,8 +69,8 @@ int thread__set_comm(struct thread *thread, const char *str, u64 timestamp)
|
||||||
|
|
||||||
/* Override latest entry if it had no specific time coverage */
|
/* Override latest entry if it had no specific time coverage */
|
||||||
if (!curr->start) {
|
if (!curr->start) {
|
||||||
list_del(&curr->list);
|
comm__override(curr, str, timestamp);
|
||||||
comm__free(curr);
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
new = comm__new(str, timestamp);
|
new = comm__new(str, timestamp);
|
||||||
|
|
|
@ -26,6 +26,7 @@ struct thread {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct machine;
|
struct machine;
|
||||||
|
struct comm;
|
||||||
|
|
||||||
struct thread *thread__new(pid_t pid, pid_t tid);
|
struct thread *thread__new(pid_t pid, pid_t tid);
|
||||||
void thread__delete(struct thread *self);
|
void thread__delete(struct thread *self);
|
||||||
|
@ -36,6 +37,7 @@ static inline void thread__exited(struct thread *thread)
|
||||||
|
|
||||||
int thread__set_comm(struct thread *thread, const char *comm, u64 timestamp);
|
int thread__set_comm(struct thread *thread, const char *comm, u64 timestamp);
|
||||||
int thread__comm_len(struct thread *self);
|
int thread__comm_len(struct thread *self);
|
||||||
|
struct comm *thread__comm(const struct thread *thread);
|
||||||
const char *thread__comm_str(const struct thread *thread);
|
const char *thread__comm_str(const struct thread *thread);
|
||||||
void thread__insert_map(struct thread *self, struct map *map);
|
void thread__insert_map(struct thread *self, struct map *map);
|
||||||
int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp);
|
int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче