Force usage of assert() condition when NDEBUG is defined

[lttng-tools.git] / src / common / dynamic-buffer.c

diff --git a/src/common/dynamic-buffer.c b/src/common/dynamic-buffer.c
index 7005ef501776c0801f951e00b3a01aa17c699c85..4a08aa80e53eb85b0e495c078b104a5cfd36b0f2 100644 (file)
--- 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,13 +16,12 @@
 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;
 }
@@ -30,7 +29,7 @@ size_t round_to_power_of_2(size_t val)
 LTTNG_HIDDEN
 void lttng_dynamic_buffer_init(struct lttng_dynamic_buffer *buffer)
 {
-       assert(buffer);
+       LTTNG_ASSERT(buffer);
        memset(buffer, 0, sizeof(*buffer));
 }
 
@@ -50,7 +49,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 +
@@ -83,6 +82,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)
@@ -117,6 +133,7 @@ int lttng_dynamic_buffer_set_size(struct lttng_dynamic_buffer *buffer,
                 * size _before_ making such calls.
                 */
        }
+
        buffer->size = new_size;
 end:
        return ret;
@@ -150,6 +167,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:
@@ -163,9 +181,11 @@ 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
@@ -175,5 +195,6 @@ size_t lttng_dynamic_buffer_get_capacity_left(
        if (!buffer) {
                return 0;
        }
+
        return buffer->_capacity - buffer->size;
 }