perf tools: Get current comm instead of last one
tip-bot for Namhyung Kim
merge botCommit-ID: 4dfced359fbc719a35527416f1b4b3999647f68b Gitweb: http://git.kernel.org/tip/4dfced359fbc719a35527416f1b4b3999647f68b Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 13 Sep 2013 16:28:57 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 4 Nov 2013 12:16:39 -0300
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 <[email protected]>
Tested-by Jiri Olsa <[email protected]>
Cc Frederic Weisbecker <[email protected]>
[ Fixed up const pointer issues ]
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/comm.c | 15 +++++++++++++++ tools/perf/util/comm.h | 1 + tools/perf/util/hist.c | 3 +++ tools/perf/util/sort.c | 14 +++++--------- tools/perf/util/sort.h | 1 + tools/perf/util/thread.c | 6 +++--- tools/perf/util/thread.h | 2 ++ 7 files changed, 30 insertions(+), 12 deletions(-)
tools/perf/util/comm.c +15 -0
@@ -94,6 +94,21 @@ struct comm *comm__new(const char *str, u64 timestamp)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) {comm_str__put (comm->comm_str);
tools/perf/util/comm.h +1 -0
@@ -16,5 +16,6 @@ struct comm {void comm__free (struct comm *comm);struct comm *comm__new (const char *str,u64 timestamp);const char *comm__str (const struct comm *comm); +void comm__override (struct comm *comm,const char *str,u64 timestamp);#endif /* __PERF_COMM_H */
tools/perf/util/hist.c +3 -0
@@ -416,6 +416,7 @@ struct hist_entry *__hists__add_mem_entry(struct hists *hists, {struct hist_entry entry = { .thread = al->thread, + .comm =thread__comm (al->thread), .ms = { .map = al->map, .sym = al->sym,
@@ -446,6 +447,7 @@ struct hist_entry *__hists__add_branch_entry(struct hists *hists, {struct hist_entry entry = { .thread = al->thread, + .comm =thread__comm (al->thread), .ms = { .map = bi->to.map, .sym = bi->to.sym,
@@ -475,6 +477,7 @@ struct hist_entry *__hists__add_entry(struct hists *hists, {struct hist_entry entry = { .thread = al->thread, + .comm =thread__comm (al->thread), .ms = { .map = al->map, .sym = al->sym,
tools/perf/util/sort.c +5 -9
@@ -1,5 +1,6 @@#include "sort.h" #include "hist.h" +#include "comm.h" #include "symbol.h" regex_t parent_regex;
@@ -81,25 +82,20 @@ static int64_t sort__comm_cmp(struct hist_entry *left, struct hist_entry *right) {/* 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 sort__comm_collapse (struct hist_entry *left,struct hist_entry *right) { -const char *comm_l =thread__comm_str (left->thread); -const char *comm_r =thread__comm_str (right->thread); - -if (!comm_l || !comm_r) -return cmp_null (comm_l, comm_r); - -return strcmp (comm_l, comm_r); +/* Compare the addr that should be unique among comm */ +return comm__str (right->comm) -comm__str (left->comm); }static int hist_entry__comm_snprintf (struct hist_entry *he,char *bf,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 = {
tools/perf/util/sort.h +1 -0
@@ -84,6 +84,7 @@ struct hist_entry {struct he_stat stat;struct map_symbol ms;struct thread *thread; +struct comm *comm;u64 ip;u64 transaction;s32 cpu;
tools/perf/util/thread.c +3 -3
@@ -54,7 +54,7 @@ void thread__delete(struct thread *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))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 */ if (!curr->start) { -list_del (&curr->list); -comm__free (curr); +comm__override (curr, str, timestamp); +return 0 ; } new =comm__new (str, timestamp);
tools/perf/util/thread.h +2 -0
@@ -26,6 +26,7 @@ struct thread { };struct machine ; +struct comm ;struct thread *thread__new (pid_t pid,pid_t tid);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__comm_len (struct thread *self); +struct comm *thread__comm (const struct thread *thread);const char *thread__comm_str (const struct thread *thread);void thread__insert_map (struct thread *self,struct map *map);int thread__fork (struct thread *thread,struct thread *parent,u64 timestamp);