[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/14] ui: refactor code for determining if an update
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 09/14] ui: refactor code for determining if an update should be sent to the client |
Date: |
Fri, 12 Jan 2018 13:58:49 +0100 |
From: "Daniel P. Berrange" <address@hidden>
The logic for determining if it is possible to send an update to the client
will become more complicated shortly, so pull it out into a separate method
for easier extension later.
Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Darren Kenny <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/vnc.c | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 243c72be13..4ba7fc076a 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -961,6 +961,25 @@ static int find_and_clear_dirty_height(VncState *vs,
return h;
}
+static bool vnc_should_update(VncState *vs)
+{
+ switch (vs->update) {
+ case VNC_STATE_UPDATE_NONE:
+ break;
+ case VNC_STATE_UPDATE_INCREMENTAL:
+ /* Only allow incremental updates if the output buffer
+ * is empty, or if audio capture is enabled.
+ */
+ if (!vs->output.offset || vs->audio_cap) {
+ return true;
+ }
+ break;
+ case VNC_STATE_UPDATE_FORCE:
+ return true;
+ }
+ return false;
+}
+
static int vnc_update_client(VncState *vs, int has_dirty)
{
VncDisplay *vd = vs->vd;
@@ -975,13 +994,7 @@ static int vnc_update_client(VncState *vs, int has_dirty)
}
vs->has_dirty += has_dirty;
- if (vs->update == VNC_STATE_UPDATE_NONE) {
- return 0;
- }
-
- if (vs->output.offset && !vs->audio_cap &&
- vs->update != VNC_STATE_UPDATE_FORCE) {
- /* kernel send buffers are full -> drop frames to throttle */
+ if (!vnc_should_update(vs)) {
return 0;
}
--
2.9.3
- [Qemu-devel] [PULL 00/14] Vnc 20180112 patches, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 03/14] ui: remove unreachable code in vnc_update_client, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 04/14] ui: remove redundant indentation in vnc_client_update, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 08/14] ui: correctly reset framebuffer update state after processing dirty regions, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 05/14] ui: avoid pointless VNC updates if framebuffer isn't dirty, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 07/14] ui: introduce enum to track VNC client framebuffer update request state, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 02/14] ui: remove 'sync' parameter from vnc_update_client, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 01/14] vnc: fix debug spelling, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 09/14] ui: refactor code for determining if an update should be sent to the client,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 13/14] ui: add trace events related to VNC client throttling, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 12/14] ui: place a hard cap on VNC server output buffer size, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 06/14] ui: track how much decoded data we consumed when doing SASL encoding, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 14/14] ui: mix misleading comments & return types of VNC I/O helper methods, Gerd Hoffmann, 2018/01/12
- [Qemu-devel] [PULL 10/14] ui: fix VNC client throttling when audio capture is active, Gerd Hoffmann, 2018/01/12