[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 06/11] io: get rid of qio_channel_websock_encode h
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PULL v1 06/11] io: get rid of qio_channel_websock_encode helper method |
Date: |
Mon, 16 Oct 2017 21:16:45 +0100 |
The qio_channel_websock_encode method is only used in one place,
everything else calls qio_channel_websock_encode_buffer directly.
It can also be pushed up a level into the qio_channel_websock_writev
method, since every other caller of qio_channel_websock_write_wire
has already filled encoutput.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
io/channel-websock.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/io/channel-websock.c b/io/channel-websock.c
index 6083f74c9b..700f5bea22 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -616,18 +616,6 @@ static void
qio_channel_websock_encode_buffer(QIOChannelWebsock *ioc,
}
-static void qio_channel_websock_encode(QIOChannelWebsock *ioc)
-{
- if (!ioc->rawoutput.offset) {
- return;
- }
- qio_channel_websock_encode_buffer(
- ioc, &ioc->encoutput, QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME,
- &ioc->rawoutput);
- buffer_reset(&ioc->rawoutput);
-}
-
-
static ssize_t qio_channel_websock_write_wire(QIOChannelWebsock *, Error **);
@@ -948,8 +936,6 @@ static ssize_t
qio_channel_websock_write_wire(QIOChannelWebsock *ioc,
ssize_t ret;
ssize_t done = 0;
- qio_channel_websock_encode(ioc);
-
while (ioc->encoutput.offset > 0) {
ret = qio_channel_write(ioc->master,
(char *)ioc->encoutput.buffer,
@@ -1134,6 +1120,12 @@ static ssize_t qio_channel_websock_writev(QIOChannel
*ioc,
}
done:
+ if (ioc->rawoutput.offset) {
+ qio_channel_websock_encode_buffer(
+ ioc, &ioc->encoutput, QIO_CHANNEL_WEBSOCK_OPCODE_BINARY_FRAME,
+ &ioc->rawoutput);
+ buffer_reset(&ioc->rawoutput);
+ }
ret = qio_channel_websock_write_wire(wioc, errp);
if (ret < 0 &&
ret != QIO_CHANNEL_ERR_BLOCK) {
--
2.13.5
- [Qemu-devel] [PULL v1 00/11] Merge QIO 2017-10-16, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 03/11] sockets: Handle race condition between binds to the same port, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 02/11] sockets: factor out create_fast_reuse_socket, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 01/11] sockets: factor out a new try_bind() function, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 04/11] io: monitor encoutput buffer size from websocket GSource, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 06/11] io: get rid of qio_channel_websock_encode helper method,
Daniel P. Berrange <=
- [Qemu-devel] [PULL v1 05/11] io: simplify websocket ping reply handling, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 09/11] io: cope with websock 'Connection' header having multiple values, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 08/11] io: get rid of bounce buffering in websock write path, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 07/11] io: pass a struct iovec into qio_channel_websock_encode, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 10/11] io: add trace points for websocket HTTP protocol headers, Daniel P. Berrange, 2017/10/16
- [Qemu-devel] [PULL v1 11/11] io: fix mem leak in websock error path, Daniel P. Berrange, 2017/10/16
- Re: [Qemu-devel] [PULL v1 00/11] Merge QIO 2017-10-16, Peter Maydell, 2017/10/17