From patchwork Fri Dec 7 14:56:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Hardeck X-Patchwork-Id: 204519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6E1C32C00C2 for ; Sat, 8 Dec 2012 01:59:10 +1100 (EST) Received: from localhost ([::1]:36092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgzOO-0007C6-KJ for incoming@patchwork.ozlabs.org; Fri, 07 Dec 2012 09:59:08 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgzO0-00076F-Ma for qemu-devel@nongnu.org; Fri, 07 Dec 2012 09:58:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgzNw-0004R3-Ei for qemu-devel@nongnu.org; Fri, 07 Dec 2012 09:58:44 -0500 Received: from cantor2.suse.de ([195.135.220.15]:58441 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgzNw-0004OJ-5V for qemu-devel@nongnu.org; Fri, 07 Dec 2012 09:58:40 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 190C9A51F6; Fri, 7 Dec 2012 15:57:59 +0100 (CET) From: Tim Hardeck To: qemu-devel@nongnu.org Date: Fri, 7 Dec 2012 15:56:33 +0100 Message-Id: <1354892195-18332-2-git-send-email-thardeck@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1354892195-18332-1-git-send-email-thardeck@suse.de> References: <1354892195-18332-1-git-send-email-thardeck@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: aliguori@us.ibm.com, stefanha@gmail.com, github@martintribe.org, Tim Hardeck , alevy@redhat.com, kraxel@redhat.com, corentin.chary@gmail.com Subject: [Qemu-devel] [PATCH 1/3] vnc: added buffer_advance function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Following Anthony Liguori's Websocket implementation I have added the buffer_advance function to VNC and replaced all related buffer memmove operations with it. Signed-off-by: Tim Hardeck --- ui/vnc.c | 13 +++++++++---- ui/vnc.h | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index ba30362..87bdd5f 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -510,6 +510,13 @@ void buffer_append(Buffer *buffer, const void *data, size_t len) buffer->offset += len; } +void buffer_advance(Buffer *buf, size_t len) +{ + memmove(buf->buffer, buf->buffer + len, + (buf->offset - len)); + buf->offset -= len; +} + static void vnc_desktop_resize(VncState *vs) { DisplayState *ds = vs->ds; @@ -1166,8 +1173,7 @@ static long vnc_client_write_plain(VncState *vs) if (!ret) return 0; - memmove(vs->output.buffer, vs->output.buffer + ret, (vs->output.offset - ret)); - vs->output.offset -= ret; + buffer_advance(&vs->output, ret); if (vs->output.offset == 0) { qemu_set_fd_handler2(vs->csock, NULL, vnc_client_read, NULL, vs); @@ -1313,8 +1319,7 @@ void vnc_client_read(void *opaque) } if (!ret) { - memmove(vs->input.buffer, vs->input.buffer + len, (vs->input.offset - len)); - vs->input.offset -= len; + buffer_advance(&vs->input, len); } else { vs->read_handler_expect = ret; } diff --git a/ui/vnc.h b/ui/vnc.h index 6141e88..ea82875 100644 --- a/ui/vnc.h +++ b/ui/vnc.h @@ -510,6 +510,7 @@ void buffer_reserve(Buffer *buffer, size_t len); void buffer_reset(Buffer *buffer); void buffer_free(Buffer *buffer); void buffer_append(Buffer *buffer, const void *data, size_t len); +void buffer_advance(Buffer *buf, size_t len); /* Misc helpers */