[libvirt] [dbus PATCH v2 04/22] Implement MemoryStats for Domain Interface

[Pavel Hrdina]

On Thu, Apr 12, 2018 at 04:32:43PM +0200, Katerina Koukiou wrote:
> This method is not tested for now since the test driver
> doesn't support this API.
> 
> Signed-off-by: Katerina Koukiou <kkoukiou at redhat.com>
> ---
>  data/org.libvirt.Domain.xml |  7 ++++++
>  src/domain.c                | 52 +++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 59 insertions(+)
> 
> diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
> index dbeafce..6795d30 100644
> --- a/data/org.libvirt.Domain.xml
> +++ b/data/org.libvirt.Domain.xml
> @@ -69,6 +69,13 @@
>        <arg name="flags" type="u" direction="in"/>
>        <arg name="xml" type="s" direction="out"/>
>      </method>
> +    <method name="MemoryStats">
> +      <annotation name="org.gtk.GDBus.DocString"
> +        value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainMemoryStats"/>
> +      <arg name="nr_stats" type="u" direction="in"/>
> +      <arg name="flags" type="u" direction="in"/>
> +      <arg name="stats" type="a{st}" direction="out"/>
> +    </method>
>      <method name="Reboot">
>        <annotation name="org.gtk.GDBus.DocString"
>          value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainReboot"/>
> diff --git a/src/domain.c b/src/domain.c
> index 9b3de57..59118b9 100644
> --- a/src/domain.c
> +++ b/src/domain.c
> @@ -17,6 +17,24 @@ VIRT_DBUS_ENUM_IMPL(virtDBusDomainMemoryStat,
>                      "usable",
>                      "last_update")
>  
> +static GVariant *
> +virtDBusDomainMemoryStatsToGVariant(virDomainMemoryStatPtr stats,
> +                                    gint nr_stats)
> +{
> +    GVariantBuilder builder;
> +
> +    g_variant_builder_init(&builder, G_VARIANT_TYPE("a{st}"));
> +
> +    for (gint i = 0; i < nr_stats; i++) {
> +        const gchar *memoryStat = virtDBusDomainMemoryStatTypeToString(stats[i].tag);
> +        if (!memoryStat)
> +            return 0;
> +        g_variant_builder_add(&builder, "{st}", memoryStat, stats[i].val);
> +    }
> +
> +    return g_variant_builder_end(&builder);
> +}
> +
>  static virDomainPtr
>  virtDBusDomainGetVirDomain(virtDBusConnect *connect,
>                             const gchar *objectPath,
> @@ -412,6 +430,39 @@ virtDBusDomainGetXMLDesc(GVariant *inArgs,
>      *outArgs = g_variant_new("(s)", xml);
>  }
>  
> +static void
> +virtDBusDomainMemoryStats(GVariant *inArgs,
> +                          GUnixFDList *inFDs G_GNUC_UNUSED,
> +                          const gchar *objectPath,
> +                          gpointer userData,
> +                          GVariant **outArgs,
> +                          GUnixFDList **outFDs G_GNUC_UNUSED,
> +                          GError **error)
> +{
> +    virtDBusConnect *connect = userData;
> +    g_autoptr(virDomain) domain = NULL;
> +    g_autofree virDomainMemoryStatPtr stats = NULL;
> +    guint max_stats;
> +    gint nr_stats;
> +    guint flags;
> +    GVariant *gstats;
> +
> +    g_variant_get(inArgs, "(uu)", &max_stats, &flags);
> +
> +    domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
> +    if (!domain)
> +        return;
> +
> +    stats = g_new0(virDomainMemoryStatStruct, max_stats);

I think that we can make the life of libvirt-dbus users easier like
libvirt-python does and don't ask for the 'max_stats' at all.  The only
input arg would be 'flags'.

There we can allocate stats to VIR_DOMAIN_MEMORY_STAT_NR size which
would always request all possible stats.

Pavel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20180413/6d034957/attachment-0001.sig>