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 E3D5524CEE8; Fri, 25 Jul 2025 19:38:02 +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=1753472283; cv=none; b=JI7mdLjjJJH+4UofKzt1t7JLK4HdZkiBtTUvl2fa77sxjHYwzkAeVaE8dAhPpON/hsiQZicFuCPDfmC6d1thtb5/5RHUT4/QUxzurOjLQYtBG6fR3we4p6xw/J4is+fofDiOGsc1EyFj2tFDsI05f171UyYuXFEZqS3/Ay8C8Q8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753472283; c=relaxed/simple; bh=+xRfxl6reT2O47Gb7JM+Ilv6ijsGqAACPOiQ1gg1OQE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LK5yv55VGGGDqvgfwkQeup495XS4lH8Jl2WY9DZQ+b8cwIXTC5fU/dpcbsm4DVoYSiLWb1BI8DzNltVzDV27zr0Rj5ogOyC8q06G91+L85+LxmMAPXrIOaUX1Z5KG3CigLGq11Lwfe0EpktqdLhQChRQB+kNyb2AgTnNdwXnHQI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NjPaKvLq; 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="NjPaKvLq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3788AC4CEE7; Fri, 25 Jul 2025 19:38:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753472282; bh=+xRfxl6reT2O47Gb7JM+Ilv6ijsGqAACPOiQ1gg1OQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NjPaKvLqTGop/ine+UqvJrSNOP71Em4gGu1oEJ6Uqdk/XETkYG/4ZhjtwsDcP9tPt cwA2Vr7Q65q5k5ipwur6vTwLktJVRX945P9OYz95rItrGlE1WMZtXt1PwJ9/RmGir+ aiUE3tKYZyfVYkl1F3uzqEqGUrvsYiu//1HN7zjzhhbm90rSAo9o/drt9quEYDceEw ZY7ZrC4YL2MJaOJCIYykJc77n87RyCKL98H7n87+oMNKgi7L3stDFyScmarkGAC2sF 6xREb/V8FTT7AHLokRPmk8fHpOPP8jRwpvDpPFrLLXtOzteljZqTyr3eVzfnUQ419S Vpj+8aH+bTyrw== 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 Subject: [PATCH v4 2/9] perf annotate: Remove __annotation_line__write() Date: Fri, 25 Jul 2025 12:37:48 -0700 Message-ID: <20250725193755.12276-3-namhyung@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250725193755.12276-1-namhyung@kernel.org> References: <20250725193755.12276-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 Get rid of the internal function and convert function arguments into local variables if they are used more than once. Signed-off-by: Namhyung Kim --- tools/perf/util/annotate.c | 46 ++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 0dd475a744b6dfac..69ee83052396b15e 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1935,24 +1935,26 @@ int annotation_br_cntr_entry(char **str, int br_cntr_nr, return -ENOMEM; } -static void __annotation_line__write(struct annotation_line *al, struct annotation *notes, - bool first_line, bool current_entry, bool change_color, int width, - void *obj, unsigned int percent_type, - int (*obj__set_color)(void *obj, int color), - void (*obj__set_percent_color)(void *obj, double percent, bool current), - int (*obj__set_jumps_percent_color)(void *obj, int nr, bool current), - void (*obj__printf)(void *obj, const char *fmt, ...), - void (*obj__write_graph)(void *obj, int graph)) - -{ - double percent_max = annotation_line__max_percent(al, percent_type); - int pcnt_width = annotation__pcnt_width(notes), - cycles_width = annotation__cycles_width(notes); +void annotation_line__write(struct annotation_line *al, struct annotation *notes, + struct annotation_write_ops *wops) +{ + bool current_entry = wops->current_entry; + bool change_color = wops->change_color; + double percent_max = annotation_line__max_percent(al, annotate_opts.percent_type); + int width = wops->width; + int pcnt_width = annotation__pcnt_width(notes); + int cycles_width = annotation__cycles_width(notes); bool show_title = false; char bf[256]; int printed; - - if (first_line && (al->offset == -1 || percent_max == 0.0)) { + void *obj = wops->obj; + int (*obj__set_color)(void *obj, int color) = wops->set_color; + void (*obj__set_percent_color)(void *obj, double percent, bool current) = wops->set_percent_color; + int (*obj__set_jumps_percent_color)(void *obj, int nr, bool current) = wops->set_jumps_percent_color; + void (*obj__printf)(void *obj, const char *fmt, ...) = wops->printf; + void (*obj__write_graph)(void *obj, int graph) = wops->write_graph; + + if (wops->first_line && (al->offset == -1 || percent_max == 0.0)) { if (notes->branch && al->cycles) { if (al->cycles->ipc == 0.0 && al->cycles->avg == 0) show_title = true; @@ -1966,7 +1968,8 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati for (i = 0; i < al->data_nr; i++) { double percent; - percent = annotation_data__percent(&al->data[i], percent_type); + percent = annotation_data__percent(&al->data[i], + annotate_opts.percent_type); obj__set_percent_color(obj, percent, current_entry); if (symbol_conf.show_total_period) { @@ -2115,17 +2118,6 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati } -void annotation_line__write(struct annotation_line *al, struct annotation *notes, - struct annotation_write_ops *wops) -{ - __annotation_line__write(al, notes, wops->first_line, wops->current_entry, - wops->change_color, wops->width, wops->obj, - annotate_opts.percent_type, - wops->set_color, wops->set_percent_color, - wops->set_jumps_percent_color, wops->printf, - wops->write_graph); -} - int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel, struct arch **parch) { -- 2.50.1