From mboxrd@z Thu Jan 1 00:00:00 1970 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 75490C433EF for ; Mon, 16 May 2022 09:06:59 +0000 (UTC) Received: from localhost ([::1]:48770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqWgs-0004Ys-Ed for qemu-devel@archiver.kernel.org; Mon, 16 May 2022 05:06:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWct-0001kH-8d for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcr-0007N4-1T for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652691768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NSFER6z0wbGPm10VNA5292fy0AANqadloqali01ZdbE=; b=abrp9zvWVDM7GG/CxHdx5VLr5gdQHVIQFv2Syg0leac7gw2Glr10jX4VaI6AMN++9latZ+ Y/s/S0yE4IiJrTtiaoWa9IyXoiHJosTJcoZV2clT4ktwioKta0gXYGw/+biTvk5PYq/jmb U4G0b1Awm2v6r/e/9/XMWFMFNqM0SGY= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-622-TRHdSY8kM1Cydt2P0Ys73g-1; Mon, 16 May 2022 05:02:47 -0400 X-MC-Unique: TRHdSY8kM1Cydt2P0Ys73g-1 Received: by mail-ej1-f71.google.com with SMTP id sc20-20020a1709078a1400b006f4a358c817so5491117ejc.16 for ; Mon, 16 May 2022 02:02:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NSFER6z0wbGPm10VNA5292fy0AANqadloqali01ZdbE=; b=fIX9fcBCIY4awFCYHTkpR52coyE3aTWNblC+VVYYNMWJmBLlZoVXuDtoH418ffIt7B Rx3dfgP5T0baNbNHrqj+ZqlzvzfpkHC/dpE+sZ9SXCIzACGwg5GUjXs/unk0GYw884JL THSnsbtKhviJFo+dW0FivEUS/q+HqSJwPnK8nlDOdS3jfauSVzDUbzdKqNpee+NWXwlu lDeXe3TQoSsdrE+JpC4dc/XhN2FwTM4d8gfD1RnVMrsQ4e5Ag9x/Sg4rwbb9hy7BrGb+ /CEmWABywwlPmXash2NtNZlirzDtAhkklSF+vV+qBMRhQ//xy9o808aarMIZQPrDta4t vR0w== X-Gm-Message-State: AOAM532mg5ga3ewo4kMgOs076Y+xHk7be+AfhnJ5nhJNn+EXRV27pnl/ T4pi4luH3s1cEcp9FFjwuBDHwYnYzHcafYRxTsva/WAgunp2i7ZZwq4NnEYx92yi5qw16C3U3qM qSnSlct6DGTDeBoYEQVCuSFaBddc+e9+/BKwiNaBFBPQemZT0Iid5DKTABB6mLy42u04= X-Received: by 2002:aa7:d898:0:b0:42a:af71:dc24 with SMTP id u24-20020aa7d898000000b0042aaf71dc24mr5017355edq.162.1652691765446; Mon, 16 May 2022 02:02:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyY2+Fn5KuuiHsvI+fq76gpEh8A7FrxBe0UtUbQ+59TEAotm8jwMJLgMQDTZWO1/OTMLzp37w== X-Received: by 2002:aa7:d898:0:b0:42a:af71:dc24 with SMTP id u24-20020aa7d898000000b0042aaf71dc24mr5017326edq.162.1652691765206; Mon, 16 May 2022 02:02:45 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id g42-20020a056402322a00b0042a9a1cc4bfsm3057930eda.93.2022.05.16.02.02.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 02:02:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, berrange@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v3 6/8] hmp: add filtering of statistics by provider Date: Mon, 16 May 2022 11:02:32 +0200 Message-Id: <20220516090234.1195907-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516090058.1195767-1-pbonzini@redhat.com> References: <20220516090058.1195767-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Allow the user to request statistics for a single provider of interest. Extracted from a patch by Mark Kanda. Signed-off-by: Paolo Bonzini --- hmp-commands-info.hx | 7 ++++--- monitor/hmp-cmds.c | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 221feab8c0..d4d8a1e618 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -897,9 +897,10 @@ ERST { .name = "stats", - .args_type = "target:s", - .params = "target", - .help = "show statistics; target is either vm or vcpu", + .args_type = "target:s,provider:s?", + .params = "target [provider]", + .help = "show statistics for the given target (vm or vcpu); optionally filter by " + "provider", .cmd = hmp_info_stats, }, diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 15f1743d8c..4fa671fe0a 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -2291,6 +2291,7 @@ static StatsSchemaValueList *find_schema_value_list( } static void print_stats_results(Monitor *mon, StatsTarget target, + bool show_provider, StatsResult *result, StatsSchemaList *schema) { @@ -2305,8 +2306,10 @@ static void print_stats_results(Monitor *mon, StatsTarget target, return; } - monitor_printf(mon, "provider: %s\n", - StatsProvider_str(result->provider)); + if (show_provider) { + monitor_printf(mon, "provider: %s\n", + StatsProvider_str(result->provider)); + } for (stats_list = result->stats; stats_list; stats_list = stats_list->next, @@ -2347,7 +2350,8 @@ static void print_stats_results(Monitor *mon, StatsTarget target, } /* Create the StatsFilter that is needed for an "info stats" invocation. */ -static StatsFilter *stats_filter(StatsTarget target, int cpu_index) +static StatsFilter *stats_filter(StatsTarget target, int cpu_index, + StatsProvider provider) { StatsFilter *filter = g_malloc0(sizeof(*filter)); @@ -2369,12 +2373,27 @@ static StatsFilter *stats_filter(StatsTarget target, int cpu_index) default: break; } + + if (provider == STATS_PROVIDER__MAX) { + return filter; + } + + /* "info stats" can only query either one or all the providers. */ + StatsRequest *request = g_new0(StatsRequest, 1); + request->provider = provider; + StatsRequestList *request_list = g_new0(StatsRequestList, 1); + QAPI_LIST_PREPEND(request_list, request); + filter->has_providers = true; + filter->providers = request_list; return filter; } void hmp_info_stats(Monitor *mon, const QDict *qdict) { const char *target_str = qdict_get_str(qdict, "target"); + const char *provider_str = qdict_get_try_str(qdict, "provider"); + + StatsProvider provider = STATS_PROVIDER__MAX; StatsTarget target; Error *err = NULL; g_autoptr(StatsSchemaList) schema = NULL; @@ -2387,19 +2406,27 @@ void hmp_info_stats(Monitor *mon, const QDict *qdict) monitor_printf(mon, "invalid stats target %s\n", target_str); goto exit_no_print; } + if (provider_str) { + provider = qapi_enum_parse(&StatsProvider_lookup, provider_str, -1, &err); + if (err) { + monitor_printf(mon, "invalid stats provider %s\n", provider_str); + goto exit_no_print; + } + } - schema = qmp_query_stats_schemas(false, 0, &err); + schema = qmp_query_stats_schemas(provider_str ? true : false, + provider, &err); if (err) { goto exit; } switch (target) { case STATS_TARGET_VM: - filter = stats_filter(target, -1); + filter = stats_filter(target, -1, provider); break; case STATS_TARGET_VCPU: {} int cpu_index = monitor_get_cpu_index(mon); - filter = stats_filter(target, cpu_index); + filter = stats_filter(target, cpu_index, provider); break; default: abort(); @@ -2410,7 +2437,7 @@ void hmp_info_stats(Monitor *mon, const QDict *qdict) goto exit; } for (entry = stats; entry; entry = entry->next) { - print_stats_results(mon, target, entry->value, schema); + print_stats_results(mon, target, provider_str == NULL, entry->value, schema); } exit: -- 2.36.0