From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AE1D2356B2; Mon, 3 Mar 2025 17:38:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741023490; cv=none; b=nqguEjQf22wG3QdCzKTPgaBVoCurYKO71lijKcNQwBq3QQ7bPagz2jji2GPzzV6B34VX+vodRmXmOKo6ZiR6+auvZiO5gW2aFaBffnQVKKYF5DPH2hVTdY0Nb3N5EsQCYLJOlLEsds5FqkjZsByvpWo8O5tQ8zpYmG9j7AN5muY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741023490; c=relaxed/simple; bh=LJUeiD3dxtTUXh14ZH5BcFePQBSylKZpbtVbu33MvF0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PQYpP5Jfp1Muf9vTbatnTSQ6NU4gXtQ9jPMicQ8ZwvDIWbTLe9KXaxcl9J6tH3yhcaP8ke15l90AZ0svAMoaEsnvdleTgAzWHFeQVQXrEdFwxSnAZSnz/stTzyhOog2joQ5YdVV2fFGdYPsxR9Dx6mVnxVGQnVmUIMn4Pnmw63g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=l2Pf8tVi; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="l2Pf8tVi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5DDF3C4CED6; Mon, 3 Mar 2025 17:38:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741023489; bh=LJUeiD3dxtTUXh14ZH5BcFePQBSylKZpbtVbu33MvF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l2Pf8tVizzK9CCZ1XjgBjghmErQ3CjAheyqFhhfsUHrfVz2LiGkIFDs49ysMNwdsK oLgp9lWR0D8bXZLoFOmF8rzR3VtfSh0vj31KdhW2m//GnNMh4qQoaJS1MS69sv0fl1 E+QypuIbI77j9hQN3C+Rn5kwrMVY26vq/Th1nAJQ6LqzRyNWxC4opAcyQZamyhFnFS DL3MSednB4zfQXRKI5TpyE+fdIq8LFO7OLmL3X37rkAS/+4a/hEA+qa5ayW47NNk7a RJYSQEwz6v0XVPJuHuB8IA2eM1FqQ586xDTAwFvryVApW0L72PDugZTA9M39poLMyT KJO575VWBjVxA== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Athira Rajeev Subject: [PATCH 3/7] perf annotate: Pass annotation_options to annotation_line__print() Date: Mon, 3 Mar 2025 09:38:03 -0800 Message-ID: <20250303173807.1765098-4-namhyung@kernel.org> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog In-Reply-To: <20250303173807.1765098-1-namhyung@kernel.org> References: <20250303173807.1765098-1-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The annotation_line__print() has many arguments. But min_percent, max_lines and percent_type are from struct annotaion_options. So let's pass a pointer to the option instead of passing them separately to reduce the number of function arguments. Actually it has a recursive call if 'queue' is set. Add a new option instance to pass different values for the case. Signed-off-by: Namhyung Kim --- tools/perf/util/annotate.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 2e0f70b4872b475a..469fcc945126f4f7 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -760,13 +760,14 @@ static int disasm_line__print(struct disasm_line *dl, u64 start, int addr_fmt_wi static int annotation_line__print(struct annotation_line *al, struct symbol *sym, u64 start, - struct evsel *evsel, int min_pcnt, int printed, - int max_lines, struct annotation_line *queue, int addr_fmt_width, - int percent_type) + struct evsel *evsel, struct annotation_options *opts, + int printed, struct annotation_line *queue, int addr_fmt_width) { struct disasm_line *dl = container_of(al, struct disasm_line, al); struct annotation *notes = symbol__annotation(sym); static const char *prev_line; + int max_lines = opts->max_lines; + int percent_type = opts->percent_type; if (al->offset != -1) { double max_percent = 0.0; @@ -786,19 +787,25 @@ annotation_line__print(struct annotation_line *al, struct symbol *sym, u64 start if (al->data_nr > nr_percent) nr_percent = al->data_nr; - if (max_percent < min_pcnt) + if (max_percent < opts->min_pcnt) return -1; if (max_lines && printed >= max_lines) return 1; if (queue != NULL) { + struct annotation_options queue_opts = { + .max_lines = 1, + .percent_type = percent_type, + }; + list_for_each_entry_from(queue, ¬es->src->source, node) { if (queue == al) break; annotation_line__print(queue, sym, start, evsel, - 0, 0, 1, NULL, addr_fmt_width, - percent_type); + &queue_opts, /*printed=*/0, + /*queue=*/NULL, + addr_fmt_width); } } @@ -1225,8 +1232,7 @@ int symbol__annotate_printf(struct map_symbol *ms, struct evsel *evsel) } err = annotation_line__print(pos, sym, start, evsel, - opts->min_pcnt, printed, opts->max_lines, - queue, addr_fmt_width, opts->percent_type); + opts, printed, queue, addr_fmt_width); switch (err) { case 0: -- 2.48.1.711.g2feabab25a-goog