common: set dynamic-buffer's data to NULL on reset()

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

diff --git a/src/common/dynamic-buffer.c b/src/common/dynamic-buffer.c
index aef80dded0bab2785820f7cf8acb1f7b9071cf7b..4e87c58ac1b43778cee695bbe2f78596b99d3f8d 100644 (file)
--- a/src/common/dynamic-buffer.c
+++ b/src/common/dynamic-buffer.c
@@ -1,21 +1,12 @@
 /*
- * Copyright (C) 2017 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <common/dynamic-buffer.h>
+#include <common/buffer-view.h>
 #include <common/utils.h>
 #include <assert.h>
 
@@ -26,10 +17,9 @@
 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);
        rounded = (1ULL << order);
        assert(rounded >= val);
@@ -78,7 +68,7 @@ end:
 
 LTTNG_HIDDEN
 int lttng_dynamic_buffer_append_buffer(struct lttng_dynamic_buffer *dst_buffer,
-               struct lttng_dynamic_buffer *src_buffer)
+               const struct lttng_dynamic_buffer *src_buffer)
 {
        int ret;
 
@@ -93,6 +83,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)
@@ -127,6 +134,7 @@ int lttng_dynamic_buffer_set_size(struct lttng_dynamic_buffer *buffer,
                 * size _before_ making such calls.
                 */
        }
+
        buffer->size = new_size;
 end:
        return ret;
@@ -160,6 +168,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:
@@ -173,9 +182,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
@@ -185,5 +196,6 @@ size_t lttng_dynamic_buffer_get_capacity_left(
        if (!buffer) {
                return 0;
        }
+
        return buffer->_capacity - buffer->size;
 }