From nobody Wed May 14 09:51:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1524651690936827.7499363767627; Wed, 25 Apr 2018 03:21:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55D37356C9; Wed, 25 Apr 2018 10:21:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 08AA75D9C5; Wed, 25 Apr 2018 10:21:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 94117180BAD5; Wed, 25 Apr 2018 10:21:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3PAKgJO005021 for ; Wed, 25 Apr 2018 06:20:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 365BA215CDCE; Wed, 25 Apr 2018 10:20:42 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEC82215CDC8 for ; Wed, 25 Apr 2018 10:20:41 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Wed, 25 Apr 2018 12:20:30 +0200 Message-Id: <20180425102030.31145-16-kkoukiou@redhat.com> In-Reply-To: <20180425102030.31145-1-kkoukiou@redhat.com> References: <20180425102030.31145-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 15/15] Implement GetCPUStats method for Domain Interface X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 25 Apr 2018 10:21:30 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou --- data/org.libvirt.Domain.xml | 8 ++++++ src/domain.c | 68 +++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 76 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 8d027dd..9292a91 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -191,6 +191,14 @@ + + + + + + diff --git a/src/domain.c b/src/domain.c index 608f1d1..1c09cc9 100644 --- a/src/domain.c +++ b/src/domain.c @@ -3,6 +3,8 @@ =20 #include =20 +#define VIRT_DBUS_DOMAIN_MAX_CPUS 128 + VIRT_DBUS_ENUM_DECL(virtDBusDomainBlockJob) VIRT_DBUS_ENUM_IMPL(virtDBusDomainBlockJob, VIR_DOMAIN_BLOCK_JOB_TYPE_LAST, @@ -1041,6 +1043,71 @@ virtDBusDomainGetControlInfo(GVariant *inArgs, errorReasonStr, controlInfo->stateTime); } =20 +static void +virtDBusDomainGetCPUStats(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virDomain) domain =3D NULL; + g_auto(virtDBusUtilTypedParams) params =3D { 0 }; + gint startCPU =3D 0; + guint ncpus =3D VIRT_DBUS_DOMAIN_MAX_CPUS; + gboolean total; + guint flags; + GVariant *gret; + GVariantBuilder builder; + gint ret; + + g_variant_get(inArgs, "(bu)", &total, &flags); + + domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (total) { + startCPU =3D -1; + ncpus =3D 1; + } + params.nparams =3D virDomainGetCPUStats(domain, NULL, 0, 0, 1, flags); + if (params.nparams < 0) + return virtDBusUtilSetLastVirtError(error); + params.params =3D g_new0(virTypedParameter, ncpus * params.nparams + 1= ); + + ret =3D virDomainGetCPUStats(domain, params.params, params.nparams, + startCPU, ncpus, flags); + if (ret < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("a(sa{sv})")); + + for (guint i =3D 0; i < ncpus; i++) { + GVariant *grecords; + g_autofree gchar *name =3D NULL; + + if (params.params[i * params.nparams].type =3D=3D 0) + continue; + + g_variant_builder_open(&builder, G_VARIANT_TYPE("(sa{sv})")); + grecords =3D virtDBusUtilTypedParamsToGVariant(params.params + i*p= arams.nparams, + params.nparams); + if (!total) + name =3D g_strdup_printf("CPU%d", i + startCPU); + else + name =3D g_strdup_printf("Total"); + g_variant_builder_add(&builder, "s", name); + g_variant_builder_add_value(&builder, grecords); + g_variant_builder_close(&builder); + } + gret =3D g_variant_builder_end(&builder); + + *outArgs =3D g_variant_new_tuple(&gret, 1); +} + static void virtDBusDomainGetDiskErrors(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2516,6 +2583,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodT= able[] =3D { { "GetBlockIoTune", virtDBusDomainGetBlockIoTune }, { "GetBlockJobInfo", virtDBusDomainGetBlockJobInfo }, { "GetControlInfo", virtDBusDomainGetControlInfo }, + { "GetCPUStats", virtDBusDomainGetCPUStats }, { "GetDiskErrors", virtDBusDomainGetDiskErrors }, { "GetFSInfo", virtDBusDomainGetFSInfo }, { "GetGuestVcpus", virtDBusDomainGetGuestVcpus }, --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list