Commit f8603267 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf machine: Remove the indent in resolve_lbr_callchain_sample 



The indent is unnecessary in resolve_lbr_callchain_sample.  Removing it
will make the following patch simpler.

Current code path for resolve_lbr_callchain_sample()

        /* LBR only affects the user callchain */
        if (i != chain_nr) {
                body of the function
                ....
                return 1;
        }

        return 0;

With the patch,

        /* LBR only affects the user callchain */
        if (i == chain_nr)
                return 0;

        body of the function
        ...
        return 1;

No functional changes.

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Reviewed-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pavel Gerasimov <pavel.gerasimov@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Vitaly Slobodskoy <vitaly.slobodskoy@intel.com>
Link: http://lore.kernel.org/lkml/20200319202517.23423-6-kan.liang@linux.intel.com


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

tools/perf/util/machine.c

+63 −60
Original line number Diff line number Diff line
@@ -2208,6 +2208,12 @@ static int resolve_lbr_callchain_sample(struct thread *thread, 
	int chain_nr = min(max_stack, (int)chain->nr), i;

	u8 cpumode = PERF_RECORD_MISC_USER;

	u64 ip, branch_from = 0;

	struct branch_stack *lbr_stack;

	struct branch_entry *entries;

	int lbr_nr, j, k;

	bool branch;

	struct branch_flags *flags;

	int mix_chain_nr;



	for (i = 0; i < chain_nr; i++) {

		if (chain->ips[i] == PERF_CONTEXT_USER)
@@ -2215,12 +2221,12 @@ static int resolve_lbr_callchain_sample(struct thread *thread, 
	}



	/* LBR only affects the user callchain */

	if (i != chain_nr) {

		struct branch_stack *lbr_stack = sample->branch_stack;

		struct branch_entry *entries = perf_sample__branch_entries(sample);

		int lbr_nr = lbr_stack->nr, j, k;

		bool branch;

		struct branch_flags *flags;

	if (i == chain_nr)

		return 0;



	lbr_stack = sample->branch_stack;

	entries = perf_sample__branch_entries(sample);

	lbr_nr = lbr_stack->nr;

	/*

	 * LBR callstack can only get user call chain.

	 * The mix_chain_nr is kernel call chain
@@ -2231,10 +2237,11 @@ static int resolve_lbr_callchain_sample(struct thread *thread, 
	 * For details, please refer to the comments

	 * in callchain__printf

	 */

		int mix_chain_nr = i + 1 + lbr_nr + 1;

	mix_chain_nr = i + 1 + lbr_nr + 1;



	for (j = 0; j < mix_chain_nr; j++) {

		int err;



		branch = false;

		flags = NULL;
@@ -2258,8 +2265,7 @@ static int resolve_lbr_callchain_sample(struct thread *thread, 
				ip = entries[k].from;

				branch = true;

				flags = &entries[k].flags;

				}

				else if (j > lbr_nr)

			} else if (j > lbr_nr)

				ip = chain->ips[i + 1 - (j - lbr_nr)];

			else {

				ip = entries[0].to;
@@ -2279,9 +2285,6 @@ static int resolve_lbr_callchain_sample(struct thread *thread, 
	return 1;

}



	return 0;

}



static int find_prev_cpumode(struct ip_callchain *chain, struct thread *thread,

			     struct callchain_cursor *cursor,

			     struct symbol **parent,

CRA Git | Maintained and supported by SUSTech CRA and CCSE