X-Git-Url: http://git.liburcu.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fdynamic-array.c;h=094e269a4fe6e9d8245f517ab1d9e692a5ba8d94;hp=ac2a6d5aacfae4b33e5cd0b2a0c7954bef7003d1;hb=0186592a67a28417f1dabbb1790560d8cd1033d4;hpb=1ad1103bedd3f87c3cbe151e1ef61fbaceaa0f4c

diff --git a/src/common/dynamic-array.c b/src/common/dynamic-array.c
index ac2a6d5aa..094e269a4 100644
--- a/src/common/dynamic-array.c
+++ b/src/common/dynamic-array.c
@@ -95,6 +95,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,6 +130,10 @@ 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);