summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2011-06-15 16:54:16 -0400
committerCole Robinson <crobinso@redhat.com>2011-06-21 10:08:47 -0400
commiteaf7c983b62e389e1c8a65184a01f28e8109be6b (patch)
tree528e22652bcd5a0b6c900e16b8504680376d235b
parentfa47dad041bf9878702724dba9d0ca4152fab928 (diff)
downloadlibvirt-python-split-eaf7c983b62e389e1c8a65184a01f28e8109be6b.tar.gz
libvirt-python-split-eaf7c983b62e389e1c8a65184a01f28e8109be6b.tar.xz
libvirt-python-split-eaf7c983b62e389e1c8a65184a01f28e8109be6b.zip
python: Implement virStreamSend/RecvAll helpers
Pure python implementation. The handler callbacks have been altered a bit compared to the C API: RecvAll doesn't pass length of the data read since that can be trivially obtained from python string objects, and SendAll requires the handler to return the string data to send rather than store the data in a string pointer.
-rwxr-xr-xgenerator.py4
-rw-r--r--libvirt-override-virStream.py64
2 files changed, 66 insertions, 2 deletions
diff --git a/generator.py b/generator.py
index 315d3d4..7c843d7 100755
--- a/generator.py
+++ b/generator.py
@@ -393,8 +393,8 @@ skip_function = (
'virFreeError', # Only needed if we use virSaveLastError
'virStreamFree', # Overridden in libvirt-override-virStream.py
- 'virStreamRecvAll', # XXX: Can be written in pure python?
- 'virStreamSendAll', # XXX: Can be written in pure python?
+ 'virStreamRecvAll', # Pure python libvirt-override-virStream.py
+ 'virStreamSendAll', # Pure python libvirt-override-virStream.py
'virStreamRecv', # overridden in libvirt-override-virStream.py
'virStreamSend', # overridden in libvirt-override-virStream.py
diff --git a/libvirt-override-virStream.py b/libvirt-override-virStream.py
index f8a1d0b..82e1648 100644
--- a/libvirt-override-virStream.py
+++ b/libvirt-override-virStream.py
@@ -25,6 +25,70 @@
ret = libvirtmod.virStreamEventAddCallback(self._o, events, cbData)
if ret == -1: raise libvirtError ('virStreamEventAddCallback() failed')
+ def recvAll(self, handler, opaque):
+ """Receive the entire data stream, sending the data to the
+ requested data sink. This is simply a convenient alternative
+ to virStreamRecv, for apps that do blocking-I/o.
+
+ A hypothetical handler function looks like:
+
+ def handler(stream, # virStream instance
+ buf, # string containing received data
+ opaque): # extra data passed to recvAll as opaque
+ fd = opaque
+ return os.write(fd, buf)
+ """
+ while True:
+ got = self.recv(1024*64)
+ if got == -2:
+ raise libvirtError("cannot use recvAll with "
+ "nonblocking stream")
+ if len(got) == 0:
+ break
+
+ try:
+ ret = handler(self, got, opaque)
+ if type(ret) is int and ret < 0:
+ raise RuntimeError("recvAll handler returned %d" % ret)
+ except Exception, e:
+ try:
+ self.abort()
+ except:
+ pass
+ raise e
+
+ def sendAll(self, handler, opaque):
+ """
+ Send the entire data stream, reading the data from the
+ requested data source. This is simply a convenient alternative
+ to virStreamSend, for apps that do blocking-I/o.
+
+ A hypothetical handler function looks like:
+
+ def handler(stream, # virStream instance
+ nbytes, # int amt of data to read
+ opaque): # extra data passed to recvAll as opaque
+ fd = opaque
+ return os.read(fd, nbytes)
+ """
+ while True:
+ try:
+ got = handler(self, 1024*64, opaque)
+ except:
+ try:
+ self.abort()
+ except:
+ pass
+ raise e
+
+ if got == "":
+ break
+
+ ret = self.send(got)
+ if ret == -2:
+ raise libvirtError("cannot use recvAll with "
+ "nonblocking stream")
+
def recv(self, nbytes):
"""Write a series of bytes to the stream. This method may
block the calling application for an arbitrary amount