Move initialization of components to init functions

[babeltrace.git] / plugins / source.c

diff --git a/plugins/source.c b/plugins/source.c
index 5aa8fc5417c31c19b457310bb78b19bf8f7e1644..094cab24cb2c1ac39de06b3635ffd263190f9bcf 100644 (file)
--- a/plugins/source.c
+++ b/plugins/source.c
@@ -1,7 +1,7 @@
 /*
  * source.c
  *
- * Babeltrace Source Plugin
+ * Babeltrace Source Component
  *
  * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -26,47 +26,81 @@
  * SOFTWARE.
  */
 
+#include <babeltrace/compiler.h>
 #include <babeltrace/plugin/source-internal.h>
-#include <babeltrace/plugin/plugin-internal.h>
+#include <babeltrace/plugin/component-internal.h>
+#include <babeltrace/plugin/notification/iterator.h>
+#include <babeltrace/plugin/notification/iterator-internal.h>
 
 static
-void bt_plugin_source_destroy(struct bt_plugin *plugin)
+void bt_component_source_destroy(struct bt_component *component)
 {
-       struct bt_plugin_source *source;
+       struct bt_component_source *source;
 
-       if (!plugin) {
+       if (!component) {
                return;
        }
 
-       source = container_of(plugin, struct bt_plugin_source, parent);
+       source = container_of(component, struct bt_component_source, parent);
        g_free(source);
 }
 
-struct bt_plugin *bt_plugin_source_create(const char *name,
-               void *private_data, bt_plugin_destroy_func destroy_func,
-               bt_plugin_source_iterator_create_cb iterator_create_cb)
+BT_HIDDEN
+struct bt_component *bt_component_source_create(const char *name)
 {
-       struct bt_plugin_source *source = NULL;
-       enum bt_plugin_status ret;
+       struct bt_component_source *source = NULL;
+       enum bt_component_status ret;
+       source = g_new0(struct bt_component_source, 1);
+       if (!source) {
+               goto end;
+       }
 
-       if (!iterator_create_cb) {
+       ret = bt_component_init(&source->parent, name,
+               BT_COMPONENT_TYPE_SOURCE, bt_component_source_destroy);
+       if (ret != BT_COMPONENT_STATUS_OK) {
+               g_free(source);
+               source = NULL;
                goto end;
        }
+end:
+       return source ? &source->parent : NULL;
+}
 
-       source = g_new0(struct bt_plugin_source, 1);
-       if (!source) {
+struct bt_notification_iterator *bt_plugin_source_create_iterator(
+               struct bt_component *component)
+{
+       enum bt_component_status ret_component;
+       enum bt_notification_iterator_status ret_iterator;
+       struct bt_component_source *source;
+       struct bt_notification_iterator *iterator = NULL;
+
+       if (!component) {
                goto end;
        }
 
-       ret = bt_plugin_init(&source->parent, name, private_data,
-               destroy_func, BT_PLUGIN_TYPE_SOURCE, bt_plugin_source_destroy);
-       if (ret != BT_PLUGIN_STATUS_OK) {
-               g_free(source);
-               source = NULL;
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SOURCE) {
+               goto end;
+       }
+
+       iterator = bt_notification_iterator_create(component);
+       if (!iterator) {
                goto end;
        }
 
-       source->create_iterator = iterator_create_cb;
+       source = container_of(component, struct bt_component_source, parent);
+       assert(source->init_iterator);
+       ret_component = source->init_iterator(component, iterator);
+       if (ret_component != BT_COMPONENT_STATUS_OK) {
+               goto error;
+       }
+
+       ret_iterator = bt_notification_iterator_validate(iterator);
+       if (ret_iterator != BT_NOTIFICATION_ITERATOR_STATUS_OK) {
+               goto error;
+       }
 end:
-       return source ? &source->parent : NULL;
+       return iterator;
+error:
+       bt_notification_iterator_put(iterator);
+       return NULL;
 }