[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/20] buffer: factor out buffer_req_size
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 17/20] buffer: factor out buffer_req_size |
Date: |
Mon, 16 Nov 2015 18:25:32 +0100 |
From: Peter Lieven <address@hidden>
Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Message-id: address@hidden
---
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
- [Qemu-devel] [PULL 02/20] buffer: add buffer_init, (continued)
- [Qemu-devel] [PULL 02/20] buffer: add buffer_init, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 18/20] buffer: factor out buffer_adj_size, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 16/20] vnc: recycle empty vs->output buffer, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 19/20] buffer: allow a buffer to shrink gracefully, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 11/20] vnc: add vnc_width+vnc_height helpers, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 03/20] buffer: add buffer_move_empty, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 14/20] vnc: only alloc server surface with clients connected, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 05/20] buffer: add buffer_shrink, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 20/20] vnc: fix mismerge, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 07/20] vnc: attach names to buffers, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 17/20] buffer: factor out buffer_req_size,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 12/20] vnc: factor out vnc_update_server_surface, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 15/20] vnc: fix local state init, Gerd Hoffmann, 2015/11/16
- Re: [Qemu-devel] [PULL for-2.5 00/20] vnc: buffer code improvements, bugfixes., Peter Maydell, 2015/11/17