From c13d50cb093c4409dd2db6023fc0f6adfe4927d8 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 5 Feb 2018 11:10:05 +0100 Subject: [PATCH 11/20] ui: refactor code for determining if an update should be sent to the client MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Daniel P. Berrange Message-id: <20180205111012.6210-11-berrange@redhat.com> Patchwork-id: 78887 O-Subject: [RHV-7.5 qemu-kvm-rhev PATCH v2 10/17] ui: refactor code for determining if an update should be sent to the client Bugzilla: 1527404 RH-Acked-by: Gerd Hoffmann RH-Acked-by: Laszlo Ersek RH-Acked-by: Thomas Huth From: "Daniel P. Berrange" 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 Reviewed-by: Darren Kenny Reviewed-by: Marc-André Lureau Message-id: 20171218191228.31018-9-berrange@redhat.com Signed-off-by: Gerd Hoffmann (cherry picked from commit 0bad834228b9ee63e4239108d02dcb94568254d0) Signed-off-by: Miroslav Rezanina --- ui/vnc.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 3707b87..2b04050 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; } -- 1.8.3.1