consumerd: on_sleep not called on stream when no data is available

[lttng-tools.git] / src / common / dynamic-array.c

diff --git a/src/common/dynamic-array.c b/src/common/dynamic-array.c
index ac2a6d5aacfae4b33e5cd0b2a0c7954bef7003d1..198df19bbaa89d5bff75911fdf2d1b915b0cfd3e 100644 (file)
--- a/src/common/dynamic-array.c
+++ b/src/common/dynamic-array.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2019 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2019 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * 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 <common/dynamic-array.h>
@@ -87,6 +77,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));
+               }
+       }
+
+       (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,
@@ -95,6 +101,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 +136,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;
+}