Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e597d32 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf report: Get rid of hist_entry__callchain_fprintf() 



It's just a wrapper function to align the start position ofcallchains to
'comm' of each thread if it's a first sort key.  But it doesn't not work
with tracepoint events and also with upcoming hierarchy view.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1453909257-26015-5-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2665b452

tools/perf/ui/stdio/hist.c

+2 −25
Original line number Diff line number Diff line
@@ -349,30 +349,6 @@ static size_t hist_entry_callchain__fprintf(struct hist_entry *he, 
	return 0;

}



static size_t hist_entry__callchain_fprintf(struct hist_entry *he,

					    struct hists *hists,

					    FILE *fp)

{

	int left_margin = 0;

	u64 total_period = hists->stats.total_period;



	if (field_order == NULL && (sort_order == NULL ||

				    !prefixcmp(sort_order, "comm"))) {

		struct perf_hpp_fmt *fmt;



		perf_hpp__for_each_format(fmt) {

			if (!perf_hpp__is_sort_entry(fmt))

				continue;



			/* must be 'comm' sort entry */

			left_margin = fmt->width(fmt, NULL, hists_to_evsel(hists));

			left_margin -= thread__comm_len(he->thread);

			break;

		}

	}

	return hist_entry_callchain__fprintf(he, total_period, left_margin, fp);

}



static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp)

{

	const char *sep = symbol_conf.field_sep;
@@ -418,6 +394,7 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size, 
		.buf		= bf,

		.size		= size,

	};

	u64 total_period = hists->stats.total_period;



	if (size == 0 || size > bfsz)

		size = hpp.size = bfsz;
@@ -427,7 +404,7 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size, 
	ret = fprintf(fp, "%s\n", bf);



	if (symbol_conf.use_callchain)

		ret += hist_entry__callchain_fprintf(he, hists, fp);

		ret += hist_entry_callchain__fprintf(he, total_period, 0, fp);



	return ret;

}