X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fdynamic-buffer.c;h=d6ad6740fc62434ffc09f06dfc8689f955111a23;hb=48a4000561343808724f7cb5fa8c131877489ccd;hp=7005ef501776c0801f951e00b3a01aa17c699c85;hpb=38b6c4f5eb49d404ff3f2248b017cea415c49618;p=lttng-tools.git

diff --git a/src/common/dynamic-buffer.c b/src/common/dynamic-buffer.c
index 7005ef501..d6ad6740f 100644
--- a/src/common/dynamic-buffer.c
+++ b/src/common/dynamic-buffer.c
@@ -6,8 +6,8 @@
  */
 
 #include <common/dynamic-buffer.h>
+#include <common/buffer-view.h>
 #include <common/utils.h>
-#include <assert.h>
 
 /*
  * Round to (upper) power of two, val is returned if it already is a power of
@@ -16,25 +16,22 @@
 static
 size_t round_to_power_of_2(size_t val)
 {
-	int order;
 	size_t rounded;
+	const int order = utils_get_count_order_u64(val);
 
-	order = utils_get_count_order_u64(val);
-	assert(order >= 0);
+	LTTNG_ASSERT(order >= 0);
 	rounded = (1ULL << order);
-	assert(rounded >= val);
+	LTTNG_ASSERT(rounded >= val);
 
 	return rounded;
 }
 
-LTTNG_HIDDEN
 void lttng_dynamic_buffer_init(struct lttng_dynamic_buffer *buffer)
 {
-	assert(buffer);
+	LTTNG_ASSERT(buffer);
 	memset(buffer, 0, sizeof(*buffer));
 }
 
-LTTNG_HIDDEN
 int lttng_dynamic_buffer_append(struct lttng_dynamic_buffer *buffer,
 		const void *buf, size_t len)
 {
@@ -50,7 +47,7 @@ int lttng_dynamic_buffer_append(struct lttng_dynamic_buffer *buffer,
 		goto end;
 	}
 
-	assert(buffer->_capacity >= buffer->size);
+	LTTNG_ASSERT(buffer->_capacity >= buffer->size);
 	if (buffer->_capacity < (len + buffer->size)) {
 		ret = lttng_dynamic_buffer_set_capacity(buffer,
 				buffer->_capacity +
@@ -66,7 +63,6 @@ end:
 	return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_dynamic_buffer_append_buffer(struct lttng_dynamic_buffer *dst_buffer,
 		const struct lttng_dynamic_buffer *src_buffer)
 {
@@ -83,7 +79,22 @@ 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;
+}
+
 int lttng_dynamic_buffer_set_size(struct lttng_dynamic_buffer *buffer,
 		size_t new_size)
 {
@@ -117,12 +128,12 @@ int lttng_dynamic_buffer_set_size(struct lttng_dynamic_buffer *buffer,
 		 * size _before_ making such calls.
 		 */
 	}
+
 	buffer->size = new_size;
 end:
 	return ret;
 }
 
-LTTNG_HIDDEN
 int lttng_dynamic_buffer_set_capacity(struct lttng_dynamic_buffer *buffer,
 		size_t demanded_capacity)
 {
@@ -150,6 +161,7 @@ int lttng_dynamic_buffer_set_capacity(struct lttng_dynamic_buffer *buffer,
 		ret = -1;
 		goto end;
 	}
+
 	buffer->data = new_buf;
 	buffer->_capacity = new_capacity;
 end:
@@ -157,23 +169,24 @@ end:
 }
 
 /* Release any memory used by the dynamic buffer. */
-LTTNG_HIDDEN
 void lttng_dynamic_buffer_reset(struct lttng_dynamic_buffer *buffer)
 {
 	if (!buffer) {
 		return;
 	}
+
 	buffer->size = 0;
 	buffer->_capacity = 0;
 	free(buffer->data);
+	buffer->data = NULL;
 }
 
-LTTNG_HIDDEN
 size_t lttng_dynamic_buffer_get_capacity_left(
 		struct lttng_dynamic_buffer *buffer)
 {
 	if (!buffer) {
 		return 0;
 	}
+
 	return buffer->_capacity - buffer->size;
 }