X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fdynamic-array.c;h=d723ffacb385094097508250b5d28a40e4c3991c;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=f737c982d6c1b7bfa39212a43ce6a7d404d63449;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git diff --git a/src/common/dynamic-array.c b/src/common/dynamic-array.c index f737c982d..d723ffacb 100644 --- a/src/common/dynamic-array.c +++ b/src/common/dynamic-array.c @@ -7,7 +7,6 @@ #include -LTTNG_HIDDEN void lttng_dynamic_array_init(struct lttng_dynamic_array *array, size_t element_size, lttng_dynamic_array_element_destructor destructor) @@ -18,7 +17,34 @@ 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; +} + int lttng_dynamic_array_add_element(struct lttng_dynamic_array *array, const void *element) { @@ -39,7 +65,6 @@ end: return ret; } -LTTNG_HIDDEN int lttng_dynamic_array_remove_element(struct lttng_dynamic_array *array, size_t element_index) { @@ -61,7 +86,6 @@ int lttng_dynamic_array_remove_element(struct lttng_dynamic_array *array, array->buffer.size - array->element_size); } -LTTNG_HIDDEN void lttng_dynamic_array_reset(struct lttng_dynamic_array *array) { if (array->destructor) { @@ -77,7 +101,6 @@ void lttng_dynamic_array_reset(struct lttng_dynamic_array *array) array->size = 0; } -LTTNG_HIDDEN void lttng_dynamic_array_clear(struct lttng_dynamic_array *array) { if (array->destructor) { @@ -89,11 +112,10 @@ 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; } -LTTNG_HIDDEN void lttng_dynamic_pointer_array_init( struct lttng_dynamic_pointer_array *array, lttng_dynamic_pointer_array_destructor destructor) @@ -101,7 +123,6 @@ void lttng_dynamic_pointer_array_init( lttng_dynamic_array_init(&array->array, sizeof(void *), destructor); } -LTTNG_HIDDEN int lttng_dynamic_pointer_array_remove_pointer( struct lttng_dynamic_pointer_array *array, size_t index) { @@ -124,7 +145,6 @@ int lttng_dynamic_pointer_array_remove_pointer( } /* Release any memory used by the dynamic array. */ -LTTNG_HIDDEN void lttng_dynamic_pointer_array_reset( struct lttng_dynamic_pointer_array *array) { @@ -145,7 +165,6 @@ void lttng_dynamic_pointer_array_reset( lttng_dynamic_array_reset(&array->array); } -LTTNG_HIDDEN void lttng_dynamic_pointer_array_clear( struct lttng_dynamic_pointer_array *array) {