From nobody Mon Oct 20 10:10:02 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5520CC7EE2E for ; Thu, 8 Jun 2023 08:45:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235603AbjFHIpb (ORCPT ); Thu, 8 Jun 2023 04:45:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235309AbjFHIpP (ORCPT ); Thu, 8 Jun 2023 04:45:15 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C257F2722 for ; Thu, 8 Jun 2023 01:44:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686213870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XnU7vO/Lef60I/awCgl/js8i+Cy2VjkJQlcit7aefu0=; b=K8BA0uSwXJ1nGRMauF2Cn0PbZu0kMmTe187IIVVlWTsE+V7Y99VJQurCbhKNiZJoPpdk0/ b/lUjCDE6SBEDIbDdS5pzVe/JFyD3ayzdxLqxaNtILYgLCNwcK8tDRSpBWjERchVvA6ws6 gyY0YuBEMdU3vWGua8RJTQ+4EvgmD0Y= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-561-D11iVY6IP12GX1ipyT5aEQ-1; Thu, 08 Jun 2023 04:44:24 -0400 X-MC-Unique: D11iVY6IP12GX1ipyT5aEQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1F361811E7F; Thu, 8 Jun 2023 08:44:24 +0000 (UTC) Received: from samus.usersys.redhat.com (unknown [10.43.17.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82E9E40CFD46; Thu, 8 Jun 2023 08:44:22 +0000 (UTC) From: Artem Savkov To: linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Namhyung Kim Cc: Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , linux-kernel@vger.kernel.org, Artem Savkov Subject: [PATCH v2 2/2] perf tools: allow running annotation browser from c2c-report Date: Thu, 8 Jun 2023 10:44:07 +0200 Message-Id: <20230608084407.140323-3-asavkov@redhat.com> In-Reply-To: <20230608084407.140323-1-asavkov@redhat.com> References: <20230608084407.140323-1-asavkov@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add a shortcut to run annotation browser for selected symbol from c2c report TUI. Signed-off-by: Artem Savkov --- tools/perf/builtin-c2c.c | 73 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index 05dfd98af170b..dce8604837aec 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -24,6 +24,7 @@ #include #include #include +#include "map.h" #include "map_symbol.h" #include "mem-events.h" #include "session.h" @@ -43,6 +44,8 @@ #include "ui/progress.h" #include "pmus.h" #include "string2.h" +#include "util/annotate.h" +#include "util/dso.h" #include "util/util.h" =20 struct c2c_hists { @@ -111,6 +114,9 @@ struct perf_c2c { char *cl_sort; char *cl_resort; char *cl_output; + + struct evlist *evlist; + struct annotation_options annotation_opts; }; =20 enum { @@ -327,6 +333,9 @@ static int process_sample_event(struct perf_tool *tool = __maybe_unused, c2c_he__set_node(c2c_he, sample); =20 hists__inc_nr_samples(&c2c_hists->hists, he->filtered); + if (use_browser =3D=3D 1 && al.map !=3D NULL && al.sym !=3D NULL) + hist_entry__inc_addr_samples(he, sample, evsel, al.addr); + ret =3D hist_entry__append_callchain(he, sample); =20 if (!ret) { @@ -364,6 +373,9 @@ static int process_sample_event(struct perf_tool *tool = __maybe_unused, c2c_he__set_node(c2c_he, sample); =20 hists__inc_nr_samples(&c2c_hists->hists, he->filtered); + if (use_browser =3D=3D 1 && al.map !=3D NULL && al.sym !=3D NULL) + hist_entry__inc_addr_samples(he, sample, evsel, al.addr); + ret =3D hist_entry__append_callchain(he, sample); } =20 @@ -2612,6 +2624,43 @@ c2c_cacheline_browser__new(struct hists *hists, stru= ct hist_entry *he) return browser; } =20 +static void do_annotate(struct hist_browser *browser, struct evsel *evsel)= { + struct map_symbol ms =3D { NULL, NULL, NULL }; + + if (!browser->selection || + !browser->selection->map || + !browser->selection->map->dso || + browser->selection->map->dso->annotate_warned) { + return; + } + + ms.map =3D browser->selection->map; + + if (!browser->selection->sym) { + if (!browser->he_selection) + return; + + ms.sym =3D symbol__new_unresolved(browser->he_selection->ip, + browser->selection->map); + + if (!ms.sym) + return; + } else { + if (symbol__annotation(browser->selection->sym)->src =3D=3D NULL) { + ui_browser__warning(&browser->b, 0, + "No samples for the \"%s\" symbol.\n\n", + browser->selection->sym->name); + return; + } + ms.sym =3D browser->selection->sym; + } + + map_symbol__tui_annotate(&ms, evsel, browser->hbt, &c2c.annotation_opts); + + ui_browser__update_nr_entries(&browser->b, browser->hists->nr_entries); + ui_browser__handle_resize(&browser->b); +} + static int perf_c2c__browse_cacheline(struct hist_entry *he) { struct c2c_hist_entry *c2c_he; @@ -2621,6 +2670,7 @@ static int perf_c2c__browse_cacheline(struct hist_ent= ry *he) int key =3D -1; static const char help[] =3D " ENTER Toggle callchains (if present) \n" + " a Annotate current symbol\n" " n Toggle Node details info \n" " s Toggle full length of symbol and source line columns \n" " q Return back to cacheline list \n"; @@ -2650,6 +2700,9 @@ static int perf_c2c__browse_cacheline(struct hist_ent= ry *he) key =3D hist_browser__run(browser, "? - help", true, 0); =20 switch (key) { + case 'a': + do_annotate(browser, evlist__first(c2c.evlist)); + break; case 's': c2c.symbol_full =3D !c2c.symbol_full; break; @@ -3045,6 +3098,10 @@ static int perf_c2c__report(int argc, const char **a= rgv) int err =3D 0; const char *output_str, *sort_str =3D NULL; =20 + annotation_options__init(&c2c.annotation_opts); + + hists__init(); + argc =3D parse_options(argc, argv, options, report_c2c_usage, PARSE_OPT_STOP_AT_NON_OPTION); if (argc) @@ -3118,6 +3175,16 @@ static int perf_c2c__report(int argc, const char **a= rgv) if (err) goto out_mem2node; =20 + c2c.evlist =3D session->evlist; + + if (c2c.use_stdio) { + use_browser =3D 0; + } else { + use_browser =3D 1; + symbol__annotation_init(); + annotation_config__init(&c2c.annotation_opts); + } + if (symbol__init(&session->header.env) < 0) goto out_mem2node; =20 @@ -3127,11 +3194,6 @@ static int perf_c2c__report(int argc, const char **a= rgv) goto out_mem2node; } =20 - if (c2c.use_stdio) - use_browser =3D 0; - else - use_browser =3D 1; - setup_browser(false); =20 err =3D perf_session__process_events(session); @@ -3202,6 +3264,7 @@ static int perf_c2c__report(int argc, const char **ar= gv) out_session: perf_session__delete(session); out: + annotation_options__exit(&c2c.annotation_opts); return err; } =20 --=20 2.40.1