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 24E8316FF37; Thu, 5 Jun 2025 19:55:26 +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=1749153326; cv=none; b=lpq9xoDloHdWcrdzKYMvQdAjn2SqB+gaR0JXduSTbRJcqDKjew3wApJTFZbQ65RoicAOdb/FLDsaN/ZjtvlZVtpIp9jI8XCZrkq8T5SAZZAOXSIq03BAG8yOkQOyLhzLCCqKzwv554zcVl/VHal4Vx4NAOpOUck3ngrlt37/knM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749153326; c=relaxed/simple; bh=F38JJRQ1zkpjZz7rFJYfuQ5/wGD/61lJACf9asEOGAk=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=DrsVzdJ/KbS1Pn5HNkqRdC5c/xZoVNP9MqvbbSRXenlzfR9FG5ZpRLvGAkGal8aIkxeps2u8kWXLtLyv6JzVBU6pj/JwpPnllqGUzfnuZXZH8pwbFqE7PBi/pdYmz1YktWtaKNp39JhVKB+l0ODAU3VdIW4Ly5VUuX4JJElDg8c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P06M9fYY; 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="P06M9fYY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87386C4CEE7; Thu, 5 Jun 2025 19:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1749153326; bh=F38JJRQ1zkpjZz7rFJYfuQ5/wGD/61lJACf9asEOGAk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=P06M9fYYWcGsXl/6YQstcHyDUiEGsmhZLOWbwymFigXHOpp8SGnfXjDhVGyBaE5NW n3PUSYS5R/LlBq/IHNWVdn6WEfNY12wECcWW4ugxBQtmxvRnX1+p0XQz/ZZ/dJJAhx JWkW5Ff4pjooE1GFsFWy/GlnA7RcEpCVKtAL33rwoVc1UkCr26vJEhKAldGM9WTRzc gN/GIOsoT2904o72O6iEyCyvQmEu9003w3+KRR/SKmM0DB5zKNk3za9t8HgKcKQJa/ QcC1S1y1W9sU9gu4Us4SWO5zGS1dR3e1JuxEqcN8rgwbn6N9W97bccy70vSDPVr6Ar zlL1y2c9kPwbw== Date: Thu, 5 Jun 2025 16:55:22 -0300 From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ian Rogers , Kan Liang , Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Athira Rajeev Subject: Re: [PATCH 2/6] perf annotate: Remove __annotation_line__write() Message-ID: References: <20250601065302.12531-1-namhyung@kernel.org> <20250601065302.12531-3-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250601065302.12531-3-namhyung@kernel.org> On Sat, May 31, 2025 at 11:52:58PM -0700, Namhyung Kim wrote: > Get rid of the internal function and convert function arguments into > local variables if they are used more then twice. "more than once"? "twice or more"? - Arnaldo > > Signed-off-by: Namhyung Kim > --- > tools/perf/util/annotate.c | 49 ++++++++++++++++---------------------- > 1 file changed, 20 insertions(+), 29 deletions(-) > > diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c > index 264a212b47df850c..48fac08c4c9502b1 100644 > --- a/tools/perf/util/annotate.c > +++ b/tools/perf/util/annotate.c > @@ -1934,24 +1934,25 @@ 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; > + 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; > @@ -1965,7 +1966,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) { > @@ -2101,10 +2103,10 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati > } > } > > - if (change_color) > + if (wops->change_color) > color = obj__set_color(obj, HE_COLORSET_ADDR); > obj__printf(obj, bf); > - if (change_color) > + if (wops->change_color) > obj__set_color(obj, color); > > disasm_line__write(disasm_line(al), notes, obj, bf, sizeof(bf), obj__printf, obj__write_graph); > @@ -2114,17 +2116,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.49.0