Sinks own their input iterators

[babeltrace.git] / lib / plugin-system / component.c

diff --git a/lib/plugin-system/component.c b/lib/plugin-system/component.c
index 9c4121ba699dcdc9bb18de053abdf1847d4bd218..643e17ad21b3ad909862f556d35aae55e00fbff8 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;
 
        /*
@@ -68,10 +66,13 @@ void bt_component_destroy(struct bt_object *obj)
         * instance.
         */
        if (component->user_destroy) {
-               component->user_destroy(component->user_data);
+               component->user_destroy(component);
+       }
+
+       if (component->destroy) {
+               component->destroy(component);
        }
 
-       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;
        }
@@ -124,16 +125,17 @@ struct bt_component *bt_component_create(
        }
 
        bt_object_init(component, bt_component_destroy);
-       component->class = bt_get(component_class);
        component->name = g_string_new(name);
        if (!component->name) {
                BT_PUT(component);
                goto end;
        }
 
+       component->initializing = true;
        component_class->init(component, params);
+       component->initializing = false;
        ret = component_validation_funcs[type](component);
-       if (ret) {
+       if (ret != BT_COMPONENT_STATUS_OK) {
                BT_PUT(component);
                goto end;
        }
@@ -186,7 +188,7 @@ bt_component_set_private_data(struct bt_component *component,
 {
        enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 
-       if (!component) {
+       if (!component || !component->initializing) {
                ret = BT_COMPONENT_STATUS_INVALID;
                goto end;
        }
@@ -195,3 +197,18 @@ bt_component_set_private_data(struct bt_component *component,
 end:
        return ret;
 }
+
+enum bt_component_status bt_component_set_destroy_cb(
+               struct bt_component *component, bt_component_destroy_cb destroy)
+{
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component || !component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       component->user_destroy = destroy;
+end:
+       return ret;
+}