Commit 4dfced35 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Tested-by: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent fedd63d3

tools/perf/util/comm.c

+15 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line 
#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
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE