Make component class destructor optional

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

diff --git a/lib/plugin-system/component.c b/lib/plugin-system/component.c
index 16bc28680cd9df654669d2467c7f91bab5e90d6f..5b424cd848bf85725cbc7963f59d2304d8a0c7ef 100644 (file)
--- a/lib/plugin-system/component.c
+++ b/lib/plugin-system/component.c
@@ -59,8 +59,6 @@ void bt_component_destroy(struct bt_object *obj)
        }
 
        component = container_of(obj, struct bt_component, base);
-
-       assert(component->destroy);
        component_class = component->class;
 
        /*
@@ -71,7 +69,10 @@ void bt_component_destroy(struct bt_object *obj)
                component->user_destroy(component->user_data);
        }
 
-       component->destroy(component);
+       if (component->destroy) {
+               component->destroy(component);
+       }
+
        g_string_free(component->name, TRUE);
        bt_put(component_class);
        g_free(component);
@@ -83,7 +84,7 @@ enum bt_component_status bt_component_init(struct bt_component *component,
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 
-       if (!component || !destroy) {
+       if (!component) {
                ret = BT_COMPONENT_STATUS_INVALID;
                goto end;
        }

diff --git a/lib/plugin-system/sink.c b/lib/plugin-system/sink.c
index e37105b1b60713ae942e1ca8fb2ed3699da3c30e..33295286d67ec87fdcd9561ff9c7a74ca0732a18 100644 (file)
--- a/lib/plugin-system/sink.c
+++ b/lib/plugin-system/sink.c
@@ -31,12 +31,6 @@
 #include <babeltrace/plugin/component-internal.h>
 #include <babeltrace/plugin/notification/notification.h>
 
-static
-void bt_component_sink_destroy(struct bt_component *component)
-{
-       return;
-}
-
 BT_HIDDEN
 enum bt_component_status bt_component_sink_validate(
                struct bt_component *component)

diff --git a/lib/plugin-system/source.c b/lib/plugin-system/source.c
index ed3b1642b56c2d76e5b8032771acdfa0a67009c0..e4915a98875cc3f68eb7e914170e7509af418667 100644 (file)
--- a/lib/plugin-system/source.c
+++ b/lib/plugin-system/source.c
@@ -33,12 +33,6 @@
 #include <babeltrace/plugin/notification/iterator.h>
 #include <babeltrace/plugin/notification/iterator-internal.h>
 
-static
-void bt_component_source_destroy(struct bt_component *component)
-{
-       return;
-}
-
 BT_HIDDEN
 enum bt_component_status bt_component_source_validate(
                struct bt_component *component)