From nobody Wed Feb 11 17:25:43 2026 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 75173C6FD19 for ; Mon, 13 Mar 2023 11:43:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231402AbjCMLn0 (ORCPT ); Mon, 13 Mar 2023 07:43:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231244AbjCMLmO (ORCPT ); Mon, 13 Mar 2023 07:42:14 -0400 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D760B664EF for ; Mon, 13 Mar 2023 04:41:47 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id v21so2463947ple.9 for ; Mon, 13 Mar 2023 04:41:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678707706; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4fUVJ64SEnuw/uEL+nd4TijpPo7wgQdrNlutXsuxFPw=; b=nx7x7sJa4vO1BZbZZBGq8aty9HkU1min3aeiiVvaQq9K/WZb1iYrPP6cZMgRoi0BSC MCGPxPk2OqlG0aD3oieBm6tQ4LTcebLcYiea0Po4kcBybtudYud3j0qvvTlGdw5QmFSt apXGeRgQ7OKmOWyAKKJXLQABCmttd50P8oiuxRfiFSOzkpa4SOIwdLLJQOwU8+jCah9R TYpzBYepRDAUb1oZiwRQN32eBjvXc/F2GvutMAJxJYBDceM1gGeHqm/3yGEQ6Jco8xHn 5aIW6RHLYCBJFhsJsqpZFSGDAZKMxsi/SqEMCVow3DEQpF2IYElj2xFYYFVY9/moWYUg sB7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678707706; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4fUVJ64SEnuw/uEL+nd4TijpPo7wgQdrNlutXsuxFPw=; b=VVTYcdJ8/07i/tSHs2rhz1bbrnBb4BKMN/+wG6RFHnO0/NPm73dVbpPD+Cv2L3iAnR AF9eYOz0bLel548/rIDXdF2Ia7ZHYmZV5P9BYS6bO3b7gAqyfl4cnmXC3T9nb8erbM9b CQJ2aEwABVFqUGIqnkj6iMMEQKdoXce6LK5vvqLxMBxHE0kB4ArZCrYOZ4ZV5c/Ub7i2 JryQfB+aTAzIwYXc51pBmaAWhIrYhYTBhZeqIMN3fqD3Rej5uvsEGumBGQ0SpRzwRSh0 zyJLWCYIFi+br49wAvWOlG7g+QWB4Ris/3lwBc5zVaz3zYFVfnd33JZnYbHyBUBX1VEb wLTA== X-Gm-Message-State: AO0yUKVGLDDn+O5oMGMMZzYB01dEHYb4SGKPU+BU+7BPUHyxh8H6uM0B DXSbGh8avRtjbeZRkFJrBglZkw== X-Google-Smtp-Source: AK7set9/gbxblXwWYHW32OewJZrcp/QcEEM5ARA+uHA/hI74499fd6JnXCDnNkB8KpRvMOYYdJFQZg== X-Received: by 2002:a17:90a:3fce:b0:23b:33ef:7991 with SMTP id u14-20020a17090a3fce00b0023b33ef7991mr6439168pjm.49.1678707705816; Mon, 13 Mar 2023 04:41:45 -0700 (PDT) Received: from leoy-huanghe.lan ([156.59.236.112]) by smtp.gmail.com with ESMTPSA id q21-20020a17090a2e1500b0022335f1dae2sm4281625pjd.22.2023.03.13.04.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 04:41:45 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v4 15/16] perf kvm: Add TUI mode for stat report Date: Mon, 13 Mar 2023 19:40:17 +0800 Message-Id: <20230313114018.543254-16-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230313114018.543254-1-leo.yan@linaro.org> References: <20230313114018.543254-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since we have supported histograms list and prepared the dimensions in the tool, this patch adds TUI mode for stat report. It also adds UI progress for sorting for better user experience. Signed-off-by: Leo Yan --- tools/perf/builtin-kvm.c | 109 ++++++++++++++++++++++++++++++++++++- tools/perf/util/kvm-stat.h | 1 + 2 files changed, 108 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index ab1cd6b5e528..3dd44763d1fc 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -23,6 +23,8 @@ #include "util/data.h" #include "util/ordered-events.h" #include "util/kvm-stat.h" +#include "ui/browsers/hists.h" +#include "ui/progress.h" #include "ui/ui.h" #include "util/string2.h" =20 @@ -495,6 +497,7 @@ static int kvm_hpp_list__parse(struct perf_hpp_list *hp= p_list, =20 static int kvm_hists__init(void) { + kvm_hists.list.nr_header_lines =3D 1; __hists__init(&kvm_hists.hists, &kvm_hists.list); perf_hpp_list__init(&kvm_hists.list); return kvm_hpp_list__parse(&kvm_hists.list, NULL, "ev_name"); @@ -506,6 +509,93 @@ static int kvm_hists__reinit(const char *output, const= char *sort) return kvm_hpp_list__parse(&kvm_hists.list, output, sort); } =20 +static void print_result(struct perf_kvm_stat *kvm); + +#ifdef HAVE_SLANG_SUPPORT +static void kvm_browser__update_nr_entries(struct hist_browser *hb) +{ + struct rb_node *nd =3D rb_first_cached(&hb->hists->entries); + u64 nr_entries =3D 0; + + for (; nd; nd =3D rb_next(nd)) { + struct hist_entry *he =3D rb_entry(nd, struct hist_entry, + rb_node); + + if (!he->filtered) + nr_entries++; + } + + hb->nr_non_filtered_entries =3D nr_entries; +} + +static int kvm_browser__title(struct hist_browser *browser, + char *buf, size_t size) +{ + scnprintf(buf, size, "KVM event statistics (%lu entries)", + browser->nr_non_filtered_entries); + return 0; +} + +static struct hist_browser* +perf_kvm_browser__new(struct hists *hists) +{ + struct hist_browser *browser =3D hist_browser__new(hists); + + if (browser) + browser->title =3D kvm_browser__title; + + return browser; +} + +static int kvm__hists_browse(struct hists *hists) +{ + struct hist_browser *browser; + int key =3D -1; + + browser =3D perf_kvm_browser__new(hists); + if (browser =3D=3D NULL) + return -1; + + /* reset abort key so that it can get Ctrl-C as a key */ + SLang_reset_tty(); + SLang_init_tty(0, 0, 0); + + kvm_browser__update_nr_entries(browser); + + while (1) { + key =3D hist_browser__run(browser, "? - help", true, 0); + + switch (key) { + case 'q': + goto out; + default: + break; + } + } + +out: + hist_browser__delete(browser); + return 0; +} + +static void kvm_display(struct perf_kvm_stat *kvm) +{ + if (!use_browser) + print_result(kvm); + else + kvm__hists_browse(&kvm_hists.hists); +} + +#else + +static void kvm_display(struct perf_kvm_stat *kvm) +{ + use_browser =3D 0; + print_result(kvm); +} + +#endif /* HAVE_SLANG_SUPPORT */ + static const char *get_filename_for_perf_kvm(void) { const char *filename; @@ -970,12 +1060,15 @@ static int filter_cb(struct hist_entry *he, void *ar= g __maybe_unused) =20 static void sort_result(struct perf_kvm_stat *kvm) { + struct ui_progress prog; const char *output_columns =3D "ev_name,sample,percent_sample," "time,percent_time,max_t,min_t,mean_t"; =20 kvm_hists__reinit(output_columns, kvm->sort_key); + ui_progress__init(&prog, kvm_hists.hists.nr_entries, "Sorting..."); hists__collapse_resort(&kvm_hists.hists, NULL); hists__output_resort_cb(&kvm_hists.hists, NULL, filter_cb); + ui_progress__finish(); } =20 static void print_vcpu_info(struct perf_kvm_stat *kvm) @@ -1577,7 +1670,14 @@ static int kvm_events_report_vcpu(struct perf_kvm_st= at *kvm) if (!register_kvm_events_ops(kvm)) goto exit; =20 - setup_pager(); + if (kvm->use_stdio) { + use_browser =3D 0; + setup_pager(); + } else { + use_browser =3D 1; + } + + setup_browser(false); =20 kvm_hists__init(); =20 @@ -1586,7 +1686,7 @@ static int kvm_events_report_vcpu(struct perf_kvm_sta= t *kvm) goto exit; =20 sort_result(kvm); - print_result(kvm); + kvm_display(kvm); =20 exit: return ret; @@ -1693,6 +1793,7 @@ kvm_events_report(struct perf_kvm_stat *kvm, int argc= , const char **argv) OPT_STRING('p', "pid", &kvm->opts.target.pid, "pid", "analyze events only for given process id(s)"), OPT_BOOLEAN('f', "force", &kvm->force, "don't complain, do it"), + OPT_BOOLEAN(0, "stdio", &kvm->use_stdio, "use the stdio interface"), OPT_END() }; =20 @@ -1710,6 +1811,10 @@ kvm_events_report(struct perf_kvm_stat *kvm, int arg= c, const char **argv) kvm_events_report_options); } =20 +#ifndef HAVE_SLANG_SUPPORT + kvm->use_stdio =3D true; +#endif + if (!kvm->opts.target.pid) kvm->opts.target.system_wide =3D true; =20 diff --git a/tools/perf/util/kvm-stat.h b/tools/perf/util/kvm-stat.h index 35d03894fac3..bc6c8e38ef50 100644 --- a/tools/perf/util/kvm-stat.h +++ b/tools/perf/util/kvm-stat.h @@ -103,6 +103,7 @@ struct perf_kvm_stat { unsigned int display_time; bool live; bool force; + bool use_stdio; }; =20 struct kvm_reg_events_ops { --=20 2.34.1