X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fdynamic-array.c;h=bea903cafeae2a115b1fc1816345a0d50017dc8f;hb=cad663729201ff5432ddf07723e7ea36eec80895;hp=ac2a6d5aacfae4b33e5cd0b2a0c7954bef7003d1;hpb=93bed9fe8f48c11b7bb1224db36d82404cea080d;p=lttng-tools.git

diff --git a/src/common/dynamic-array.c b/src/common/dynamic-array.c
index ac2a6d5aa..bea903caf 100644
--- a/src/common/dynamic-array.c
+++ b/src/common/dynamic-array.c
@@ -87,6 +87,22 @@ 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) {
+		size_t i;
+
+		for (i = 0; i < lttng_dynamic_array_get_count(array); i++) {
+			array->destructor(lttng_dynamic_array_get_element(array,
+					i));
+		}
+	}
+
+	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,
@@ -95,6 +111,28 @@ 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)
+{
+	int ret;
+	const lttng_dynamic_array_element_destructor destructor =
+			array->array.destructor;
+
+	/*
+	 * Prevent the destructor from being used by the underlying
+	 * dynamic array.
+	 */
+	array->array.destructor = NULL;
+	if (destructor) {
+		destructor(lttng_dynamic_pointer_array_get_pointer(array,
+				index));
+	}
+	ret = lttng_dynamic_array_remove_element(&array->array, index);
+	array->array.destructor = destructor;
+	return ret;
+}
+
 /* Release any memory used by the dynamic array. */
 LTTNG_HIDDEN
 void lttng_dynamic_pointer_array_reset(
@@ -108,7 +146,36 @@ void lttng_dynamic_pointer_array_reset(
 					array, i);
 			array->array.destructor(ptr);
 		}
+		/*
+		 * Prevent the destructor from being used by the underlying
+		 * dynamic array.
+		 */
 		array->array.destructor = NULL;
 	}
 	lttng_dynamic_array_reset(&array->array);
 }
+
+LTTNG_HIDDEN
+void lttng_dynamic_pointer_array_clear(
+		struct lttng_dynamic_pointer_array *array)
+{
+	const lttng_dynamic_array_element_destructor destructor =
+			array->array.destructor;
+
+	/*
+	 * Prevent the destructor from being used by the underlying
+	 * dynamic array.
+	 */
+	array->array.destructor = NULL;
+	if (destructor) {
+		size_t i, count = lttng_dynamic_pointer_array_get_count(array);
+
+		for (i = 0; i < count; i++) {
+			void *ptr = lttng_dynamic_pointer_array_get_pointer(
+					array, i);
+			destructor(ptr);
+		}
+	}
+	lttng_dynamic_array_clear(&array->array);
+	array->array.destructor = destructor;
+}