Commit d47d876d authored by Ian Rogers's avatar Ian Rogers Committed by Namhyung Kim
Browse files

perf callchain: Make display use of branch_type_stat const 



Display code doesn't modify the branch_type_stat so switch uses to
const. This is done to aid refactoring struct callchain_list where
current the branch_type_stat is embedded even if not used.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: James Clark <james.clark@arm.com>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: liuwenyu <liuwenyu7@huawei.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Song Liu <song@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Yanteng Si <siyanteng@loongson.cn>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Link: https://lore.kernel.org/r/20231024222353.3024098-9-irogers@google.com


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 67a3ebf1

tools/perf/util/branch.c

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ const char *get_branch_type(struct branch_entry *e) 
	return branch_type_name(e->flags.type);

}



void branch_type_stat_display(FILE *fp, struct branch_type_stat *st)

void branch_type_stat_display(FILE *fp, const struct branch_type_stat *st)

{

	u64 total = 0;

	int i;
@@ -171,7 +171,7 @@ static int count_str_scnprintf(int idx, const char *str, char *bf, int size) 
	return scnprintf(bf, size, "%s%s", (idx) ? " " : " (", str);

}



int branch_type_str(struct branch_type_stat *st, char *bf, int size)

int branch_type_str(const struct branch_type_stat *st, char *bf, int size)

{

	int i, j = 0, printed = 0;

	u64 total = 0;

tools/perf/util/branch.h

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ void branch_type_count(struct branch_type_stat *st, struct branch_flags *flags, 
const char *branch_type_name(int type);

const char *branch_new_type_name(int new_type);

const char *get_branch_type(struct branch_entry *e);

void branch_type_stat_display(FILE *fp, struct branch_type_stat *st);

int branch_type_str(struct branch_type_stat *st, char *bf, int bfsize);

void branch_type_stat_display(FILE *fp, const struct branch_type_stat *st);

int branch_type_str(const struct branch_type_stat *st, char *bf, int bfsize);



const char *branch_spec_desc(int spec);

tools/perf/util/callchain.c

+3 −3
Original line number Diff line number Diff line
@@ -1339,7 +1339,7 @@ static int count_float_printf(int idx, const char *str, float value, 
static int branch_to_str(char *bf, int bfsize,

			 u64 branch_count, u64 predicted_count,

			 u64 abort_count,

			 struct branch_type_stat *brtype_stat)

			 const struct branch_type_stat *brtype_stat)

{

	int printed, i = 0;
@@ -1403,7 +1403,7 @@ static int counts_str_build(char *bf, int bfsize, 
			     u64 abort_count, u64 cycles_count,

			     u64 iter_count, u64 iter_cycles,

			     u64 from_count,

			     struct branch_type_stat *brtype_stat)

			     const struct branch_type_stat *brtype_stat)

{

	int printed;
@@ -1430,7 +1430,7 @@ static int callchain_counts_printf(FILE *fp, char *bf, int bfsize, 
				   u64 abort_count, u64 cycles_count,

				   u64 iter_count, u64 iter_cycles,

				   u64 from_count,

				   struct branch_type_stat *brtype_stat)

				   const struct branch_type_stat *brtype_stat)

{

	char str[256];