From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsIWZ-0001JM-Df for qemu-devel@nongnu.org; Mon, 07 Jan 2013 14:38:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsIWY-0005bU-Cj for qemu-devel@nongnu.org; Mon, 07 Jan 2013 14:38:19 -0500 Received: from e7.ny.us.ibm.com ([32.97.182.137]:41662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsIWY-0005bJ-8V for qemu-devel@nongnu.org; Mon, 07 Jan 2013 14:38:18 -0500 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 7 Jan 2013 14:38:16 -0500 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id B6796C90046 for ; Mon, 7 Jan 2013 14:38:13 -0500 (EST) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r07JcDfn287242 for ; Mon, 7 Jan 2013 14:38:13 -0500 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r07JcDJj012561 for ; Mon, 7 Jan 2013 17:38:13 -0200 From: Anthony Liguori In-Reply-To: <1357133386-7643-2-git-send-email-thardeck@suse.de> References: <1357133386-7643-1-git-send-email-thardeck@suse.de> <1357133386-7643-2-git-send-email-thardeck@suse.de> Date: Mon, 07 Jan 2013 13:38:06 -0600 Message-ID: <87vcb8u6ld.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH 1/3] vnc: added buffer_advance function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Tim Hardeck , qemu-devel@nongnu.org Cc: stefanha@gmail.com, github@martintribe.org, alevy@redhat.com, kraxel@redhat.com, corentin.chary@gmail.com Tim Hardeck writes: > 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 Reviewed-by: Anthony Liguori Regards, Anthony Liguori > --- > 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 8912b78..ddf01f1 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 8b40f09..5059cbe 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 */ > -- > 1.7.10.4