Component creation

[babeltrace.git] / plugins / source.c

diff --git a/plugins/source.c b/plugins/source.c
index b722059bd0823273cbee62b6c86fc1ebde804dc6..6e76206afb6e00c26627e044d44df098aba08eaf 100644 (file)
--- a/plugins/source.c
+++ b/plugins/source.c
@@ -26,6 +26,7 @@
  * SOFTWARE.
  */
 
+#include <babeltrace/ref.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/plugin/source-internal.h>
 #include <babeltrace/plugin/component-internal.h>
@@ -45,37 +46,29 @@ void bt_component_source_destroy(struct bt_component *component)
        g_free(source);
 }
 
-struct bt_component *bt_component_source_create(const char *name,
-               void *private_data, bt_component_destroy_cb destroy_func,
-               bt_component_source_iterator_init_cb iterator_init_cb)
+BT_HIDDEN
+struct bt_component *bt_component_source_create(
+               struct bt_component_class *class, const char *name)
 {
        struct bt_component_source *source = NULL;
        enum bt_component_status ret;
 
-       if (!iterator_init_cb) {
-               goto end;
-       }
-
        source = g_new0(struct bt_component_source, 1);
        if (!source) {
                goto end;
        }
 
-       ret = bt_component_init(&source->parent, name, private_data,
-               destroy_func, BT_COMPONENT_TYPE_SOURCE,
+       ret = bt_component_init(&source->parent, class, name,
                bt_component_source_destroy);
        if (ret != BT_COMPONENT_STATUS_OK) {
-               g_free(source);
-               source = NULL;
+               BT_PUT(source);
                goto end;
        }
-
-       source->init_iterator = iterator_init_cb;
 end:
        return source ? &source->parent : NULL;
 }
 
-struct bt_notification_iterator *bt_plugin_source_create_iterator(
+struct bt_notification_iterator *bt_component_source_create_iterator(
                struct bt_component *component)
 {
        enum bt_component_status ret_component;
@@ -110,6 +103,6 @@ struct bt_notification_iterator *bt_plugin_source_create_iterator(
 end:
        return iterator;
 error:
-       bt_notification_iterator_put(iterator);
-       return NULL;
+       BT_PUT(iterator);
+       return iterator;
 }