[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 08/13] ui: refactor code for determining if an up
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v1 08/13] ui: refactor code for determining if an update should be sent to the client |
Date: |
Mon, 18 Dec 2017 19:12:23 +0000 |
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>
---
ui/vnc.c | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index 51fbf0449d..6ae002cd36 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.14.3
- [Qemu-devel] [PATCH v1 00/13] Fix VNC server unbounded memory usage, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 01/13] ui: remove 'sync' parametr from vnc_update_client, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 03/13] ui: remove redundant indentation in vnc_client_update, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 06/13] ui: introduce enum to track VNC client framebuffer update request state, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 02/13] ui: remove unreachable code in vnc_update_client, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 04/13] ui: avoid pointless VNC updates if framebuffer isn't dirty, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 08/13] ui: refactor code for determining if an update should be sent to the client,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v1 11/13] ui: place a hard cap on VNC server output buffer size, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 07/13] ui: correctly reset framebuffer update state after processing dirty regions, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 10/13] ui: fix VNC client throttling when forced update is requested, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 05/13] ui: track how much decoded data we consumed when doing SASL encoding, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 09/13] ui: fix VNC client throttling when audio capture is active, Daniel P. Berrange, 2017/12/18
- [Qemu-devel] [PATCH v1 12/13] ui: add trace events related to VNC client throttling, Daniel P. Berrange, 2017/12/18