|
 |
5d360b |
From 59bdfd752c491ce0e7253d78e379b0bd8c5cd00e Mon Sep 17 00:00:00 2001
|
|
|
5d360b |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
5d360b |
Date: Thu, 8 Feb 2018 17:50:18 +0100
|
|
|
5d360b |
Subject: [PATCH 04/27] vnc: return directly if no vnc client connected
|
|
|
5d360b |
|
|
|
5d360b |
RH-Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
5d360b |
Message-id: <20180208175041.5634-5-berrange@redhat.com>
|
|
|
5d360b |
Patchwork-id: 78950
|
|
|
5d360b |
O-Subject: [RHEL-7.5 qemu-kvm PATCH v1 04/27] vnc: return directly if no vnc client connected
|
|
|
5d360b |
Bugzilla: 1527405
|
|
|
5d360b |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
5d360b |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
5d360b |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
5d360b |
|
|
|
5d360b |
From: ChenLiang <chenliang88@huawei.com>
|
|
|
5d360b |
|
|
|
5d360b |
graphic_hw_update and vnc_refresh_server_surface aren't
|
|
|
5d360b |
need to do when no vnc client connected. It can reduce
|
|
|
5d360b |
lock contention, because vnc_refresh will hold global big
|
|
|
5d360b |
lock two millisecond every three seconds.
|
|
|
5d360b |
|
|
|
5d360b |
Signed-off-by: ChenLiang <chenliang88@huawei.com>
|
|
|
5d360b |
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
|
|
|
5d360b |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
5d360b |
(cherry picked from commit 9d6b20704734fe1ab789400806ebd54f579d50a2)
|
|
|
5d360b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
5d360b |
---
|
|
|
5d360b |
ui/vnc.c | 10 +++++-----
|
|
|
5d360b |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
5d360b |
|
|
|
5d360b |
diff --git a/ui/vnc.c b/ui/vnc.c
|
|
|
5d360b |
index 42070b4..9047862 100644
|
|
|
5d360b |
--- a/ui/vnc.c
|
|
|
5d360b |
+++ b/ui/vnc.c
|
|
|
5d360b |
@@ -2677,6 +2677,11 @@ static void vnc_refresh(DisplayChangeListener *dcl)
|
|
|
5d360b |
VncState *vs, *vn;
|
|
|
5d360b |
int has_dirty, rects = 0;
|
|
|
5d360b |
|
|
|
5d360b |
+ if (QTAILQ_EMPTY(&vd->clients)) {
|
|
|
5d360b |
+ update_displaychangelistener(&vd->dcl, VNC_REFRESH_INTERVAL_MAX);
|
|
|
5d360b |
+ return;
|
|
|
5d360b |
+ }
|
|
|
5d360b |
+
|
|
|
5d360b |
graphic_hw_update(NULL);
|
|
|
5d360b |
|
|
|
5d360b |
if (vnc_trylock_display(vd)) {
|
|
|
5d360b |
@@ -2692,11 +2697,6 @@ static void vnc_refresh(DisplayChangeListener *dcl)
|
|
|
5d360b |
/* vs might be free()ed here */
|
|
|
5d360b |
}
|
|
|
5d360b |
|
|
|
5d360b |
- if (QTAILQ_EMPTY(&vd->clients)) {
|
|
|
5d360b |
- update_displaychangelistener(&vd->dcl, VNC_REFRESH_INTERVAL_MAX);
|
|
|
5d360b |
- return;
|
|
|
5d360b |
- }
|
|
|
5d360b |
-
|
|
|
5d360b |
if (has_dirty && rects) {
|
|
|
5d360b |
vd->dcl.update_interval /= 2;
|
|
|
5d360b |
if (vd->dcl.update_interval < VNC_REFRESH_INTERVAL_BASE) {
|
|
|
5d360b |
--
|
|
|
5d360b |
1.8.3.1
|
|
|
5d360b |
|