[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/20] buffer: factor out buffer_adj_size
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 18/20] buffer: factor out buffer_adj_size |
Date: |
Mon, 16 Nov 2015 18:25:33 +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 | 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
- [Qemu-devel] [PULL for-2.5 00/20] vnc: buffer code improvements, bugfixes., Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 13/20] vnc: use vnc_{width, height} in vnc_set_area_dirty, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 01/20] buffer: make the Buffer capacity increase in powers of two, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 09/20] vnc-jobs: move buffer reset, use new buffer move, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 04/20] buffer: add buffer_move, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 10/20] vnc: zap dead code, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 06/20] buffer: add tracing, Gerd Hoffmann, 2015/11/16
- [Qemu-devel] [PULL 08/20] vnc: kill jobs queue buffer, Gerd Hoffmann, 2015/11/16
- [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 <=
- [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, 2015/11/16
- [Qemu-devel] [PULL 12/20] vnc: factor out vnc_update_server_surface, Gerd Hoffmann, 2015/11/16