From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyNXF-0003N8-Ky for qemu-devel@nongnu.org; Mon, 16 Nov 2015 12:25:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyNXD-0000Rk-IO for qemu-devel@nongnu.org; Mon, 16 Nov 2015 12:25:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyNXD-0000RG-1K for qemu-devel@nongnu.org; Mon, 16 Nov 2015 12:25:43 -0500 From: Gerd Hoffmann Date: Mon, 16 Nov 2015 18:25:33 +0100 Message-Id: <1447694735-3420-19-git-send-email-kraxel@redhat.com> In-Reply-To: <1447694735-3420-1-git-send-email-kraxel@redhat.com> References: <1447694735-3420-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 18/20] buffer: factor out buffer_adj_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Lieven , Gerd Hoffmann From: Peter Lieven Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrange Message-id: 1446203414-4013-19-git-send-email-kraxel@redhat.com --- util/buffer.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/util/buffer.c b/util/buffer.c index 31f1d9f..fe5a44e 100644 --- a/util/buffer.c +++ b/util/buffer.c @@ -30,6 +30,14 @@ static size_t buffer_req_size(Buffer *buffer, size_t len) pow2ceil(buffer->offset + len)); } +static void buffer_adj_size(Buffer *buffer, size_t len) +{ + size_t old = buffer->capacity; + buffer->capacity = buffer_req_size(buffer, len); + buffer->buffer = g_realloc(buffer->buffer, buffer->capacity); + trace_buffer_resize(buffer->name ?: "unnamed", + old, buffer->capacity); +} void buffer_init(Buffer *buffer, const char *name, ...) { @@ -42,8 +50,6 @@ void buffer_init(Buffer *buffer, const char *name, ...) void buffer_shrink(Buffer *buffer) { - size_t old; - /* * Only shrink in case the used size is *much* smaller than the * capacity, to avoid bumping up & down the buffers all the time. @@ -54,24 +60,13 @@ void buffer_shrink(Buffer *buffer) return; } - old = buffer->capacity; - buffer->capacity = pow2ceil(buffer->offset); - buffer->capacity = MAX(buffer->capacity, BUFFER_MIN_SHRINK_SIZE); - buffer->buffer = g_realloc(buffer->buffer, buffer->capacity); - trace_buffer_resize(buffer->name ?: "unnamed", - old, buffer->capacity); + buffer_adj_size(buffer, 0); } void buffer_reserve(Buffer *buffer, size_t len) { - size_t old; - if ((buffer->capacity - buffer->offset) < len) { - old = buffer->capacity; - buffer->capacity = buffer_req_size(buffer, len); - buffer->buffer = g_realloc(buffer->buffer, buffer->capacity); - trace_buffer_resize(buffer->name ?: "unnamed", - old, buffer->capacity); + buffer_adj_size(buffer, len); } } -- 1.8.3.1