X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fdynamic-buffer.c;h=9aa0bb3c94800068222eec05b98d52d4d4cf3fa9;hb=3f4ef714d1ee23dfedf08ccaa9ae2c2e768023f0;hp=fd39f813b3c2568beec2dff1be91343161ec8517;hpb=c90647fe68da8a767a2c03dc0135d4a09992af16;p=lttng-tools.git

diff --git a/src/common/dynamic-buffer.c b/src/common/dynamic-buffer.c
index fd39f813b..9aa0bb3c9 100644
--- a/src/common/dynamic-buffer.c
+++ b/src/common/dynamic-buffer.c
@@ -16,6 +16,7 @@
  */
 
 #include <common/dynamic-buffer.h>
+#include <common/buffer-view.h>
 #include <common/utils.h>
 #include <assert.h>
 
@@ -93,6 +94,23 @@ end:
 	return ret;
 }
 
+LTTNG_HIDDEN
+int lttng_dynamic_buffer_append_view(struct lttng_dynamic_buffer *buffer,
+		const struct lttng_buffer_view *src)
+{
+	int ret;
+
+	if (!buffer || !src) {
+		ret = -1;
+		goto end;
+	}
+
+	ret = lttng_dynamic_buffer_append(buffer, src->data,
+			src->size);
+end:
+	return ret;
+}
+
 LTTNG_HIDDEN
 int lttng_dynamic_buffer_set_size(struct lttng_dynamic_buffer *buffer,
 		size_t new_size)
@@ -108,22 +126,12 @@ int lttng_dynamic_buffer_set_size(struct lttng_dynamic_buffer *buffer,
 	}
 
 	if (new_size > buffer->_capacity) {
-		size_t original_size = buffer->size;
-		size_t original_capacity = buffer->_capacity;
-
 		ret = lttng_dynamic_buffer_set_capacity(buffer, new_size);
 		if (ret) {
 			goto end;
 		}
 
-		/*
-		 * Zero-initialize the space that was left in the buffer at the
-		 * before we increased its capacity (original capacity - original size).
-		 * The newly acquired capacity (new capacity - original capacity)
-		 * is zeroed by lttng_dynamic_buffer_set_capacity().
-		 */
-		memset(buffer->data + original_size, 0,
-				original_capacity - original_size);
+		memset(buffer->data + buffer->size, 0, new_size - buffer->size);
 	} else if (new_size > buffer->size) {
 		memset(buffer->data + buffer->size, 0, new_size - buffer->size);
 	} else {
@@ -148,7 +156,8 @@ int lttng_dynamic_buffer_set_capacity(struct lttng_dynamic_buffer *buffer,
 {
 	int ret = 0;
 	void *new_buf;
-	size_t new_capacity = round_to_power_of_2(demanded_capacity);
+	size_t new_capacity = demanded_capacity ?
+			round_to_power_of_2(demanded_capacity) : 0;
 
 	if (!buffer || demanded_capacity < buffer->size) {
 		/*
@@ -186,3 +195,13 @@ void lttng_dynamic_buffer_reset(struct lttng_dynamic_buffer *buffer)
 	buffer->_capacity = 0;
 	free(buffer->data);
 }
+
+LTTNG_HIDDEN
+size_t lttng_dynamic_buffer_get_capacity_left(
+		struct lttng_dynamic_buffer *buffer)
+{
+	if (!buffer) {
+		return 0;
+	}
+	return buffer->_capacity - buffer->size;
+}