From patchwork Thu Nov 11 16:56:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 70834 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 562E8B7146 for ; Fri, 12 Nov 2010 04:06:40 +1100 (EST) Received: from localhost ([127.0.0.1]:46144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGabK-0003yb-U6 for incoming@patchwork.ozlabs.org; Thu, 11 Nov 2010 12:06:19 -0500 Received: from [140.186.70.92] (port=51899 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGaSP-0008Qn-UW for qemu-devel@nongnu.org; Thu, 11 Nov 2010 11:57:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGaSN-0005UV-ID for qemu-devel@nongnu.org; Thu, 11 Nov 2010 11:57:05 -0500 Received: from relay2-v.mail.gandi.net ([217.70.178.76]:53052) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGaSN-0005U8-7o for qemu-devel@nongnu.org; Thu, 11 Nov 2010 11:57:03 -0500 X-Originating-IP: 217.70.178.40 Received: from mfilter6-d.gandi.net (mfilter6-d.gandi.net [217.70.178.40]) by relay2-v.mail.gandi.net (Postfix) with ESMTP id 841E8135DA; Thu, 11 Nov 2010 17:57:02 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter6-v Received: from relay2-v.mail.gandi.net ([217.70.178.76]) by mfilter6-d.gandi.net (mfilter6-d.gandi.net [217.70.178.40]) (amavisd-new, port 10024) with ESMTP id 59y4P0jvgpPj; Thu, 11 Nov 2010 17:57:01 +0100 (CET) X-Originating-IP: 82.241.209.44 Received: from localhost.localdomain (falgoret.iksaif.net [82.241.209.44]) (Authenticated sender: fake@iksaif.net) by relay2-v.mail.gandi.net (Postfix) with ESMTPSA id 3A20D135D9; Thu, 11 Nov 2010 17:56:59 +0100 (CET) From: Corentin Chary To: Qemu-development List Date: Thu, 11 Nov 2010 17:56:52 +0100 Message-Id: <1289494624-12807-4-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1289494624-12807-1-git-send-email-corentincj@iksaif.net> References: <1289494624-12807-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Corentin Chary , Anthony Liguori , Alexander Graf , Andre Przywara Subject: [Qemu-devel] [PATCH v2 03/15] vnc: refresh lossy rect after a given timeout X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- ui/vnc-jobs-async.c | 2 + ui/vnc.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++--- ui/vnc.h | 3 ++ 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/ui/vnc-jobs-async.c b/ui/vnc-jobs-async.c index 6e9cf08..31f8436 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 b6e18b3..e1643d1 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,7 +1052,11 @@ static void vnc_disconnect_finish(VncState *vs) #ifdef CONFIG_VNC_THREAD qemu_mutex_destroy(&vs->output_mutex); #endif - qemu_free(vs); + for (i = 0; i < VNC_STAT_ROWS; ++i) { + qemu_free(vs->lossy_rect[i]); + } + qemu_free(vs->lossy_rect); + qemu_free(vs); } int vnc_client_io_error(VncState *vs, int ret, int last_errno) @@ -2266,10 +2272,55 @@ 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) { @@ -2282,7 +2333,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; @@ -2301,6 +2352,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 ; } @@ -2314,6 +2366,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) @@ -2365,7 +2418,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. @@ -2467,7 +2520,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 f10fa3c..00bd21c 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -216,6 +216,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; @@ -497,6 +499,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);