[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 2/7] io: simplify websocket ping reply handli
From: |
Eric Blake |
Subject: |
Re: [Qemu-devel] [PATCH v1 2/7] io: simplify websocket ping reply handling |
Date: |
Tue, 10 Oct 2017 11:55:25 -0500 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 |
On 10/10/2017 10:43 AM, Daniel P. Berrange wrote:
> We must ensure we don't get flooded with ping replies if the outbound
> channel is slow. Currently we do this by keeping the ping reply in a
> separate temporary buffer and only writing it if the encoutput buffer
> is completely empty. This is overly pessimistic, as it is reasonable
> to add a ping reply to the encoutput buffer even if it has previous
> data in it, as long as that previous data doesn't include a ping
> reply.
>
> To track this better, put the ping reply directly into the encoutput
> buffer, and then record the size of encoutput at this time in
> ping_remain. As we write encoutput to the underlying channel, we
> can decrement the ping_remain counter. Once it hits zero, we can
> accept further ping replies for transmission.
>
> Signed-off-by: Daniel P. Berrange <address@hidden>
> ---
> include/io/channel-websock.h | 2 +-
> io/channel-websock.c | 28 +++++++++++++++-------------
> 2 files changed, 16 insertions(+), 14 deletions(-)
>
> +++ b/io/channel-websock.c
> @@ -825,11 +825,14 @@ static int
> qio_channel_websock_decode_payload(QIOChannelWebsock *ioc,
> }
> return -1;
> } else if (ioc->opcode == QIO_CHANNEL_WEBSOCK_OPCODE_PING) {
> - /* ping frames produce an immediate reply */
> - buffer_reset(&ioc->ping_reply);
> - qio_channel_websock_encode_buffer(
> - ioc, &ioc->ping_reply, QIO_CHANNEL_WEBSOCK_OPCODE_PONG,
> - &ioc->encinput);
> + /* ping frames produce an immediate reply, as long as we've not still
> + * got a previous ping queued, in which case we drop the new pong */
Wouldn't that be a 'previous pong queued'?
> + if (ioc->ping_remain == 0) {
> + qio_channel_websock_encode_buffer(
> + ioc, &ioc->encoutput, QIO_CHANNEL_WEBSOCK_OPCODE_PONG,
> + &ioc->encinput);
> + ioc->ping_remain = ioc->encoutput.offset;
> + }
But if you change the comment, then naming the variable pong_remain may
make more sense.
But naming is a bikeshed issue, so either way,
Reviewed-by: Eric Blake <address@hidden>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
- [Qemu-devel] [PATCH v1 0/7] Limit websockets memory usage & other bug fixes, Daniel P. Berrange, 2017/10/10
- [Qemu-devel] [PATCH v1 2/7] io: simplify websocket ping reply handling, Daniel P. Berrange, 2017/10/10
- Re: [Qemu-devel] [PATCH v1 2/7] io: simplify websocket ping reply handling,
Eric Blake <=
- [Qemu-devel] [PATCH v1 3/7] io: get rid of qio_channel_websock_encode helper method, Daniel P. Berrange, 2017/10/10
- [Qemu-devel] [PATCH v1 1/7] io: monitor encoutput buffer size from websocket GSource, Daniel P. Berrange, 2017/10/10
- [Qemu-devel] [PATCH v1 5/7] io: get rid of bounce buffering in websock write path, Daniel P. Berrange, 2017/10/10
- [Qemu-devel] [PATCH v1 4/7] io: pass a struct iovec into qio_channel_websock_encode, Daniel P. Berrange, 2017/10/10