From 7d964c9d2fc614d2baa788b9e77019b32151f162 Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Fri, 4 Feb 2011 09:05:56 +0100 Subject: vnc: refresh lossy rect after a given timeout If an adaptive encoding has choosen to send a lossy update based on the result of vnc_update_freq(), then it should advertise it with vnc_sent_lossy_rect(). This will allow to automatically refresh this rect once it's static again. Signed-off-by: Corentin Chary Signed-off-by: Anthony Liguori --- ui/vnc-jobs-async.c | 2 ++ ui/vnc.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++--- ui/vnc.h | 3 +++ 3 files changed, 69 insertions(+), 3 deletions(-) (limited to 'ui') diff --git a/ui/vnc-jobs-async.c b/ui/vnc-jobs-async.c index 0b5d750f26..bfe8e86e18 100644 --- a/ui/vnc-jobs-async.c +++ b/ui/vnc-jobs-async.c @@ -166,6 +166,7 @@ static void vnc_async_encoding_start(VncState *orig, VncState *local) local->features = orig->features; local->ds = orig->ds; local->vd = orig->vd; + local->lossy_rect = orig->lossy_rect; local->write_pixels = orig->write_pixels; local->clientds = orig->clientds; local->tight = orig->tight; @@ -182,6 +183,7 @@ static void vnc_async_encoding_end(VncState *orig, VncState *local) orig->tight = local->tight; orig->zlib = local->zlib; orig->hextile = local->hextile; + orig->lossy_rect = local->lossy_rect; } static int vnc_worker_thread_loop(VncJobQueue *queue) diff --git a/ui/vnc.c b/ui/vnc.c index 6eacd1db25..697b836275 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -1014,6 +1014,8 @@ static void vnc_disconnect_start(VncState *vs) static void vnc_disconnect_finish(VncState *vs) { + int i; + vnc_jobs_join(vs); /* Wait encoding jobs */ vnc_lock_output(vs); @@ -1050,6 +1052,10 @@ static void vnc_disconnect_finish(VncState *vs) #ifdef CONFIG_VNC_THREAD qemu_mutex_destroy(&vs->output_mutex); #endif + for (i = 0; i < VNC_STAT_ROWS; ++i) { + qemu_free(vs->lossy_rect[i]); + } + qemu_free(vs->lossy_rect); qemu_free(vs); } @@ -2267,10 +2273,57 @@ static VncRectStat *vnc_stat_rect(VncDisplay *vd, int x, int y) return &vs->stats[y / VNC_STAT_RECT][x / VNC_STAT_RECT]; } -static void vnc_update_stats(VncDisplay *vd, struct timeval * tv) +void vnc_sent_lossy_rect(VncState *vs, int x, int y, int w, int h) +{ + int i, j; + + w = (x + w) / VNC_STAT_RECT; + h = (y + h) / VNC_STAT_RECT; + x /= VNC_STAT_RECT; + y /= VNC_STAT_RECT; + + for (j = y; j <= y + h; j++) { + for (i = x; i <= x + w; i++) { + vs->lossy_rect[j][i] = 1; + } + } +} + +static int vnc_refresh_lossy_rect(VncDisplay *vd, int x, int y) +{ + VncState *vs; + int sty = y / VNC_STAT_RECT; + int stx = x / VNC_STAT_RECT; + int has_dirty = 0; + + y = y / VNC_STAT_RECT * VNC_STAT_RECT; + x = x / VNC_STAT_RECT * VNC_STAT_RECT; + + QTAILQ_FOREACH(vs, &vd->clients, next) { + int j; + + /* kernel send buffers are full -> refresh later */ + if (vs->output.offset) { + continue; + } + + if (!vs->lossy_rect[sty][stx]) { + continue; + } + vs->lossy_rect[sty][stx] = 0; + for (j = 0; j < VNC_STAT_RECT; ++j) { + vnc_set_bits(vs->dirty[y + j], x / 16, VNC_STAT_RECT / 16); + } + has_dirty++; + } + return has_dirty; +} + +static int vnc_update_stats(VncDisplay *vd, struct timeval * tv) { int x, y; struct timeval res; + int has_dirty = 0; for (y = 0; y < vd->guest.ds->height; y += VNC_STAT_RECT) { for (x = 0; x < vd->guest.ds->width; x += VNC_STAT_RECT) { @@ -2283,7 +2336,7 @@ static void vnc_update_stats(VncDisplay *vd, struct timeval * tv) timersub(tv, &VNC_REFRESH_STATS, &res); if (timercmp(&vd->guest.last_freq_check, &res, >)) { - return ; + return has_dirty; } vd->guest.last_freq_check = *tv; @@ -2302,6 +2355,7 @@ static void vnc_update_stats(VncDisplay *vd, struct timeval * tv) if (timercmp(&res, &VNC_REFRESH_LOSSY, >)) { rect->freq = 0; + has_dirty += vnc_refresh_lossy_rect(vd, x, y); memset(rect->times, 0, sizeof (rect->times)); continue ; } @@ -2315,6 +2369,7 @@ static void vnc_update_stats(VncDisplay *vd, struct timeval * tv) rect->freq = 1. / rect->freq; } } + return has_dirty; } double vnc_update_freq(VncState *vs, int x, int y, int w, int h) @@ -2366,7 +2421,7 @@ static int vnc_refresh_server_surface(VncDisplay *vd) struct timeval tv; gettimeofday(&tv, NULL); - vnc_update_stats(vd, &tv); + has_dirty = vnc_update_stats(vd, &tv); /* * Walk through the guest dirty map. @@ -2468,7 +2523,13 @@ static void vnc_remove_timer(VncDisplay *vd) static void vnc_connect(VncDisplay *vd, int csock) { VncState *vs = qemu_mallocz(sizeof(VncState)); + int i; + vs->csock = csock; + vs->lossy_rect = qemu_mallocz(VNC_STAT_ROWS * sizeof (*vs->lossy_rect)); + for (i = 0; i < VNC_STAT_ROWS; ++i) { + vs->lossy_rect[i] = qemu_mallocz(VNC_STAT_COLS * sizeof (uint8_t)); + } VNC_DEBUG("New client on socket %d\n", csock); dcl->idle = 0; diff --git a/ui/vnc.h b/ui/vnc.h index c0e5ff30ba..57835f14bc 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -217,6 +217,8 @@ struct VncState DisplayState *ds; uint32_t dirty[VNC_MAX_HEIGHT][VNC_DIRTY_WORDS]; + uint8_t **lossy_rect; /* Not an Array to avoid costly memcpy in + * vnc-jobs-async.c */ VncDisplay *vd; int need_update; @@ -498,6 +500,7 @@ void vnc_framebuffer_update(VncState *vs, int x, int y, int w, int h, void vnc_convert_pixel(VncState *vs, uint8_t *buf, uint32_t v); double vnc_update_freq(VncState *vs, int x, int y, int w, int h); +void vnc_sent_lossy_rect(VncState *vs, int x, int y, int w, int h); /* Encodings */ int vnc_send_framebuffer_update(VncState *vs, int x, int y, int w, int h); -- cgit v1.2.1