"destroy" method -> "finalize" method

"Finalize" is more symmetric with "initialize" ("init"), and "destroy"
implies that the object is completely destroyed, which might not be the
case eventually.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/include/babeltrace/component/component-class-filter.h b/include/babeltrace/component/component-class-filter.h
index b0024dc28be1bb993785b4a686a8e07fad6f8b26..be44271e9b70f1e578bc695b000b42c2e5e6f2bf 100644 (file)
--- a/include/babeltrace/component/component-class-filter.h
+++ b/include/babeltrace/component/component-class-filter.h
@@ -44,9 +44,9 @@ int bt_component_class_filter_set_notification_iterator_init_method(
                bt_component_class_notification_iterator_init_method notification_iterator_init_method);
 
 extern
-int bt_component_class_filter_set_notification_iterator_destroy_method(
+int bt_component_class_filter_set_notification_iterator_finalize_method(
                struct bt_component_class *component_class,
-               bt_component_class_notification_iterator_destroy_method notification_iterator_destroy_method);
+               bt_component_class_notification_iterator_finalize_method notification_iterator_finalize_method);
 
 extern
 int bt_component_class_filter_set_notification_iterator_seek_time_method(

diff --git a/include/babeltrace/component/component-class-internal.h b/include/babeltrace/component/component-class-internal.h
index 6146cad6d2327985aeab7238fc55e54db94204ed..6aed6f0b026c8fb8ae4ad9aada986267f6a3f433 100644 (file)
--- a/include/babeltrace/component/component-class-internal.h
+++ b/include/babeltrace/component/component-class-internal.h
@@ -56,7 +56,7 @@ struct bt_component_class {
        GString *help;
        struct {
                bt_component_class_init_method init;
-               bt_component_class_destroy_method destroy;
+               bt_component_class_finalize_method finalize;
                bt_component_class_query_method query;
                bt_component_class_accept_port_connection_method accept_port_connection;
                bt_component_class_port_disconnected_method port_disconnected;
@@ -68,7 +68,7 @@ struct bt_component_class {
 
 struct bt_component_class_iterator_methods {
        bt_component_class_notification_iterator_init_method init;
-       bt_component_class_notification_iterator_destroy_method destroy;
+       bt_component_class_notification_iterator_finalize_method finalize;
        bt_component_class_notification_iterator_get_method get;
        bt_component_class_notification_iterator_next_method next;
        bt_component_class_notification_iterator_seek_time_method seek_time;

diff --git a/include/babeltrace/component/component-class-source.h b/include/babeltrace/component/component-class-source.h
index 5ca39b1b1c6a3ca318e3b0936ff611d14f26ac64..beaaa878f4f5b9463b823c8d3ad471a215f97f8d 100644 (file)
--- a/include/babeltrace/component/component-class-source.h
+++ b/include/babeltrace/component/component-class-source.h
@@ -44,9 +44,9 @@ int bt_component_class_source_set_notification_iterator_init_method(
                bt_component_class_notification_iterator_init_method notification_iterator_init_method);
 
 extern
-int bt_component_class_source_set_notification_iterator_destroy_method(
+int bt_component_class_source_set_notification_iterator_finalize_method(
                struct bt_component_class *component_class,
-               bt_component_class_notification_iterator_destroy_method notification_iterator_destroy_method);
+               bt_component_class_notification_iterator_finalize_method notification_iterator_finalize_method);
 
 extern
 int bt_component_class_source_set_notification_iterator_seek_time_method(

diff --git a/include/babeltrace/component/component-class.h b/include/babeltrace/component/component-class.h
index 774d80950d92a3fc052ada38110834067dcee6a1..29b66ecb17209866ad36092690e3695a0b8be5e9 100644 (file)
--- a/include/babeltrace/component/component-class.h
+++ b/include/babeltrace/component/component-class.h
@@ -60,7 +60,7 @@ typedef enum bt_component_status (*bt_component_class_init_method)(
                struct bt_private_component *private_component,
                struct bt_value *params, void *init_method_data);
 
-typedef void (*bt_component_class_destroy_method)(
+typedef void (*bt_component_class_finalize_method)(
                struct bt_private_component *private_component);
 
 typedef enum bt_notification_iterator_status
@@ -69,7 +69,7 @@ typedef enum bt_notification_iterator_status
                struct bt_private_port *private_port,
                struct bt_private_notification_iterator *private_notification_iterator);
 
-typedef void (*bt_component_class_notification_iterator_destroy_method)(
+typedef void (*bt_component_class_notification_iterator_finalize_method)(
                struct bt_private_notification_iterator *private_notification_iterator);
 
 typedef struct bt_notification *(*bt_component_class_notification_iterator_get_method)(
@@ -100,9 +100,9 @@ extern int bt_component_class_set_init_method(
                struct bt_component_class *component_class,
                bt_component_class_init_method init_method);
 
-extern int bt_component_class_set_destroy_method(
+extern int bt_component_class_set_finalize_method(
                struct bt_component_class *component_class,
-               bt_component_class_destroy_method destroy_method);
+               bt_component_class_finalize_method finalize_method);
 
 extern int bt_component_class_set_accept_port_connection_method(
                struct bt_component_class *component_class,

diff --git a/include/babeltrace/plugin/plugin-dev.h b/include/babeltrace/plugin/plugin-dev.h
index f558406235fe9f4243616f31b7035b5774cbc6f0..d8d0281509600896b0cf211501cc7a196ced115b 100644 (file)
--- a/include/babeltrace/plugin/plugin-dev.h
+++ b/include/babeltrace/plugin/plugin-dev.h
@@ -167,12 +167,12 @@ enum __bt_plugin_component_class_descriptor_attribute_type {
        BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_DESCRIPTION                         = 0,
        BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_HELP                                = 1,
        BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_INIT_METHOD                         = 2,
-       BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_DESTROY_METHOD                      = 3,
+       BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_FINALIZE_METHOD                     = 3,
        BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_QUERY_METHOD                        = 4,
        BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_ACCEPT_PORT_CONNECTION_METHOD       = 5,
        BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_PORT_DISCONNECTED_METHOD            = 6,
        BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_INIT_METHOD              = 7,
-       BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_DESTROY_METHOD           = 8,
+       BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_FINALIZE_METHOD          = 8,
        BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_SEEK_TIME_METHOD         = 9,
 };
 
@@ -201,8 +201,8 @@ struct __bt_plugin_component_class_descriptor_attribute {
                /* BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_INIT_METHOD */
                bt_component_class_init_method init_method;
 
-               /* BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_DESTROY_METHOD */
-               bt_component_class_destroy_method destroy_method;
+               /* BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_FINALIZE_METHOD */
+               bt_component_class_finalize_method finalize_method;
 
                /* BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_QUERY_METHOD */
                bt_component_class_query_method query_method;
@@ -216,8 +216,8 @@ struct __bt_plugin_component_class_descriptor_attribute {
                /* BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_INIT_METHOD */
                bt_component_class_notification_iterator_init_method notif_iter_init_method;
 
-               /* BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_DESTROY_METHOD */
-               bt_component_class_notification_iterator_destroy_method notif_iter_destroy_method;
+               /* BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_FINALIZE_METHOD */
+               bt_component_class_notification_iterator_finalize_method notif_iter_finalize_method;
 
                /* BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_SEEK_TIME_METHOD */
                bt_component_class_notification_iterator_seek_time_method notif_iter_seek_time_method;
@@ -558,37 +558,37 @@ struct __bt_plugin_component_class_descriptor_attribute {
        __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(init_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_INIT_METHOD, _id, _comp_class_id, sink, _x)
 
 /*
- * Defines a destroy method attribute attached to a specific source
+ * Defines a finalize method attribute attached to a specific source
  * component class descriptor.
  *
  * _id:            Plugin descriptor ID (C identifier).
  * _comp_class_id: Component class descriptor ID (C identifier).
- * _x:             Destroy method (bt_component_class_destroy_method).
+ * _x:             Finalize method (bt_component_class_finalize_method).
  */
-#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_DESTROY_METHOD_WITH_ID(_id, _comp_class_id, _x) \
-       __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(destroy_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_DESTROY_METHOD, _id, _comp_class_id, source, _x)
+#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_FINALIZE_METHOD_WITH_ID(_id, _comp_class_id, _x) \
+       __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(finalize_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_FINALIZE_METHOD, _id, _comp_class_id, source, _x)
 
 /*
- * Defines a destroy method attribute attached to a specific filter
+ * Defines a finalize method attribute attached to a specific filter
  * component class descriptor.
  *
  * _id:            Plugin descriptor ID (C identifier).
  * _comp_class_id: Component class descriptor ID (C identifier).
- * _x:             Destroy method (bt_component_class_destroy_method).
+ * _x:             Finalize method (bt_component_class_finalize_method).
  */
-#define BT_PLUGIN_FILTER_COMPONENT_CLASS_DESTROY_METHOD_WITH_ID(_id, _comp_class_id, _x) \
-       __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(destroy_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_DESTROY_METHOD, _id, _comp_class_id, filter, _x)
+#define BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD_WITH_ID(_id, _comp_class_id, _x) \
+       __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(finalize_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_FINALIZE_METHOD, _id, _comp_class_id, filter, _x)
 
 /*
- * Defines a destroy method attribute attached to a specific sink
+ * Defines a finalize method attribute attached to a specific sink
  * component class descriptor.
  *
  * _id:            Plugin descriptor ID (C identifier).
  * _comp_class_id: Component class descriptor ID (C identifier).
- * _x:             Destroy method (bt_component_class_destroy_method).
+ * _x:             Finalize method (bt_component_class_finalize_method).
  */
-#define BT_PLUGIN_SINK_COMPONENT_CLASS_DESTROY_METHOD_WITH_ID(_id, _comp_class_id, _x) \
-       __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(destroy_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_DESTROY_METHOD, _id, _comp_class_id, sink, _x)
+#define BT_PLUGIN_SINK_COMPONENT_CLASS_FINALIZE_METHOD_WITH_ID(_id, _comp_class_id, _x) \
+       __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(finalize_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_FINALIZE_METHOD, _id, _comp_class_id, sink, _x)
 
 /*
  * Defines a query method attribute attached to a specific source
@@ -596,7 +596,7 @@ struct __bt_plugin_component_class_descriptor_attribute {
  *
  * _id:            Plugin descriptor ID (C identifier).
  * _comp_class_id: Component class descriptor ID (C identifier).
- * _x:             Destroy method (bt_component_class_query_method).
+ * _x:             Finalize method (bt_component_class_query_method).
  */
 #define BT_PLUGIN_SOURCE_COMPONENT_CLASS_QUERY_METHOD_WITH_ID(_id, _comp_class_id, _x) \
        __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(query_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_QUERY_METHOD, _id, _comp_class_id, source, _x)
@@ -607,7 +607,7 @@ struct __bt_plugin_component_class_descriptor_attribute {
  *
  * _id:            Plugin descriptor ID (C identifier).
  * _comp_class_id: Component class descriptor ID (C identifier).
- * _x:             Destroy method (bt_component_class_query_method).
+ * _x:             Finalize method (bt_component_class_query_method).
  */
 #define BT_PLUGIN_FILTER_COMPONENT_CLASS_QUERY_METHOD_WITH_ID(_id, _comp_class_id, _x) \
        __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(query_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_QUERY_METHOD, _id, _comp_class_id, filter, _x)
@@ -618,7 +618,7 @@ struct __bt_plugin_component_class_descriptor_attribute {
  *
  * _id:            Plugin descriptor ID (C identifier).
  * _comp_class_id: Component class descriptor ID (C identifier).
- * _x:             Destroy method (bt_component_class_query_method).
+ * _x:             Finalize method (bt_component_class_query_method).
  */
 #define BT_PLUGIN_SINK_COMPONENT_CLASS_QUERY_METHOD_WITH_ID(_id, _comp_class_id, _x) \
        __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(query_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_QUERY_METHOD, _id, _comp_class_id, sink, _x)
@@ -708,16 +708,16 @@ struct __bt_plugin_component_class_descriptor_attribute {
        __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(notif_iter_init_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_INIT_METHOD, _id, _comp_class_id, source, _x)
 
 /*
- * Defines an iterator destroy method attribute attached to a specific
+ * Defines an iterator finalize method attribute attached to a specific
  * source component class descriptor.
  *
  * _id:            Plugin descriptor ID (C identifier).
  * _comp_class_id: Component class descriptor ID (C identifier).
- * _x:             Iterator destroy method
- *                 (bt_component_class_notification_iterator_destroy_method).
+ * _x:             Iterator finalize method
+ *                 (bt_component_class_notification_iterator_finalize_method).
  */
-#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD_WITH_ID(_id, _comp_class_id, _x) \
-       __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(notif_iter_destroy_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_DESTROY_METHOD, _id, _comp_class_id, source, _x)
+#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD_WITH_ID(_id, _comp_class_id, _x) \
+       __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(notif_iter_finalize_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_FINALIZE_METHOD, _id, _comp_class_id, source, _x)
 
 /*
  * Defines an iterator seek time method attribute attached to a specific
@@ -744,16 +744,16 @@ struct __bt_plugin_component_class_descriptor_attribute {
        __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(notif_iter_init_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_INIT_METHOD, _id, _comp_class_id, filter, _x)
 
 /*
- * Defines an iterator destroy method attribute attached to a specific
+ * Defines an iterator finalize method attribute attached to a specific
  * filter component class descriptor.
  *
  * _id:            Plugin descriptor ID (C identifier).
  * _comp_class_id: Component class descriptor ID (C identifier).
- * _x:             Iterator destroy method
- *                 (bt_component_class_notification_iterator_destroy_method).
+ * _x:             Iterator finalize method
+ *                 (bt_component_class_notification_iterator_finalize_method).
  */
-#define BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD_WITH_ID(_id, _comp_class_id, _x) \
-       __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(notif_iter_destroy_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_DESTROY_METHOD, _id, _comp_class_id, filter, _x)
+#define BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD_WITH_ID(_id, _comp_class_id, _x) \
+       __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(notif_iter_finalize_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_FINALIZE_METHOD, _id, _comp_class_id, filter, _x)
 
 /*
  * Defines an iterator seek time method attribute attached to a specific
@@ -959,36 +959,36 @@ struct __bt_plugin_component_class_descriptor_attribute {
        BT_PLUGIN_SINK_COMPONENT_CLASS_INIT_METHOD_WITH_ID(auto, _name, _x)
 
 /*
- * Defines a destroy method attribute attached to a source component
+ * Defines a finalize method attribute attached to a source component
  * class descriptor which is attached to the automatic plugin
  * descriptor.
  *
  * _name: Component class name (C identifier).
- * _x:    Initialization method (bt_component_class_destroy_method).
+ * _x:    Initialization method (bt_component_class_finalize_method).
  */
-#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_DESTROY_METHOD(_name, _x) \
-       BT_PLUGIN_SOURCE_COMPONENT_CLASS_DESTROY_METHOD_WITH_ID(auto, _name, _x)
+#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_FINALIZE_METHOD(_name, _x) \
+       BT_PLUGIN_SOURCE_COMPONENT_CLASS_FINALIZE_METHOD_WITH_ID(auto, _name, _x)
 
 /*
- * Defines a destroy method attribute attached to a filter component
+ * Defines a finalize method attribute attached to a filter component
  * class descriptor which is attached to the automatic plugin
  * descriptor.
  *
  * _name: Component class name (C identifier).
- * _x:    Initialization method (bt_component_class_destroy_method).
+ * _x:    Initialization method (bt_component_class_finalize_method).
  */
-#define BT_PLUGIN_FILTER_COMPONENT_CLASS_DESTROY_METHOD(_name, _x) \
-       BT_PLUGIN_FILTER_COMPONENT_CLASS_DESTROY_METHOD_WITH_ID(auto, _name, _x)
+#define BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD(_name, _x) \
+       BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD_WITH_ID(auto, _name, _x)
 
 /*
- * Defines a destroy method attribute attached to a sink component class
+ * Defines a finalize method attribute attached to a sink component class
  * descriptor which is attached to the automatic plugin descriptor.
  *
  * _name: Component class name (C identifier).
- * _x:    Initialization method (bt_component_class_destroy_method).
+ * _x:    Initialization method (bt_component_class_finalize_method).
  */
-#define BT_PLUGIN_SINK_COMPONENT_CLASS_DESTROY_METHOD(_name, _x) \
-       BT_PLUGIN_SINK_COMPONENT_CLASS_DESTROY_METHOD_WITH_ID(auto, _name, _x)
+#define BT_PLUGIN_SINK_COMPONENT_CLASS_FINALIZE_METHOD(_name, _x) \
+       BT_PLUGIN_SINK_COMPONENT_CLASS_FINALIZE_METHOD_WITH_ID(auto, _name, _x)
 
 /*
  * Defines a query method attribute attached to a source component
@@ -1105,16 +1105,16 @@ struct __bt_plugin_component_class_descriptor_attribute {
        BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_INIT_METHOD_WITH_ID(auto, _name, _x)
 
 /*
- * Defines an iterator destroy method attribute attached to a source
+ * Defines an iterator finalize method attribute attached to a source
  * component class descriptor which is attached to the automatic plugin
  * descriptor.
  *
  * _name: Component class name (C identifier).
- * _x:    Iterator destroy method
- *        (bt_component_class_notification_iterator_destroy_method).
+ * _x:    Iterator finalize method
+ *        (bt_component_class_notification_iterator_finalize_method).
  */
-#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD(_name, _x) \
-       BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD_WITH_ID(auto, _name, _x)
+#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD(_name, _x) \
+       BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD_WITH_ID(auto, _name, _x)
 
 /*
  * Defines an iterator seek time method attribute attached to a source
@@ -1141,16 +1141,16 @@ struct __bt_plugin_component_class_descriptor_attribute {
        BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_INIT_METHOD_WITH_ID(auto, _name, _x)
 
 /*
- * Defines an iterator destroy method attribute attached to a filter
+ * Defines an iterator finalize method attribute attached to a filter
  * component class descriptor which is attached to the automatic plugin
  * descriptor.
  *
  * _name: Component class name (C identifier).
- * _x:    Iterator destroy method
- *        (bt_component_class_notification_iterator_destroy_method).
+ * _x:    Iterator finalize method
+ *        (bt_component_class_notification_iterator_finalize_method).
  */
-#define BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD(_name, _x) \
-       BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD_WITH_ID(auto, _name, _x)
+#define BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD(_name, _x) \
+       BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD_WITH_ID(auto, _name, _x)
 
 /*
  * Defines an iterator seek time method attribute attached to a filter

diff --git a/lib/component/component-class.c b/lib/component/component-class.c
index cf164832522daaf47d72de2044cfb023852a795f..0f5337257c4810fada3ca18272db7182bb129b0e 100644 (file)
--- a/lib/component/component-class.c
+++ b/lib/component/component-class.c
@@ -279,18 +279,18 @@ end:
        return ret;
 }
 
-int bt_component_class_set_destroy_method(
+int bt_component_class_set_finalize_method(
                struct bt_component_class *component_class,
-               bt_component_class_destroy_method destroy_method)
+               bt_component_class_finalize_method finalize_method)
 {
        int ret = 0;
 
-       if (!component_class || component_class->frozen || !destroy_method) {
+       if (!component_class || component_class->frozen || !finalize_method) {
                ret = -1;
                goto end;
        }
 
-       component_class->methods.destroy = destroy_method;
+       component_class->methods.finalize = finalize_method;
 
 end:
        return ret;
@@ -318,15 +318,15 @@ end:
        return ret;
 }
 
-int bt_component_class_source_set_notification_iterator_destroy_method(
+int bt_component_class_source_set_notification_iterator_finalize_method(
                struct bt_component_class *component_class,
-               bt_component_class_notification_iterator_destroy_method notification_iterator_destroy_method)
+               bt_component_class_notification_iterator_finalize_method notification_iterator_finalize_method)
 {
        struct bt_component_class_source *source_class;
        int ret = 0;
 
        if (!component_class || component_class->frozen ||
-                       !notification_iterator_destroy_method ||
+                       !notification_iterator_finalize_method ||
                        component_class->type != BT_COMPONENT_CLASS_TYPE_SOURCE) {
                ret = -1;
                goto end;
@@ -334,8 +334,8 @@ int bt_component_class_source_set_notification_iterator_destroy_method(
 
        source_class = container_of(component_class,
                struct bt_component_class_source, parent);
-       source_class->methods.iterator.destroy =
-               notification_iterator_destroy_method;
+       source_class->methods.iterator.finalize =
+               notification_iterator_finalize_method;
 
 end:
        return ret;
@@ -386,15 +386,15 @@ end:
        return ret;
 }
 
-int bt_component_class_filter_set_notification_iterator_destroy_method(
+int bt_component_class_filter_set_notification_iterator_finalize_method(
                struct bt_component_class *component_class,
-               bt_component_class_notification_iterator_destroy_method notification_iterator_destroy_method)
+               bt_component_class_notification_iterator_finalize_method notification_iterator_finalize_method)
 {
        struct bt_component_class_filter *filter_class;
        int ret = 0;
 
        if (!component_class || component_class->frozen ||
-                       !notification_iterator_destroy_method ||
+                       !notification_iterator_finalize_method ||
                        component_class->type != BT_COMPONENT_CLASS_TYPE_FILTER) {
                ret = -1;
                goto end;
@@ -402,8 +402,8 @@ int bt_component_class_filter_set_notification_iterator_destroy_method(
 
        filter_class = container_of(component_class,
                struct bt_component_class_filter, parent);
-       filter_class->methods.iterator.destroy =
-               notification_iterator_destroy_method;
+       filter_class->methods.iterator.finalize =
+               notification_iterator_finalize_method;
 
 end:
        return ret;

diff --git a/lib/component/component.c b/lib/component/component.c
index 456175ff5d33eb8197e4d256173c09e5c91f4ef0..834370751c291334da006d6027a6e5491497e5bb 100644 (file)
--- a/lib/component/component.c
+++ b/lib/component/component.c
@@ -82,8 +82,8 @@ void bt_component_destroy(struct bt_object *obj)
         * User data is destroyed first, followed by the concrete component
         * instance.
         */
-       if (component->class->methods.destroy) {
-               component->class->methods.destroy(
+       if (component->class->methods.finalize) {
+               component->class->methods.finalize(
                        bt_private_component_from_component(component));
        }
 

diff --git a/lib/component/iterator.c b/lib/component/iterator.c
index 78a76c2a2098816e74717d91d2f3330516b80605..7f3e2b037affd431b3716cc2d187778d5dda9361 100644 (file)
--- a/lib/component/iterator.c
+++ b/lib/component/iterator.c
@@ -54,8 +54,8 @@ void bt_notification_iterator_destroy(struct bt_object *obj)
 
                source_class = container_of(comp_class, struct bt_component_class_source, parent);
 
-               if (source_class->methods.iterator.destroy) {
-                       source_class->methods.iterator.destroy(
+               if (source_class->methods.iterator.finalize) {
+                       source_class->methods.iterator.finalize(
                                bt_private_notification_iterator_from_notification_iterator(iterator));
                }
                break;
@@ -66,8 +66,8 @@ void bt_notification_iterator_destroy(struct bt_object *obj)
 
                filter_class = container_of(comp_class, struct bt_component_class_filter, parent);
 
-               if (filter_class->methods.iterator.destroy) {
-                       filter_class->methods.iterator.destroy(
+               if (filter_class->methods.iterator.finalize) {
+                       filter_class->methods.iterator.finalize(
                                bt_private_notification_iterator_from_notification_iterator(iterator));
                }
                break;

diff --git a/lib/plugin/plugin-so.c b/lib/plugin/plugin-so.c
index d5522445464ee2f841dfee5088ca3beac4b49432..e05077ed090194bf0fd3e2016211173f4df7c4a5 100644 (file)
--- a/lib/plugin/plugin-so.c
+++ b/lib/plugin/plugin-so.c
@@ -251,7 +251,7 @@ enum bt_plugin_status bt_plugin_so_init(
                const char *description;
                const char *help;
                bt_component_class_init_method init_method;
-               bt_component_class_destroy_method destroy_method;
+               bt_component_class_finalize_method finalize_method;
                bt_component_class_query_method query_method;
                bt_component_class_accept_port_connection_method accept_port_connection_method;
                bt_component_class_port_disconnected_method port_disconnected_method;
@@ -375,9 +375,9 @@ enum bt_plugin_status bt_plugin_so_init(
                                        cc_full_descr->init_method =
                                                cur_cc_descr_attr->value.init_method;
                                        break;
-                               case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_DESTROY_METHOD:
-                                       cc_full_descr->destroy_method =
-                                               cur_cc_descr_attr->value.destroy_method;
+                               case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_FINALIZE_METHOD:
+                                       cc_full_descr->finalize_method =
+                                               cur_cc_descr_attr->value.finalize_method;
                                        break;
                                case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_QUERY_METHOD:
                                        cc_full_descr->query_method =
@@ -395,9 +395,9 @@ enum bt_plugin_status bt_plugin_so_init(
                                        cc_full_descr->iterator_methods.init =
                                                cur_cc_descr_attr->value.notif_iter_init_method;
                                        break;
-                               case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_DESTROY_METHOD:
-                                       cc_full_descr->iterator_methods.destroy =
-                                               cur_cc_descr_attr->value.notif_iter_destroy_method;
+                               case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_FINALIZE_METHOD:
+                                       cc_full_descr->iterator_methods.finalize =
+                                               cur_cc_descr_attr->value.notif_iter_finalize_method;
                                        break;
                                case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_SEEK_TIME_METHOD:
                                        cc_full_descr->iterator_methods.seek_time =
@@ -496,9 +496,9 @@ enum bt_plugin_status bt_plugin_so_init(
                        }
                }
 
-               if (cc_full_descr->destroy_method) {
-                       ret = bt_component_class_set_destroy_method(comp_class,
-                               cc_full_descr->destroy_method);
+               if (cc_full_descr->finalize_method) {
+                       ret = bt_component_class_set_finalize_method(comp_class,
+                               cc_full_descr->finalize_method);
                        if (ret) {
                                status = BT_PLUGIN_STATUS_ERROR;
                                BT_PUT(comp_class);
@@ -549,10 +549,10 @@ enum bt_plugin_status bt_plugin_so_init(
                                }
                        }
 
-                       if (cc_full_descr->iterator_methods.destroy) {
-                               ret = bt_component_class_source_set_notification_iterator_destroy_method(
+                       if (cc_full_descr->iterator_methods.finalize) {
+                               ret = bt_component_class_source_set_notification_iterator_finalize_method(
                                        comp_class,
-                                       cc_full_descr->iterator_methods.destroy);
+                                       cc_full_descr->iterator_methods.finalize);
                                if (ret) {
                                        status = BT_PLUGIN_STATUS_ERROR;
                                        BT_PUT(comp_class);
@@ -583,10 +583,10 @@ enum bt_plugin_status bt_plugin_so_init(
                                }
                        }
 
-                       if (cc_full_descr->iterator_methods.destroy) {
-                               ret = bt_component_class_filter_set_notification_iterator_destroy_method(
+                       if (cc_full_descr->iterator_methods.finalize) {
+                               ret = bt_component_class_filter_set_notification_iterator_finalize_method(
                                        comp_class,
-                                       cc_full_descr->iterator_methods.destroy);
+                                       cc_full_descr->iterator_methods.finalize);
                                if (ret) {
                                        status = BT_PLUGIN_STATUS_ERROR;
                                        BT_PUT(comp_class);

diff --git a/plugins/ctf/fs/fs.c b/plugins/ctf/fs/fs.c
index 4db53f06a1c45ad23c9332edcd72dbeffc49b1d8..da7180b6f011d8fbd909ab3febaeebb06da76f4e 100644 (file)
--- a/plugins/ctf/fs/fs.c
+++ b/plugins/ctf/fs/fs.c
@@ -370,7 +370,7 @@ void ctf_fs_iterator_destroy_data(struct ctf_fs_iterator *ctf_it)
        g_free(ctf_it);
 }
 
-void ctf_fs_iterator_destroy(struct bt_private_notification_iterator *it)
+void ctf_fs_iterator_finalize(struct bt_private_notification_iterator *it)
 {
        void *data = bt_private_notification_iterator_get_user_data(it);
 
@@ -662,7 +662,7 @@ void ctf_fs_destroy_data(struct ctf_fs_component *ctf_fs)
        g_free(ctf_fs);
 }
 
-void ctf_fs_destroy(struct bt_private_component *component)
+void ctf_fs_finalize(struct bt_private_component *component)
 {
        void *data = bt_private_component_get_user_data(component);
 

diff --git a/plugins/ctf/fs/fs.h b/plugins/ctf/fs/fs.h
index 3749137d820936e71283c0ef637410e3c2e67680..769ab70563c79492e5aeb21797ba772b3fdf1e87 100644 (file)
--- a/plugins/ctf/fs/fs.h
+++ b/plugins/ctf/fs/fs.h
@@ -110,7 +110,7 @@ enum bt_component_status ctf_fs_init(struct bt_private_component *source,
                struct bt_value *params, void *init_method_data);
 
 BT_HIDDEN
-void ctf_fs_destroy(struct bt_private_component *component);
+void ctf_fs_finalize(struct bt_private_component *component);
 
 BT_HIDDEN
 enum bt_notification_iterator_status ctf_fs_iterator_init(
@@ -118,7 +118,7 @@ enum bt_notification_iterator_status ctf_fs_iterator_init(
                struct bt_private_port *port,
                struct bt_private_notification_iterator *it);
 
-void ctf_fs_iterator_destroy(struct bt_private_notification_iterator *it);
+void ctf_fs_iterator_finalize(struct bt_private_notification_iterator *it);
 
 enum bt_notification_iterator_status ctf_fs_iterator_next(
                struct bt_private_notification_iterator *iterator);

diff --git a/plugins/ctf/plugin.c b/plugins/ctf/plugin.c
index 37d59d0c05961f708583c27a1aa9f3a61f9b2ed7..dc62e85d2ef16e503aa42f18bbbf57b4f0c58e8b 100644 (file)
--- a/plugins/ctf/plugin.c
+++ b/plugins/ctf/plugin.c
@@ -41,11 +41,11 @@ BT_PLUGIN_SOURCE_COMPONENT_CLASS(fs, ctf_fs_iterator_get, ctf_fs_iterator_next);
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_DESCRIPTION(fs, CTF_FS_COMPONENT_DESCRIPTION);
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_INIT_METHOD(fs, ctf_fs_init);
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_QUERY_METHOD(fs, ctf_fs_query);
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_DESTROY_METHOD(fs, ctf_fs_destroy);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_FINALIZE_METHOD(fs, ctf_fs_finalize);
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_INIT_METHOD(fs,
        ctf_fs_iterator_init);
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD(fs,
-       ctf_fs_iterator_destroy);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD(fs,
+       ctf_fs_iterator_finalize);
 
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_WITH_ID(auto, lttng_live, "lttng-live",
        lttng_live_iterator_get, lttng_live_iterator_next);

diff --git a/plugins/muxer/muxer.c b/plugins/muxer/muxer.c
index 9a58310b3cb5223c588412f38725ede59084d857..b0cdfe5922a1e53d0265b370e55dd29be6ab4f4e 100644 (file)
--- a/plugins/muxer/muxer.c
+++ b/plugins/muxer/muxer.c
@@ -55,7 +55,7 @@ end:
 }
 
 static
-void destroy_muxer(struct bt_private_component *component)
+void finalize_muxer(struct bt_private_component *component)
 {
        void *data = bt_private_component_get_user_data(component);
 
@@ -109,4 +109,4 @@ BT_PLUGIN_FILTER_COMPONENT_CLASS(muxer, muxer_iterator_get,
 BT_PLUGIN_FILTER_COMPONENT_CLASS_DESCRIPTION(muxer,
        "Time-correlate multiple traces.");
 BT_PLUGIN_FILTER_COMPONENT_CLASS_INIT_METHOD(muxer, muxer_component_init);
-BT_PLUGIN_FILTER_COMPONENT_CLASS_DESTROY_METHOD(muxer, destroy_muxer);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD(muxer, finalize_muxer);

diff --git a/plugins/text/text.c b/plugins/text/text.c
index 5f833fe5ac22f091557d5d6ebfa57a2990361546..a270fd4820ad046c62e2529a8a452ca457a7b3bf 100644 (file)
--- a/plugins/text/text.c
+++ b/plugins/text/text.c
@@ -109,7 +109,7 @@ error:
 }
 
 static
-void destroy_text(struct bt_private_component *component)
+void finalize_text(struct bt_private_component *component)
 {
        void *data = bt_private_component_get_user_data(component);
 
@@ -767,6 +767,6 @@ BT_PLUGIN_LICENSE("MIT");
 BT_PLUGIN_SINK_COMPONENT_CLASS(text, run);
 BT_PLUGIN_SINK_COMPONENT_CLASS_INIT_METHOD(text, text_component_init);
 BT_PLUGIN_SINK_COMPONENT_CLASS_ACCEPT_PORT_CONNECTION_METHOD(text, text_accept_port_connection);
-BT_PLUGIN_SINK_COMPONENT_CLASS_DESTROY_METHOD(text, destroy_text);
+BT_PLUGIN_SINK_COMPONENT_CLASS_FINALIZE_METHOD(text, finalize_text);
 BT_PLUGIN_SINK_COMPONENT_CLASS_DESCRIPTION(text,
        "Formats CTF-IR to text. Formerly known as ctf-text.");

diff --git a/plugins/utils/dummy/dummy.c b/plugins/utils/dummy/dummy.c
index 23db9d3283f559479c542dca671fed0598a308be..44d191c303f6177cc641fa3ce29c18f0f5be0a91 100644 (file)
--- a/plugins/utils/dummy/dummy.c
+++ b/plugins/utils/dummy/dummy.c
@@ -42,7 +42,7 @@ void destroy_private_dummy_data(struct dummy *dummy)
        g_free(dummy);
 }
 
-void dummy_destroy(struct bt_private_component *component)
+void dummy_finalize(struct bt_private_component *component)
 {
        struct dummy *dummy;
 

diff --git a/plugins/utils/dummy/dummy.h b/plugins/utils/dummy/dummy.h
index f2133229317852781d7af2e3b698e695f3d9adb9..31a84e83b1613a54a876b6a7b12fb70293e4daa6 100644 (file)
--- a/plugins/utils/dummy/dummy.h
+++ b/plugins/utils/dummy/dummy.h
@@ -34,7 +34,7 @@ struct dummy {
 
 enum bt_component_status dummy_init(struct bt_private_component *component,
                struct bt_value *params, void *init_method_data);
-void dummy_destroy(struct bt_private_component *component);
+void dummy_finalize(struct bt_private_component *component);
 enum bt_component_status dummy_accept_port_connection(
                struct bt_private_component *component,
                struct bt_private_port *self_port,

diff --git a/plugins/utils/plugin.c b/plugins/utils/plugin.c
index 8312278c9bc737f99f4c36889a0c660d8231363d..2934ad408eb5f1d0b3be27db812aac19ecd5b52f 100644 (file)
--- a/plugins/utils/plugin.c
+++ b/plugins/utils/plugin.c
@@ -33,7 +33,7 @@ BT_PLUGIN_LICENSE("MIT");
 /* dummy sink */
 BT_PLUGIN_SINK_COMPONENT_CLASS(dummy, dummy_consume);
 BT_PLUGIN_SINK_COMPONENT_CLASS_INIT_METHOD(dummy, dummy_init);
-BT_PLUGIN_SINK_COMPONENT_CLASS_DESTROY_METHOD(dummy, dummy_destroy);
+BT_PLUGIN_SINK_COMPONENT_CLASS_FINALIZE_METHOD(dummy, dummy_finalize);
 BT_PLUGIN_SINK_COMPONENT_CLASS_ACCEPT_PORT_CONNECTION_METHOD(dummy, dummy_accept_port_connection);
 BT_PLUGIN_SINK_COMPONENT_CLASS_DESCRIPTION(dummy,
     "Dummy sink component class: does absolutely nothing!");
@@ -44,10 +44,10 @@ BT_PLUGIN_FILTER_COMPONENT_CLASS(trimmer, trimmer_iterator_get,
 BT_PLUGIN_FILTER_COMPONENT_CLASS_DESCRIPTION(trimmer,
     "Ensure that trace notifications outside of a given range are filtered-out.");
 BT_PLUGIN_FILTER_COMPONENT_CLASS_INIT_METHOD(trimmer, trimmer_component_init);
-BT_PLUGIN_FILTER_COMPONENT_CLASS_DESTROY_METHOD(trimmer, destroy_trimmer);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD(trimmer, finalize_trimmer);
 BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_INIT_METHOD(trimmer,
     trimmer_iterator_init);
-BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD(trimmer,
-    trimmer_iterator_destroy);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD(trimmer,
+    trimmer_iterator_finalize);
 BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_SEEK_TIME_METHOD(trimmer,
     trimmer_iterator_seek_time);

diff --git a/plugins/utils/trimmer/iterator.c b/plugins/utils/trimmer/iterator.c
index fff388b1399c71d80508f09658e34362a02e7ec5..24cdced1c0d26b930de1a25d74e122e02de6302f 100644 (file)
--- a/plugins/utils/trimmer/iterator.c
+++ b/plugins/utils/trimmer/iterator.c
@@ -50,7 +50,7 @@
 #include <plugins-common.h>
 
 BT_HIDDEN
-void trimmer_iterator_destroy(struct bt_private_notification_iterator *it)
+void trimmer_iterator_finalize(struct bt_private_notification_iterator *it)
 {
        struct trimmer_iterator *it_data;
 

diff --git a/plugins/utils/trimmer/iterator.h b/plugins/utils/trimmer/iterator.h
index 2edbbc71c37b99603802dd3d46a6e07d77feb81d..cca226db9b17fd79c518e04d66f1b651a76ebab7 100644 (file)
--- a/plugins/utils/trimmer/iterator.h
+++ b/plugins/utils/trimmer/iterator.h
@@ -46,7 +46,7 @@ enum bt_notification_iterator_status trimmer_iterator_init(
                struct bt_private_notification_iterator *iterator);
 
 BT_HIDDEN
-void trimmer_iterator_destroy(struct bt_private_notification_iterator *it);
+void trimmer_iterator_finalize(struct bt_private_notification_iterator *it);
 
 BT_HIDDEN
 struct bt_notification *trimmer_iterator_get(

diff --git a/plugins/utils/trimmer/trimmer.c b/plugins/utils/trimmer/trimmer.c
index 1007886857d4e7a2624a5452e6ceabf865f5504d..ec34c973fa135fc4353e3986988542c0fb1279e1 100644 (file)
--- a/plugins/utils/trimmer/trimmer.c
+++ b/plugins/utils/trimmer/trimmer.c
@@ -58,7 +58,7 @@ end:
        return trimmer;
 }
 
-void destroy_trimmer(struct bt_private_component *component)
+void finalize_trimmer(struct bt_private_component *component)
 {
        void *data = bt_private_component_get_user_data(component);
 

diff --git a/plugins/utils/trimmer/trimmer.h b/plugins/utils/trimmer/trimmer.h
index fafb7ada0d56ad04ade3546f57fba94ba44a00b9..e4ee88246465841d71deca2229742c06f57a4dc7 100644 (file)
--- a/plugins/utils/trimmer/trimmer.h
+++ b/plugins/utils/trimmer/trimmer.h
@@ -54,6 +54,6 @@ enum bt_component_status trimmer_component_init(
        struct bt_private_component *component,
        struct bt_value *params, void *init_method_data);
 
-void destroy_trimmer(struct bt_private_component *component);
+void finalize_trimmer(struct bt_private_component *component);
 
 #endif /* BABELTRACE_PLUGINS_UTILS_TRIMMER_H */

diff --git a/plugins/writer/writer.c b/plugins/writer/writer.c
index 6d06468f83f3fe84b29593590b3021d0fcc1cb00..a7f4024bea014f814a1bedee25fe0ce89edd7abe 100644 (file)
--- a/plugins/writer/writer.c
+++ b/plugins/writer/writer.c
@@ -57,7 +57,7 @@ void destroy_writer_component_data(struct writer_component *writer_component)
 }
 
 static
-void destroy_writer_component(struct bt_private_component *component)
+void finalize_writer_component(struct bt_private_component *component)
 {
        struct writer_component *writer_component = (struct writer_component *)
                bt_private_component_get_user_data(component);
@@ -301,5 +301,5 @@ BT_PLUGIN_SINK_COMPONENT_CLASS(writer, run);
 BT_PLUGIN_SINK_COMPONENT_CLASS_INIT_METHOD(writer, writer_component_init);
 BT_PLUGIN_SINK_COMPONENT_CLASS_ACCEPT_PORT_CONNECTION_METHOD(writer,
                writer_component_accept_port_connection);
-BT_PLUGIN_SINK_COMPONENT_CLASS_DESTROY_METHOD(writer, destroy_writer_component);
+BT_PLUGIN_SINK_COMPONENT_CLASS_FINALIZE_METHOD(writer, finalize_writer_component);
 BT_PLUGIN_SINK_COMPONENT_CLASS_DESCRIPTION(writer, "Formats CTF-IR to CTF.");

diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c
index b1f8aea6b9afb304d74d66325bc43374b5c4e7b7..ba8dcba1a979785cb95b5224310e4f5793f55c8f 100644 (file)
--- a/tests/lib/test-plugin-plugins/sfs.c
+++ b/tests/lib/test-plugin-plugins/sfs.c
@@ -35,7 +35,7 @@ static enum bt_notification_iterator_status dummy_iterator_init_method(
        return BT_NOTIFICATION_ITERATOR_STATUS_OK;
 }
 
-static void dummy_iterator_destroy_method(
+static void dummy_iterator_finalize_method(
                struct bt_private_notification_iterator *private_iterator)
 {
 }
@@ -85,8 +85,8 @@ BT_PLUGIN_SOURCE_COMPONENT_CLASS(source, dummy_iterator_get_method,
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_DESCRIPTION(source, "A source.");
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_INIT_METHOD(source,
        dummy_iterator_init_method);
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD(source,
-       dummy_iterator_destroy_method);
+BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD(source,
+       dummy_iterator_finalize_method);
 BT_PLUGIN_SOURCE_COMPONENT_CLASS_NOTIFICATION_ITERATOR_SEEK_TIME_METHOD(source,
        dummy_iterator_seek_time_method);
 
@@ -104,8 +104,8 @@ BT_PLUGIN_FILTER_COMPONENT_CLASS(filter, dummy_iterator_get_method,
 BT_PLUGIN_FILTER_COMPONENT_CLASS_DESCRIPTION(filter, "A filter.");
 BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_INIT_METHOD(filter,
        dummy_iterator_init_method);
-BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_DESTROY_METHOD(filter,
-       dummy_iterator_destroy_method);
+BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD(filter,
+       dummy_iterator_finalize_method);
 BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_SEEK_TIME_METHOD(filter,
        dummy_iterator_seek_time_method);
 BT_PLUGIN_FILTER_COMPONENT_CLASS_QUERY_METHOD(filter, query_method);