* python/generator.py python/libvir.c python/libvirt-python-api.xml:

  provide bindings for block and interface statistics
Daniel

diff --git a/ChangeLog b/ChangeLog
index 3ce29ce851c462ea1477fa9332108bc9622b9eb5..389aa9328eba24d99bda5c2cfce626ac2a60aaff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 30 22:51:11 CEST 2007 Daniel Veillard <veillard@redhat.com>
+
+       * python/generator.py python/libvir.c python/libvirt-python-api.xml:
+         provide bindings for block and interface statistics
+
 Sun Sep 30 12:27:36 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * src/xend_internal.c: Don't include <bootloader/> for HVM guests

diff --git a/python/generator.py b/python/generator.py
index 3dc321234d5ed9ab59cde0c7d7a78ca59fd28433..bf384e1c1887bb81b74f60e580136470d2f50508 100755 (executable)
--- a/python/generator.py
+++ b/python/generator.py
@@ -276,6 +276,8 @@ skip_impl = (
     'virDomainLookupByUUID',
     'virNetworkGetUUID',
     'virNetworkLookupByUUID',
+    'virDomainBlockStats',
+    'virDomainInterfaceStats',
 )
 
 def skip_function(name):

diff --git a/python/libvir.c b/python/libvir.c
index f1281f19db901155fe38d9e7460d89181dc27c6a..0621eb2a914bb0c63925ceb5c62ef5cf346d3576 100644 (file)
--- a/python/libvir.c
+++ b/python/libvir.c
@@ -21,8 +21,77 @@ PyObject *libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *ar
 PyObject *libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args);
 PyObject *libvirt_virGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args);
 PyObject *libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args);
+PyObject * libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args);
+PyObject * libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args);
 
+/************************************************************************
+ *                                                                     *
+ *             Statistics                                              *
+ *                                                                     *
+ ************************************************************************/
+
+PyObject *
+libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    virDomainPtr domain;
+    PyObject *pyobj_domain;
+    char * path;
+    int c_retval;
+    virDomainBlockStatsStruct stats;
+    PyObject *info;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:virDomainBlockStats",
+        &pyobj_domain,&path))
+       return(NULL);
+    domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
+
+    c_retval = virDomainBlockStats(domain, path, &stats, sizeof(stats));
+    if (c_retval < 0) {
+        Py_INCREF(Py_None);
+       return(Py_None);
+    }
 
+    /* convert to a Python tupple of long objects */
+    info = PyTuple_New(5);
+    PyTuple_SetItem(info, 0, PyLong_FromLongLong(stats.rd_req));
+    PyTuple_SetItem(info, 1, PyLong_FromLongLong(stats.rd_bytes));
+    PyTuple_SetItem(info, 2, PyLong_FromLongLong(stats.wr_req));
+    PyTuple_SetItem(info, 3, PyLong_FromLongLong(stats.wr_bytes));
+    PyTuple_SetItem(info, 4, PyLong_FromLongLong(stats.errs));
+    return(info);
+}
+
+PyObject *
+libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
+    virDomainPtr domain;
+    PyObject *pyobj_domain;
+    char * path;
+    int c_retval;
+    virDomainInterfaceStatsStruct stats;
+    PyObject *info;
+
+    if (!PyArg_ParseTuple(args, (char *)"Oz:virDomainInterfaceStats",
+        &pyobj_domain,&path))
+       return(NULL);
+    domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain);
+
+    c_retval = virDomainInterfaceStats(domain, path, &stats, sizeof(stats));
+    if (c_retval < 0) {
+        Py_INCREF(Py_None);
+       return(Py_None);
+    }
+
+    /* convert to a Python tupple of long objects */
+    info = PyTuple_New(8);
+    PyTuple_SetItem(info, 0, PyLong_FromLongLong(stats.rx_bytes));
+    PyTuple_SetItem(info, 1, PyLong_FromLongLong(stats.rx_packets));
+    PyTuple_SetItem(info, 2, PyLong_FromLongLong(stats.rx_errs));
+    PyTuple_SetItem(info, 3, PyLong_FromLongLong(stats.rx_drop));
+    PyTuple_SetItem(info, 4, PyLong_FromLongLong(stats.tx_bytes));
+    PyTuple_SetItem(info, 5, PyLong_FromLongLong(stats.tx_packets));
+    PyTuple_SetItem(info, 6, PyLong_FromLongLong(stats.tx_errs));
+    PyTuple_SetItem(info, 7, PyLong_FromLongLong(stats.tx_drop));
+    return(info);
+}
 /************************************************************************
  *                                                                     *
  *             Global error handler at the Python level                *
@@ -677,6 +746,8 @@ static PyMethodDef libvirtMethods[] = {
     {(char *) "virNetworkLookupByUUID", libvirt_virNetworkLookupByUUID, METH_VARARGS, NULL},
     {(char *) "virDomainGetAutostart", libvirt_virDomainGetAutostart, METH_VARARGS, NULL},
     {(char *) "virNetworkGetAutostart", libvirt_virNetworkGetAutostart, METH_VARARGS, NULL},
+    {(char *) "virDomainBlockStats", libvirt_virDomainBlockStats, METH_VARARGS, NULL},
+    {(char *) "virDomainInterfaceStats", libvirt_virDomainInterfaceStats, METH_VARARGS, NULL},
     {NULL, NULL, 0, NULL}
 };
 

diff --git a/python/libvirt-python-api.xml b/python/libvirt-python-api.xml
index 40cac6dc13c988b71fc880d02dd3ac615013b921..b6154e75abd7d79e91885e7acc5cf747c1477676 100644 (file)
--- a/python/libvirt-python-api.xml
+++ b/python/libvirt-python-api.xml
@@ -63,5 +63,17 @@
       <return type='int' info='the autostart flag, or None in case of error'/>
       <arg name='domain' type='virDomainPtr' info='a network object'/>
     </function>
+    <function name='virDomainBlockStats' file='python'>
+      <info>Extracts block device statistics for a domain</info>
+      <return type='virDomainBlockStats' info='a tuple of statistics'/>
+      <arg name='domain' type='virDomainPtr' info='a domain object'/>
+      <arg name='path' type='char *' info='the path for the block device'/>
+    </function>
+    <function name='virDomainInterfaceStats' file='python'>
+      <info>Extracts interface device statistics for a domain</info>
+      <return type='virDomainInterfaceStats' info='a tuple of statistics'/>
+      <arg name='domain' type='virDomainPtr' info='a domain object'/>
+      <arg name='path' type='char *' info='the path for the interface device'/>
+    </function>
   </symbols>
 </api>