python: Add python bindings for virDomainMemoryStats

Enable virDomainMemoryStats in the python API.  dom.memoryStats() will return a
dictionary containing the supported statistics.  A dictionary is required
because the meaining of each quantity cannot be inferred from its index in a
list.

* python/generator.py: reenable bindings for this entry point
* python/libvirt-override-api.xml python/libvirt-override.c: the
  generator can't handle this new function, add the new binding,
  and the XML description

diff --git a/python/generator.py b/python/generator.py
index 06f1ff4a12bcd0463488374357049962955046b6..56f89251ed29a616bebb8a5d2e1dc4b765fe586e 100755 (executable)
--- a/python/generator.py
+++ b/python/generator.py
@@ -161,7 +161,6 @@ def enum(type, name, value):
 functions_failed = []
 functions_skipped = [
     "virConnectListDomains",
-    "virDomainMemoryStats"
 ]
 
 skipped_modules = {
@@ -171,7 +170,6 @@ skipped_types = {
 #    'int *': "usually a return type",
      'virConnectDomainEventCallback': "No function types in python",
      'virEventAddHandleFunc': "No function types in python",
-     'virDomainMemoryStatPtr': "Not implemented yet",
 }
 
 #######################################################################
@@ -283,6 +281,7 @@ skip_impl = (
     'virNetworkGetAutostart',
     'virDomainBlockStats',
     'virDomainInterfaceStats',
+    'virDomainMemoryStats',
     'virNodeGetCellsFreeMemory',
     'virDomainGetSchedulerType',
     'virDomainGetSchedulerParameters',

diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml
index 96958b5b1cc17063e4cf63232d01ba3bb5c3e55e..6ae2742e7996002972870bac9066426eb8aa44d6 100644 (file)
--- a/python/libvirt-override-api.xml
+++ b/python/libvirt-override-api.xml
@@ -105,6 +105,11 @@
       <arg name='domain' type='virDomainPtr' info='a domain object'/>
       <arg name='path' type='char *' info='the path for the interface device'/>
     </function>
+    <function name='virDomainMemoryStats' file='python'>
+      <info>Extracts memory statistics for a domain</info>
+      <return type='virDomainMemoryStats' info='a dictionary of statistics'/>
+      <arg name='domain' type='virDomainPtr' info='a domain object'/>
+    </function>
     <function name="virNodeGetCellsFreeMemory" file='python'>
       <info>Returns the available memory for a list of cells</info>
       <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>

diff --git a/python/libvirt-override.c b/python/libvirt-override.c
index 6c1e51b78425fc245f6aff9b811f50d2c7001ec4..db4c0e10c139571305e6db1f1dd6c24317e49d16 100644 (file)
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
@@ -120,6 +120,49 @@ libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
     return(info);
 }
 
+static PyObject *
+libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    virDomainPtr domain;
+    PyObject *pyobj_domain;
+    unsigned int nr_stats, i;
+    virDomainMemoryStatStruct stats[VIR_DOMAIN_MEMORY_STAT_NR];
+    PyObject *info;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:virDomainMemoryStats", &pyobj_domain))
+        return(NULL);
+    domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
+
+    nr_stats = virDomainMemoryStats(domain, stats,
+                                    VIR_DOMAIN_MEMORY_STAT_NR, 0);
+    if (nr_stats == -1)
+        return VIR_PY_NONE;
+
+    /* convert to a Python dictionary */
+    if ((info = PyDict_New()) == NULL)
+        return VIR_PY_NONE;
+
+    for (i = 0; i < nr_stats; i++) {
+        if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_SWAP_IN)
+            PyDict_SetItem(info, libvirt_constcharPtrWrap("swap_in"),
+                           PyLong_FromUnsignedLongLong(stats[i].val));
+        else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_SWAP_OUT)
+            PyDict_SetItem(info, libvirt_constcharPtrWrap("swap_out"),
+                           PyLong_FromUnsignedLongLong(stats[i].val));
+        else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT)
+            PyDict_SetItem(info, libvirt_constcharPtrWrap("major_fault"),
+                           PyLong_FromUnsignedLongLong(stats[i].val));
+        else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT)
+            PyDict_SetItem(info, libvirt_constcharPtrWrap("minor_fault"),
+                           PyLong_FromUnsignedLongLong(stats[i].val));
+        else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_UNUSED)
+            PyDict_SetItem(info, libvirt_constcharPtrWrap("unused"),
+                           PyLong_FromUnsignedLongLong(stats[i].val));
+        else if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_AVAILABLE)
+            PyDict_SetItem(info, libvirt_constcharPtrWrap("available"),
+                           PyLong_FromUnsignedLongLong(stats[i].val));
+    }
+    return info;
+}
 
 static PyObject *
 libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED,
@@ -2635,6 +2678,7 @@ static PyMethodDef libvirtMethods[] = {
     {(char *) "virNetworkGetAutostart", libvirt_virNetworkGetAutostart, METH_VARARGS, NULL},
     {(char *) "virDomainBlockStats", libvirt_virDomainBlockStats, METH_VARARGS, NULL},
     {(char *) "virDomainInterfaceStats", libvirt_virDomainInterfaceStats, METH_VARARGS, NULL},
+    {(char *) "virDomainMemoryStats", libvirt_virDomainMemoryStats, METH_VARARGS, NULL},
     {(char *) "virNodeGetCellsFreeMemory", libvirt_virNodeGetCellsFreeMemory, METH_VARARGS, NULL},
     {(char *) "virDomainGetSchedulerType", libvirt_virDomainGetSchedulerType, METH_VARARGS, NULL},
     {(char *) "virDomainGetSchedulerParameters", libvirt_virDomainGetSchedulerParameters, METH_VARARGS, NULL},