X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fdynamic-array.c;h=81c2c3efa15ba1927a61ecc608ea07a9bd9b6f07;hp=bea903cafeae2a115b1fc1816345a0d50017dc8f;hb=44635d77b591f83a80d48cd93497bd1cd6aa788d;hpb=74465ffbb5ead0a3d7ba6342e7baf16f4fa662f9 diff --git a/src/common/dynamic-array.c b/src/common/dynamic-array.c index bea903caf..81c2c3efa 100644 --- a/src/common/dynamic-array.c +++ b/src/common/dynamic-array.c @@ -1,18 +1,8 @@ /* - * Copyright (C) 2019 - Jérémie Galarneau + * Copyright (C) 2019 Jérémie Galarneau * - * 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 @@ -28,6 +18,35 @@ void lttng_dynamic_array_init(struct lttng_dynamic_array *array, array->destructor = destructor; } +LTTNG_HIDDEN +int lttng_dynamic_array_set_count(struct lttng_dynamic_array *array, + size_t new_element_count) +{ + int ret; + + if (!array) { + ret = -1; + goto end; + } + + if (array->destructor) { + size_t i; + + for (i = new_element_count; i < array->size; i++) { + void *element = lttng_dynamic_array_get_element( + array, i); + + array->destructor(element); + } + } + + array->size = new_element_count; + ret = lttng_dynamic_buffer_set_size(&array->buffer, + new_element_count * array->element_size); +end: + return ret; +} + LTTNG_HIDDEN int lttng_dynamic_array_add_element(struct lttng_dynamic_array *array, const void *element) @@ -99,7 +118,7 @@ void lttng_dynamic_array_clear(struct lttng_dynamic_array *array) } } - lttng_dynamic_buffer_set_size(&array->buffer, 0); + (void) lttng_dynamic_buffer_set_size(&array->buffer, 0); array->size = 0; }