From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs7Zh-0005eN-Vd for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zs7Zf-0002aB-QD for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zs7Zf-0002a0-Kr for qemu-devel@nongnu.org; Fri, 30 Oct 2015 07:10:23 -0400 From: Gerd Hoffmann Date: Fri, 30 Oct 2015 12:10:12 +0100 Message-Id: <1446203414-4013-18-git-send-email-kraxel@redhat.com> In-Reply-To: <1446203414-4013-1-git-send-email-kraxel@redhat.com> References: <1446203414-4013-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 17/19] buffer: factor out buffer_req_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pl@kamp.de, Gerd Hoffmann From: Peter Lieven Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann --- util/buffer.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/util/buffer.c b/util/buffer.c index ae2907e..31f1d9f 100644 --- a/util/buffer.c +++ b/util/buffer.c @@ -24,6 +24,13 @@ #define BUFFER_MIN_INIT_SIZE 4096 #define BUFFER_MIN_SHRINK_SIZE 65536 +static size_t buffer_req_size(Buffer *buffer, size_t len) +{ + return MAX(BUFFER_MIN_INIT_SIZE, + pow2ceil(buffer->offset + len)); +} + + void buffer_init(Buffer *buffer, const char *name, ...) { va_list ap; @@ -61,8 +68,7 @@ void buffer_reserve(Buffer *buffer, size_t len) if ((buffer->capacity - buffer->offset) < len) { old = buffer->capacity; - buffer->capacity = pow2ceil(buffer->offset + len); - buffer->capacity = MAX(buffer->capacity, BUFFER_MIN_INIT_SIZE); + buffer->capacity = buffer_req_size(buffer, len); buffer->buffer = g_realloc(buffer->buffer, buffer->capacity); trace_buffer_resize(buffer->name ?: "unnamed", old, buffer->capacity); -- 1.8.3.1