[libvirt] [PATCH 6/6] python: Add python bindings for virDomainMemStats

[Adam Litke]

Enable virDomainMemStats in the python API.  dom.memStats() 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.

Signed-off-by: Adam Litke <agl at us.ibm.com>
To: libvirt list <libvir-list at redhat.com>
---
 python/generator.py             |    1 +
 python/libvirt-override-api.xml |    5 ++++
 python/libvirt-override.c       |   41 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/python/generator.py b/python/generator.py
index fef20fb..8721847 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -282,6 +282,7 @@ skip_impl = (
     'virNetworkGetAutostart',
     'virDomainBlockStats',
     'virDomainInterfaceStats',
+    'virDomainMemStats',
     'virNodeGetCellsFreeMemory',
     'virDomainGetSchedulerType',
     'virDomainGetSchedulerParameters',
diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml
index 148b89b..f524d22 100644
--- a/python/libvirt-override-api.xml
+++ b/python/libvirt-override-api.xml
@@ -100,6 +100,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='virDomainMemStats' file='python'>
+      <info>Extracts memory statistics for a domain</info>
+      <return type='virDomainMemStats' 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 5d24fd2..b7ae77a 100644
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
@@ -114,6 +114,46 @@ libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args)
     return(info);
 }
 
+static PyObject *
+libvirt_virDomainMemStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    virDomainPtr domain;
+    PyObject *pyobj_domain;
+    int c_retval;
+    virDomainMemStatsStruct stats;
+    PyObject *info;
+
+    if (!PyArg_ParseTuple(args, (char *)"O:virDomainMemStats", &pyobj_domain))
+        return(NULL);
+    domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
+
+    c_retval = virDomainMemStats(domain, &stats, sizeof(stats));
+    if (c_retval < 0)
+        return VIR_PY_NONE;
+
+    /* convert to a Python dictionary */
+    if ((info = PyDict_New()) == NULL)
+        return VIR_PY_NONE;
+
+    if (stats.swap_in != -1)
+        PyDict_SetItem(info, libvirt_constcharPtrWrap("swap_in"),
+                       PyLong_FromUnsignedLongLong(stats.swap_in));
+    if (stats.swap_out != -1)
+        PyDict_SetItem(info, libvirt_constcharPtrWrap("swap_out"),
+                       PyLong_FromUnsignedLongLong(stats.swap_out));
+    if (stats.major_fault != -1)
+        PyDict_SetItem(info, libvirt_constcharPtrWrap("major_fault"),
+                       PyLong_FromUnsignedLongLong(stats.major_fault));
+    if (stats.minor_fault != -1)
+        PyDict_SetItem(info, libvirt_constcharPtrWrap("minor_fault"),
+                       PyLong_FromUnsignedLongLong(stats.minor_fault));
+    if (stats.mem_free != -1)
+        PyDict_SetItem(info, libvirt_constcharPtrWrap("mem_free"),
+                       PyLong_FromUnsignedLongLong(stats.mem_free));
+    if (stats.mem_tot != -1)
+        PyDict_SetItem(info, libvirt_constcharPtrWrap("mem_tot"),
+                       PyLong_FromUnsignedLongLong(stats.mem_tot));
+    return info;
+} 
 
 static PyObject *
 libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED,
@@ -2414,6 +2454,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 *) "virDomainMemStats", libvirt_virDomainMemStats, METH_VARARGS, NULL},
     {(char *) "virNodeGetCellsFreeMemory", libvirt_virNodeGetCellsFreeMemory, METH_VARARGS, NULL},
     {(char *) "virDomainGetSchedulerType", libvirt_virDomainGetSchedulerType, METH_VARARGS, NULL},
     {(char *) "virDomainGetSchedulerParameters", libvirt_virDomainGetSchedulerParameters, METH_VARARGS, NULL},
-- 
1.6.5