[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 06/13] ui: introduce enum to track VNC client fra
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v1 06/13] ui: introduce enum to track VNC client framebuffer update request state |
Date: |
Mon, 18 Dec 2017 19:12:21 +0000 |
Currently the VNC servers tracks whether a client has requested an incremental
or forced update with two boolean flags. There are only really 3 distinct
states to track, so create an enum to more accurately reflect permitted states.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
ui/vnc.c | 21 +++++++++++----------
ui/vnc.h | 9 +++++++--
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index f53eddb8e5..d3b04f1166 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -975,16 +975,17 @@ static int vnc_update_client(VncState *vs, int has_dirty)
}
vs->has_dirty += has_dirty;
- if (!vs->need_update) {
+ if (vs->update == VNC_STATE_UPDATE_NONE) {
return 0;
}
- if (vs->output.offset && !vs->audio_cap && !vs->force_update) {
+ if (vs->output.offset && !vs->audio_cap &&
+ vs->update != VNC_STATE_UPDATE_FORCE) {
/* kernel send buffers are full -> drop frames to throttle */
return 0;
}
- if (!vs->has_dirty && !vs->force_update) {
+ if (!vs->has_dirty && vs->update != VNC_STATE_UPDATE_FORCE) {
return 0;
}
@@ -1030,7 +1031,7 @@ static int vnc_update_client(VncState *vs, int has_dirty)
}
vnc_job_push(job);
- vs->force_update = 0;
+ vs->update = VNC_STATE_UPDATE_INCREMENTAL;
vs->has_dirty = 0;
return n;
}
@@ -1869,14 +1870,14 @@ static void ext_key_event(VncState *vs, int down,
static void framebuffer_update_request(VncState *vs, int incremental,
int x, int y, int w, int h)
{
- vs->need_update = 1;
-
if (incremental) {
- return;
+ if (vs->update != VNC_STATE_UPDATE_FORCE) {
+ vs->update = VNC_STATE_UPDATE_INCREMENTAL;
+ }
+ } else {
+ vs->update = VNC_STATE_UPDATE_FORCE;
+ vnc_set_area_dirty(vs->dirty, vs->vd, x, y, w, h);
}
-
- vs->force_update = 1;
- vnc_set_area_dirty(vs->dirty, vs->vd, x, y, w, h);
}
static void send_ext_key_event_ack(VncState *vs)
diff --git a/ui/vnc.h b/ui/vnc.h
index 694cf32ca9..b9d310e640 100644
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -252,6 +252,12 @@ struct VncJob
QTAILQ_ENTRY(VncJob) next;
};
+typedef enum {
+ VNC_STATE_UPDATE_NONE,
+ VNC_STATE_UPDATE_INCREMENTAL,
+ VNC_STATE_UPDATE_FORCE,
+} VncStateUpdate;
+
struct VncState
{
QIOChannelSocket *sioc; /* The underlying socket */
@@ -264,8 +270,7 @@ struct VncState
* vnc-jobs-async.c */
VncDisplay *vd;
- int need_update;
- int force_update;
+ VncStateUpdate update; /* Most recent pending request from client */
int has_dirty;
uint32_t features;
int absolute;
--
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 <=
- [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, 2017/12/18
- [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