X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fdynamic-array.h;h=e97b51d5d0d1d0ff5eebf9e7cddd1fedfa9112f2;hp=a5e4f7fb530806a9f0fc61eb93c95bc805c2d713;hb=93bed9fe8f48c11b7bb1224db36d82404cea080d;hpb=bbbfd84979130a11aebf172cf7d0d24e28165258

diff --git a/src/common/dynamic-array.h b/src/common/dynamic-array.h
index a5e4f7fb5..e97b51d5d 100644
--- a/src/common/dynamic-array.h
+++ b/src/common/dynamic-array.h
@@ -21,26 +21,28 @@
 #include <common/dynamic-buffer.h>
 #include <assert.h>
 
+typedef void (*lttng_dynamic_array_element_destructor)(void *element);
+typedef void (*lttng_dynamic_pointer_array_destructor)(void *ptr);
+
 struct lttng_dynamic_array {
 	struct lttng_dynamic_buffer buffer;
 	size_t element_size;
 	size_t size;
+	lttng_dynamic_array_element_destructor destructor;
 };
 
 struct lttng_dynamic_pointer_array {
 	struct lttng_dynamic_array array;
 };
 
-typedef void (*lttng_dynamic_array_element_destructor)(void *element);
-typedef void (*lttng_dynamic_pointer_array_destructor)(void *ptr);
-
 /*
  * Initialize a resizable array of fixed-size elements. This performs no
  * allocation and can't fail.
  */
 LTTNG_HIDDEN
 void lttng_dynamic_array_init(struct lttng_dynamic_array *array,
-		size_t element_size);
+		size_t element_size,
+		lttng_dynamic_array_element_destructor destructor);
 
 /*
  * Returns the number of elements in the dynamic array.
@@ -74,10 +76,18 @@ LTTNG_HIDDEN
 int lttng_dynamic_array_add_element(struct lttng_dynamic_array *array,
 		const void *element);
 
+/*
+ * Remove an element from the dynamic array. The array's element count is
+ * decreased by one and the following elements are shifted to take its place
+ * (when applicable).
+ */
+LTTNG_HIDDEN
+int lttng_dynamic_array_remove_element(struct lttng_dynamic_array *array,
+		size_t element_index);
+
 /* Release any memory used by the dynamic array. */
 LTTNG_HIDDEN
-void lttng_dynamic_array_reset(struct lttng_dynamic_array *array,
-		lttng_dynamic_array_element_destructor destructor);
+void lttng_dynamic_array_reset(struct lttng_dynamic_array *array);
 
 
 /*
@@ -93,7 +103,8 @@ void lttng_dynamic_array_reset(struct lttng_dynamic_array *array,
  */
 LTTNG_HIDDEN
 void lttng_dynamic_pointer_array_init(
-		struct lttng_dynamic_pointer_array *array);
+		struct lttng_dynamic_pointer_array *array,
+		lttng_dynamic_pointer_array_destructor destructor);
 
 /*
  * Returns the number of pointers in the dynamic pointer array.
@@ -130,10 +141,21 @@ int lttng_dynamic_pointer_array_add_pointer(
 	return lttng_dynamic_array_add_element(&array->array, &pointer);
 }
 
+/*
+ * Remove a pointer from a dynamic pointer array. The array's element
+ * count is decreased by one and the following pointers are shifted to
+ * take the place of the removed pointer (if applicable).
+ */
+static inline
+int lttng_dynamic_pointer_array_remove_pointer(
+		struct lttng_dynamic_pointer_array *array, size_t index)
+{
+	return lttng_dynamic_array_remove_element(&array->array, index);
+}
+
 /* Release any memory used by the dynamic array. */
 LTTNG_HIDDEN
 void lttng_dynamic_pointer_array_reset(
-		struct lttng_dynamic_pointer_array *array,
-		lttng_dynamic_pointer_array_destructor destructor);
+		struct lttng_dynamic_pointer_array *array);
 
 #endif /* LTTNG_DYNAMIC_ARRAY_H */